Skip to content

Commit a37c13d

Browse files
h2zeroh2zero
committed
Update configs
* Remove tools Former-commit-id: da8c618
1 parent a8853fb commit a37c13d

File tree

9 files changed

+161
-59
lines changed

9 files changed

+161
-59
lines changed

‎cores/nRF5/freertos/FreeRTOSConfig.h‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
#define FREERTOS_CONFIG_H
2929

3030
#include <assert.h>
31-
#if defined __has_include
32-
# if __has_include ("custom_config.h")
33-
# include "custom_config.h"
34-
# endif
35-
#endif
3631

3732
/*-----------------------------------------------------------
3833
* Possible configurations for system timer
@@ -55,36 +50,37 @@
5550
#define CONFIG_RTOS_TICK_RATE_HZ (1024)
5651
#endif
5752

58-
#ifndef CONFIG_RTOS_MAX_PRIORITIES
59-
# ifdef NRF51
60-
# define CONFIG_RTOS_MAX_PRIORITIES (3)
61-
# else
62-
# define CONFIG_RTOS_MAX_PRIORITIES (5)
53+
#if defined(DEVICE_RAM_SIZE)
54+
# if DEVICE_RAM_SIZE < 32
55+
# ifndef CONFIG_RTOS_MAX_PRIORITIES
56+
# define CONFIG_RTOS_MAX_PRIORITIES (3)
57+
# endif
58+
# ifndef CONFIG_RTOS_MIN_TASK_SIZE
59+
# define CONFIG_RTOS_MIN_TASK_SIZE (48)
60+
# endif
61+
# ifndef CONFIG_RTOS_TIMER_QUEUE_LENGTH
62+
# define CONFIG_RTOS_TIMER_QUEUE_LENGTH (6)
63+
# endif
64+
# ifndef CONFIG_RTOS_TIMER_STACK_DEPTH
65+
# define CONFIG_RTOS_TIMER_STACK_DEPTH (64)
66+
# endif
6367
# endif
6468
#endif
6569

70+
#ifndef CONFIG_RTOS_MAX_PRIORITIES
71+
#define CONFIG_RTOS_MAX_PRIORITIES (5)
72+
#endif
73+
6674
#ifndef CONFIG_RTOS_MIN_TASK_SIZE
67-
# ifdef NRF51
68-
# define CONFIG_RTOS_MIN_TASK_SIZE (48)
69-
# else
70-
# define CONFIG_RTOS_MIN_TASK_SIZE (80)
71-
# endif
75+
#define CONFIG_RTOS_MIN_TASK_SIZE (80)
7276
#endif
7377

7478
#ifndef CONFIG_RTOS_TIMER_QUEUE_LENGTH
75-
# ifdef NRF51
76-
# define CONFIG_RTOS_TIMER_QUEUE_LENGTH (6)
77-
# else
78-
# define CONFIG_RTOS_TIMER_QUEUE_LENGTH (32)
79-
# endif
79+
#define CONFIG_RTOS_TIMER_QUEUE_LENGTH (32)
8080
#endif
8181

8282
#ifndef CONFIG_RTOS_TIMER_STACK_DEPTH
83-
# ifdef NRF51
84-
# define CONFIG_RTOS_TIMER_STACK_DEPTH (64)
85-
# else
86-
# define CONFIG_RTOS_TIMER_STACK_DEPTH (256)
87-
# endif
83+
#define CONFIG_RTOS_TIMER_STACK_DEPTH (256)
8884
#endif
8985

9086

‎cores/nRF5/nimble_config/nrf51_nimconfig.h‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@
1717
# ifndef CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT
1818
# define CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT (12)
1919
# endif
20+
# ifndef CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
21+
# define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 2048
22+
# endif
2023
#else
2124
# ifndef CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT
2225
# define CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT (5)
2326
# endif
27+
# ifndef CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
28+
# define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 1152
29+
# endif
2430
#endif
2531

2632
#ifndef CONFIG_BT_NIMBLE_MAX_BONDS
@@ -69,8 +75,8 @@
6975
#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER
7076
#endif
7177

72-
#ifndef CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
73-
#define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 1280
78+
#ifndef CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
79+
#define CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE 0x0
7480
#endif
7581

7682
#ifndef CONFIG_NIMBLE_STACK_USE_MEM_POOLS
@@ -1167,7 +1173,7 @@
11671173

11681174
/*** @apache-mynewt-nimble/nimble/host/services/gap */
11691175
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
1170-
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
1176+
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
11711177
#endif
11721178

11731179
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE_WRITE_PERM

‎cores/nRF5/nimble_config/nrf52832_nimconfig.h‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,32 @@
5959
#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER
6060
#endif
6161

62+
#ifndef CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
63+
#define CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE 0x0
64+
#endif
65+
6266
#ifndef CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
63-
#define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 4096
67+
#define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 2048
6468
#endif
6569

6670
#ifndef CONFIG_NIMBLE_STACK_USE_MEM_POOLS
6771
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
6872
#endif
6973

74+
#if CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV && !CONFIG_BT_NIMBLE_EXT_ADV
75+
# error Extended advertising must be enabled to use periodic advertising.
76+
#endif
77+
78+
/* Must have max instances and data length set if extended advertising is enabled */
79+
#if CONFIG_BT_NIMBLE_EXT_ADV
80+
# if !defined(CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES)
81+
# define CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES 1
82+
# endif
83+
# if !defined(CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)
84+
# define CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN 251
85+
# endif
86+
#endif
87+
7088

7189
/**
7290
* This macro exists to ensure code includes this header when needed. If code
@@ -135,28 +153,44 @@
135153

136154
/*** @apache-mynewt-nimble/nimble */
137155
#ifndef MYNEWT_VAL_BLE_EXT_ADV
138-
#define MYNEWT_VAL_BLE_EXT_ADV (0)
156+
#define MYNEWT_VAL_BLE_EXT_ADV CONFIG_BT_NIMBLE_EXT_ADV
139157
#endif
140158

141159
#ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
142-
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
160+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
161+
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)
162+
#else
163+
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (0)
164+
#endif
143165
#endif
144166

145167
#ifndef MYNEWT_VAL_BLE_MAX_CONNECTIONS
146168
#define MYNEWT_VAL_BLE_MAX_CONNECTIONS CONFIG_BT_NIMBLE_MAX_CONNECTIONS
147169
#endif
148170

149-
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
150-
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (1)
151-
#endif
152-
153171
#ifndef MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES
172+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
173+
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES)
174+
#else
154175
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (0)
155176
#endif
177+
#endif
178+
179+
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
180+
#ifdef CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV
181+
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS)
182+
#else
183+
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
184+
#endif
185+
#endif
156186

157187
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV
188+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
189+
#define MYNEWT_VAL_BLE_PERIODIC_ADV (CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV)
190+
#else
158191
#define MYNEWT_VAL_BLE_PERIODIC_ADV (0)
159192
#endif
193+
#endif
160194

161195
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER
162196
#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0)
@@ -1157,7 +1191,7 @@
11571191

11581192
/*** @apache-mynewt-nimble/nimble/host/services/gap */
11591193
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
1160-
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
1194+
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
11611195
#endif
11621196

11631197
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE_WRITE_PERM

‎cores/nRF5/nimble_config/nrf52833_nimconfig.h‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER
6060
#endif
6161

62+
#ifndef CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
63+
#define CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE 0x0
64+
#endif
65+
6266
#ifndef CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
6367
#define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 2048
6468
#endif
@@ -67,6 +71,21 @@
6771
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
6872
#endif
6973

74+
#if CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV && !CONFIG_BT_NIMBLE_EXT_ADV
75+
# error Extended advertising must be enabled to use periodic advertising.
76+
#endif
77+
78+
/* Must have max instances and data length set if extended advertising is enabled */
79+
#if CONFIG_BT_NIMBLE_EXT_ADV
80+
# if !defined(CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES)
81+
# define CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES 1
82+
# endif
83+
# if !defined(CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)
84+
# define CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN 251
85+
# endif
86+
#endif
87+
88+
7089
/**
7190
* This macro exists to ensure code includes this header when needed. If code
7291
* checks the existence of a setting directly via ifdef without including this
@@ -134,28 +153,44 @@
134153

135154
/*** @apache-mynewt-nimble/nimble */
136155
#ifndef MYNEWT_VAL_BLE_EXT_ADV
137-
#define MYNEWT_VAL_BLE_EXT_ADV (0)
156+
#define MYNEWT_VAL_BLE_EXT_ADV CONFIG_BT_NIMBLE_EXT_ADV
138157
#endif
139158

140159
#ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
141-
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
160+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
161+
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)
162+
#else
163+
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (0)
164+
#endif
142165
#endif
143166

144167
#ifndef MYNEWT_VAL_BLE_MAX_CONNECTIONS
145168
#define MYNEWT_VAL_BLE_MAX_CONNECTIONS CONFIG_BT_NIMBLE_MAX_CONNECTIONS
146169
#endif
147170

148-
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
149-
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (1)
150-
#endif
151-
152171
#ifndef MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES
172+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
173+
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES)
174+
#else
153175
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (0)
154176
#endif
177+
#endif
178+
179+
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
180+
#ifdef CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV
181+
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS)
182+
#else
183+
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
184+
#endif
185+
#endif
155186

156187
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV
188+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
189+
#define MYNEWT_VAL_BLE_PERIODIC_ADV (CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV)
190+
#else
157191
#define MYNEWT_VAL_BLE_PERIODIC_ADV (0)
158192
#endif
193+
#endif
159194

160195
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER
161196
#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0)
@@ -1156,7 +1191,7 @@
11561191

11571192
/*** @apache-mynewt-nimble/nimble/host/services/gap */
11581193
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
1159-
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
1194+
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
11601195
#endif
11611196

11621197
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE_WRITE_PERM

‎cores/nRF5/nimble_config/nrf52840_nimconfig.h‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,33 @@
5959
#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER
6060
#endif
6161

62+
#ifndef CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
63+
#define CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE 0x0
64+
#endif
65+
6266
#ifndef CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
63-
#define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 4096
67+
#define CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE 2048
6468
#endif
6569

6670
#ifndef CONFIG_NIMBLE_STACK_USE_MEM_POOLS
6771
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
6872
#endif
6973

74+
#if CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV && !CONFIG_BT_NIMBLE_EXT_ADV
75+
# error Extended advertising must be enabled to use periodic advertising.
76+
#endif
77+
78+
/* Must have max instances and data length set if extended advertising is enabled */
79+
#if CONFIG_BT_NIMBLE_EXT_ADV
80+
# if !defined(CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES)
81+
# define CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES 1
82+
# endif
83+
# if !defined(CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)
84+
# define CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN 251
85+
# endif
86+
#endif
87+
88+
7089
/**
7190
* This macro exists to ensure code includes this header when needed. If code
7291
* checks the existence of a setting directly via ifdef without including this
@@ -134,28 +153,44 @@
134153

135154
/*** @apache-mynewt-nimble/nimble */
136155
#ifndef MYNEWT_VAL_BLE_EXT_ADV
137-
#define MYNEWT_VAL_BLE_EXT_ADV (0)
156+
#define MYNEWT_VAL_BLE_EXT_ADV CONFIG_BT_NIMBLE_EXT_ADV
138157
#endif
139158

140159
#ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
141-
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
160+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
161+
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)
162+
#else
163+
#define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (0)
164+
#endif
142165
#endif
143166

144167
#ifndef MYNEWT_VAL_BLE_MAX_CONNECTIONS
145168
#define MYNEWT_VAL_BLE_MAX_CONNECTIONS CONFIG_BT_NIMBLE_MAX_CONNECTIONS
146169
#endif
147170

148-
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
149-
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (1)
150-
#endif
151-
152171
#ifndef MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES
172+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
173+
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES)
174+
#else
153175
#define MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES (0)
154176
#endif
177+
#endif
178+
179+
#ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
180+
#ifdef CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV
181+
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS)
182+
#else
183+
#define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
184+
#endif
185+
#endif
155186

156187
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV
188+
#ifdef CONFIG_BT_NIMBLE_EXT_ADV
189+
#define MYNEWT_VAL_BLE_PERIODIC_ADV (CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV)
190+
#else
157191
#define MYNEWT_VAL_BLE_PERIODIC_ADV (0)
158192
#endif
193+
#endif
159194

160195
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER
161196
#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0)
@@ -1156,7 +1191,7 @@
11561191

11571192
/*** @apache-mynewt-nimble/nimble/host/services/gap */
11581193
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
1159-
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
1194+
#define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
11601195
#endif
11611196

11621197
#ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE_WRITE_PERM

0 commit comments

Comments
 (0)