Skip to content

Commit 9897584

Browse files
benothmn-sterwango
authored andcommitted
lib: stm32wba: Align code with BLE_TransparentMode from STM32CubeWBA
Align code with BLE_TransparentMode application from STM32CubeWBA instead of BLE_HeartRate application. Signed-off-by: Nidhal BEN OTHMEN <[email protected]>
1 parent 5318f4e commit 9897584

File tree

3 files changed

+49
-119
lines changed

3 files changed

+49
-119
lines changed

lib/stm32wba/BLE_TransparentMode/Core/Inc/app_conf.h

Lines changed: 11 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -35,71 +35,6 @@
3535
******************************************************************************/
3636
/**< generic parameters ******************************************************/
3737

38-
/**
39-
* Define Tx Power
40-
*/
41-
#define CFG_TX_POWER (0x19) /* 0x19 <=> -0.3 dBm */
42-
43-
/**
44-
* Definition of public BD Address,
45-
* when CFG_BD_ADDRESS = 0x000000000000 the BD address is generated based on Unique Device Number.
46-
*/
47-
#define CFG_BD_ADDRESS (0x0000000000000)
48-
49-
/**
50-
* Define BD_ADDR type: define proper address. Can only be GAP_PUBLIC_ADDR (0x00) or GAP_STATIC_RANDOM_ADDR (0x01)
51-
*/
52-
#define CFG_BD_ADDRESS_DEVICE (GAP_PUBLIC_ADDR)
53-
54-
/**
55-
* Define privacy: PRIVACY_DISABLED or PRIVACY_ENABLED
56-
*/
57-
#define CFG_PRIVACY (PRIVACY_DISABLED)
58-
59-
/**
60-
* Define BLE Address Type
61-
* Bluetooth address types defined in ble_legacy.h
62-
* if CFG_PRIVACY equals PRIVACY_DISABLED, CFG_BLE_ADDRESS_TYPE has 2 allowed values: GAP_PUBLIC_ADDR or GAP_STATIC_RANDOM_ADDR
63-
* if CFG_PRIVACY equals PRIVACY_ENABLED, CFG_BLE_ADDRESS_TYPE has 2 allowed values: GAP_RESOLVABLE_PRIVATE_ADDR or GAP_NON_RESOLVABLE_PRIVATE_ADDR
64-
*/
65-
#define CFG_BD_ADDRESS_TYPE (GAP_PUBLIC_ADDR)
66-
67-
#define ADV_INTERVAL_MIN (0x0080)
68-
#define ADV_INTERVAL_MAX (0x00A0)
69-
#define ADV_LP_INTERVAL_MIN (0x0640)
70-
#define ADV_LP_INTERVAL_MAX (0x0FA0)
71-
#define ADV_TYPE ADV_IND
72-
#define ADV_FILTER NO_WHITE_LIST_USE
73-
74-
/**
75-
* Define IO Authentication
76-
*/
77-
#define CFG_BONDING_MODE (1)
78-
#define CFG_USED_FIXED_PIN (0) /* 0->fixed pin is used ; 1->No fixed pin used*/
79-
#define CFG_FIXED_PIN (111111)
80-
#define CFG_ENCRYPTION_KEY_SIZE_MAX (16)
81-
#define CFG_ENCRYPTION_KEY_SIZE_MIN (8)
82-
83-
/**
84-
* Define Input Output capabilities
85-
*/
86-
#define CFG_IO_CAPABILITY (IO_CAP_DISPLAY_YES_NO)
87-
88-
/**
89-
* Define Man In The Middle modes
90-
*/
91-
#define CFG_MITM_PROTECTION (MITM_PROTECTION_REQUIRED)
92-
93-
/**
94-
* Define Secure Connections Support
95-
*/
96-
#define CFG_SC_SUPPORT (SC_PAIRING_OPTIONAL)
97-
98-
/**
99-
* Define Keypress Notification Support
100-
*/
101-
#define CFG_KEYPRESS_NOTIFICATION_SUPPORT (KEYPRESS_NOT_SUPPORTED)
102-
10338
/**
10439
* Identity root key used to derive IRK and DHK(Legacy)
10540
*/
@@ -228,7 +163,7 @@
228163
* - 0 : Standby is not used, so stop mode 1 is used as low power mode.
229164
*
230165
******************************************************************************/
231-
#define CFG_LPM_LEVEL (2)
166+
#define CFG_LPM_LEVEL (1)
232167
#define CFG_LPM_STDBY_SUPPORTED (1)
233168

234169
/* Defines time to wake up from standby before radio event to meet timings */
@@ -248,6 +183,7 @@ typedef enum
248183
CFG_LPM_LOG,
249184
CFG_LPM_LL_DEEPSLEEP,
250185
CFG_LPM_LL_HW_RCO_CLBR,
186+
CFG_LPM_APP_BLE,
251187
/* USER CODE BEGIN CFG_LPM_Id_t */
252188

253189
/* USER CODE END CFG_LPM_Id_t */
@@ -322,7 +258,12 @@ typedef enum
322258
{
323259
CFG_TASK_HW_RNG,
324260
CFG_TASK_LINK_LAYER,
325-
CFG_TASK_HCI_ASYNCH_EVT_ID,
261+
CFG_TASK_BLE_HCI_CMD_ID,
262+
CFG_TASK_SYS_HCI_CMD_ID,
263+
CFG_TASK_HCI_ACL_DATA_ID,
264+
CFG_TASK_SYS_LOCAL_CMD_ID,
265+
CFG_TASK_TX_TO_HOST_ID,
266+
CFG_TASK_NOTIFY_EVENT_ID,
326267
CFG_TASK_TEMP_MEAS,
327268
CFG_TASK_BLE_HOST,
328269
CFG_TASK_AMM,
@@ -333,8 +274,6 @@ typedef enum
333274
TASK_BUTTON_1,
334275
TASK_BUTTON_2,
335276
TASK_BUTTON_3,
336-
CFG_TASK_MEAS_REQ_ID,
337-
CFG_TASK_ADV_LP_REQ_ID,
338277
/* USER CODE END CFG_Task_Id_t */
339278
CFG_TASK_NBR /* Shall be LAST in the list */
340279
} CFG_Task_Id_t;
@@ -360,17 +299,6 @@ typedef enum
360299
/* Sequencer configuration */
361300
#define UTIL_SEQ_CONF_PRIO_NBR CFG_SEQ_PRIO_NBR
362301

363-
/**
364-
* This is a bit mapping over 32bits listing all events id supported in the application
365-
*/
366-
typedef enum
367-
{
368-
CFG_IDLEEVT_PROC_GAP_COMPLETE,
369-
/* USER CODE BEGIN CFG_IdleEvt_Id_t */
370-
371-
/* USER CODE END CFG_IdleEvt_Id_t */
372-
} CFG_IdleEvt_Id_t;
373-
374302
/**
375303
* These are the lists of events id registered to the sequencer
376304
* Each event id shall be in the range [0:31]
@@ -419,7 +347,7 @@ typedef enum
419347
* - 2 : Debugger available in low power mode.
420348
*
421349
******************************************************************************/
422-
#define CFG_DEBUGGER_LEVEL (0)
350+
#define CFG_DEBUGGER_LEVEL (2)
423351

424352
/******************************************************************************
425353
* RealTime GPIO debug module configuration
@@ -464,7 +392,7 @@ typedef enum
464392
* 0 -> RF TX output level from -20 dBm to +10 dBm
465393
* 1 -> RF TX output level from -20 dBm to +3 dBm
466394
*/
467-
#define CFG_RF_TX_POWER_TABLE_ID (1)
395+
#define CFG_RF_TX_POWER_TABLE_ID (0)
468396

469397
/* Custom LSE sleep clock accuracy to use if both conditions are met:
470398
* - LSE is selected as Link Layer sleep clock source
@@ -511,7 +439,7 @@ typedef enum
511439
* When CFG_BUTTON_SUPPORTED is set, the push button are activated if requested
512440
*/
513441

514-
#define CFG_LED_SUPPORTED (0)
442+
#define CFG_LED_SUPPORTED (1)
515443
#define CFG_BUTTON_SUPPORTED (1)
516444

517445
/**

lib/stm32wba/BLE_TransparentMode/Core/Inc/app_entry.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ extern "C" {
4242
/* Exported constants --------------------------------------------------------*/
4343
#define WPAN_SUCCESS 0u
4444

45-
/* USER CODE BEGIN EC */
4645
/******************************************************************************
4746
* Information Table
4847
*
@@ -56,9 +55,12 @@ extern "C" {
5655
******************************************************************************/
5756
#define CFG_FW_BUILD (0)
5857
#define CFG_FW_BRANCH (0)
59-
#define CFG_FW_SUBVERSION (1)
58+
#define CFG_FW_SUBVERSION (0)
6059
#define CFG_FW_MINOR_VERSION (4)
6160
#define CFG_FW_MAJOR_VERSION (1)
61+
62+
/* USER CODE BEGIN EC */
63+
6264
/* USER CODE END EC */
6365

6466
/* Exported variables --------------------------------------------------------*/

lib/stm32wba/README

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -43,40 +43,40 @@ Description:
4343
Middlewares/ST/STM32_WPAN/link_layer/ll_sys/src/ll_sys_startup.c
4444
Middlewares/ST/STM32_WPAN/link_layer/ll_sys/inc/ll_sys_startup.h
4545
Middlewares/ST/STM32_WPAN/stm32_wpan_common.h
46-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h
47-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h
48-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h
49-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h
50-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/Core/Inc/main.h
51-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/Flash/rf_timing_synchro.c
52-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/Flash/rf_timing_synchro.h
53-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/Flash/flash_driver.c
54-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/Flash/flash_driver.h
55-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/Flash/flash_manager.c
56-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/Flash/flash_manager.h
57-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/RTDebug/debug_signals.h
58-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/RTDebug/RTDebug.c
59-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/RTDebug/RTDebug.h
60-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/RTDebug/local_debug_tables.h
61-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/scm.c
62-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/scm.h
63-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/stm_list.c
64-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/stm_list.h
65-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Modules/utilities_common.h
66-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Interfaces/hw.h
67-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Interfaces/hw_aes.c
68-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Interfaces/hw_if.h
69-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Interfaces/hw_pka.c
70-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Interfaces/pka_p256.c
71-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Config/Log/log_module.c
72-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Config/Log/log_module.h
73-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Config/Debug_GPIO/app_debug.h
74-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/System/Config/Debug_GPIO/debug_config.h
75-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/power_table.c
76-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/bpka.c
77-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/bpka.h
78-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/linklayer_plat.c
79-
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/ll_sys_if.c
46+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h
47+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h
48+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h
49+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h
50+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h
51+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/Flash/rf_timing_synchro.c
52+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/Flash/rf_timing_synchro.h
53+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/Flash/flash_driver.c
54+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/Flash/flash_driver.h
55+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/Flash/flash_manager.c
56+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/Flash/flash_manager.h
57+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/RTDebug/debug_signals.h
58+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/RTDebug/RTDebug.c
59+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/RTDebug/RTDebug.h
60+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/RTDebug/local_debug_tables.h
61+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/scm.c
62+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/scm.h
63+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/stm_list.c
64+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/stm_list.h
65+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Modules/utilities_common.h
66+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Interfaces/hw.h
67+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Interfaces/hw_aes.c
68+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Interfaces/hw_if.h
69+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Interfaces/hw_pka.c
70+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Interfaces/pka_p256.c
71+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Config/Log/log_module.c
72+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Config/Log/log_module.h
73+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Config/Debug_GPIO/app_debug.h
74+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/System/Config/Debug_GPIO/debug_config.h
75+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/power_table.c
76+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/bpka.c
77+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/bpka.h
78+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/linklayer_plat.c
79+
Projects/NUCLEO-WBA55CG/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/ll_sys_if.c
8080
Utilities/trace/adv_trace/stm32_adv_trace.h
8181
Utilities/misc/stm32_mem.h
8282
Utilities/tim_serv/stm32_timer.h

0 commit comments

Comments
 (0)