Skip to content

Commit ba8c436

Browse files
asm5878asm5878
committed
lib/stm32: update BLE stm32wba to cube version V1.6.0
Update BLE lib version for STM32WBAxx serie from Cube version v1.5.0 to version v1.6.0. Covering both STM32WBA5X and STM32WBA6X. Signed-off-by: Alessandro Manganaro <alessandro.manganaro@st.com>
1 parent 6e4716f commit ba8c436

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+722
-1097
lines changed

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,13 @@
155155
*
156156
* When CFG_LPM_LEVEL is set to:
157157
* - 0 : Low Power Mode is not activated, RUN mode will be used.
158-
* - 1 : Low power active, the one selected with CFG_LPM_STDBY_SUPPORTED
159-
* - 2 : In addition, force to disable modules to reach lowest power figures.
158+
* - 1 : Low power active, mode selected with CFG_LPM_STDBY_SUPPORTED
159+
* - 2 : In addition log and debug are disabled to reach lowest power figures.
160160
*
161161
* When CFG_LPM_STDBY_SUPPORTED is set to:
162+
* - 2 : Stop mode 2 is used as low power mode (if supported by target)
162163
* - 1 : Standby is used as low power mode.
163-
* - 0 : Standby is not used, so stop mode 1 is used as low power mode.
164+
* - 0 : Stop mode 1 is used as low power mode.
164165
*
165166
******************************************************************************/
166167
#define CFG_LPM_LEVEL (1)
@@ -214,12 +215,10 @@ typedef enum
214215
/**
215216
* Enable or disable LOG over UART in the application.
216217
* Low power level(CFG_LPM_LEVEL) above 1 will disable LOG.
217-
* Standby low power mode(CFG_LPM_STDBY_SUPPORTED) will disable LOG.
218+
* Standby low power mode(CFG_LPM_STDBY_SUPPORTED) above 0 will disable LOG.
218219
*/
219220
#define CFG_LOG_SUPPORTED (0U)
220221

221-
/* Usart used by LOG */
222-
223222
/* Configure Log display settings */
224223
#define CFG_LOG_INSERT_COLOR_INSIDE_THE_TRACE (0U)
225224
#define CFG_LOG_INSERT_TIME_STAMP_INSIDE_THE_TRACE (0U)
@@ -238,6 +237,18 @@ typedef enum
238237

239238
/******************************************************************************
240239
* Configure Log level for Application
240+
*
241+
* APPLI_CONFIG_LOG_LEVEL can be any value of the Log_Verbose_Level_t enum.
242+
*
243+
* APPLI_CONFIG_LOG_REGION can either be :
244+
* - LOG_REGION_ALL_REGIONS to enable all regions
245+
* or
246+
* - One or several specific regions (any value except LOG_REGION_ALL_REGIONS)
247+
* from the Log_Region_t enum and matching the mask value.
248+
*
249+
* For example, to enable both LOG_REGION_BLE and LOG_REGION_APP,
250+
* the value assigned to the define is :
251+
* (1U << LOG_REGION_BLE | 1U << LOG_REGION_APP)
241252
******************************************************************************/
242253
#define APPLI_CONFIG_LOG_LEVEL LOG_VERBOSE_INFO
243254
#define APPLI_CONFIG_LOG_REGION (LOG_REGION_ALL_REGIONS)
@@ -267,8 +278,8 @@ typedef enum
267278
CFG_TASK_BLE_HOST,
268279
CFG_TASK_AMM,
269280
CFG_TASK_BPKA,
270-
CFG_TASK_FLASH_MANAGER,
271281
CFG_TASK_BLE_TIMER_BCKGND,
282+
CFG_TASK_FLASH_MANAGER,
272283
/* USER CODE BEGIN CFG_Task_Id_t */
273284
TASK_BUTTON_1,
274285
TASK_BUTTON_2,
@@ -364,26 +375,15 @@ typedef enum
364375
/******************************************************************************
365376
* HW RADIO configuration
366377
******************************************************************************/
367-
/* Do not modify - must be 1 */
368-
#define USE_RADIO_LOW_ISR (1)
369-
370-
/* Do not modify - must be 1 */
371-
#define NEXT_EVENT_SCHEDULING_FROM_ISR (1)
372-
373378
/* Link Layer uses temperature based calibration (0 --> NO ; 1 --> YES) */
374379
#define USE_TEMPERATURE_BASED_RADIO_CALIBRATION (0)
375380

376381
#define RADIO_INTR_NUM RADIO_IRQn /* 2.4GHz RADIO global interrupt */
377382
#define RADIO_INTR_PRIO_HIGH (0) /* 2.4GHz RADIO interrupt priority when radio is Active */
378383
#define RADIO_INTR_PRIO_LOW (5) /* 2.4GHz RADIO interrupt priority when radio is Not Active - Sleep Timer Only */
379384

380-
#if (USE_RADIO_LOW_ISR == 1)
381385
#define RADIO_SW_LOW_INTR_NUM HASH_IRQn /* Selected interrupt vector for 2.4GHz RADIO low ISR */
382386
#define RADIO_SW_LOW_INTR_PRIO (14) /* 2.4GHz RADIO low ISR priority */
383-
#endif /* USE_RADIO_LOW_ISR */
384-
385-
/* Link Layer supported number of antennas */
386-
#define RADIO_NUM_OF_ANTENNAS (4)
387387

388388
#define RCC_INTR_PRIO (1) /* HSERDY and PLL1RDY */
389389

@@ -397,12 +397,10 @@ typedef enum
397397
#define CFG_EXTERNAL_PA_ENABLE (0)
398398

399399
#define CFG_BLE_AOA_AOD_ENABLE (0)
400+
#define CFG_RADIO_NUM_OF_ANTENNAS (8) /* Link Layer supported number of antennas */
400401

401-
/* Custom LSE sleep clock accuracy to use if both conditions are met:
402-
* - LSE is selected as Link Layer sleep clock source
403-
* - the LSE used is different from the default one.
404-
*/
405-
#define CFG_RADIO_LSE_SLEEP_TIMER_CUSTOM_SCA_RANGE (0)
402+
/* Radio sleep clock LSE accuracy configuration */
403+
#define CFG_RADIO_LSE_SLEEP_TIMER_CUSTOM_SCA_RANGE (0x00)
406404

407405
/* USER CODE BEGIN Radio_Configuration */
408406

@@ -472,12 +470,12 @@ typedef enum
472470
#endif /* CFG_DEBUGGER_LEVEL */
473471
#endif /* CFG_LPM_LEVEL */
474472

475-
#if (CFG_LPM_STDBY_SUPPORTED == 1)
473+
#if (CFG_LPM_STDBY_SUPPORTED != 0) && (CFG_LPM_LEVEL != 0)
476474
#if CFG_LOG_SUPPORTED
477475
#undef CFG_LOG_SUPPORTED
478476
#define CFG_LOG_SUPPORTED (0)
479477
#endif /* CFG_LOG_SUPPORTED */
480-
#endif /* CFG_LPM_STDBY_SUPPORTED */
478+
#endif /* (CFG_LPM_STDBY_SUPPORTED > 0) && (CFG_LPM_LEVEL != 0) */
481479

482480
/* USER CODE BEGIN Defines_2 */
483481

‎lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/linklayer_plat.c

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
/* USER CODE END Header */
2020

21-
#ifndef __ZEPHYR__
21+
2222
#include "stm32wbaxx_hal.h"
2323
#include "stm32wbaxx_hal_conf.h"
2424
#include "stm32wbaxx_ll_rcc.h"
@@ -31,10 +31,12 @@
3131
#if (USE_TEMPERATURE_BASED_RADIO_CALIBRATION == 1)
3232
#include "adc_ctrl.h"
3333
#endif /* (USE_TEMPERATURE_BASED_RADIO_CALIBRATION == 1) */
34-
34+
#ifndef __ZEPHYR__
3535
#if (CFG_LPM_LEVEL != 0)
3636
#include "stm32_lpm.h"
37+
#include "stm32_lpm_if.h"
3738
#endif /* (CFG_LPM_LEVEL != 0) */
39+
3840
/* USER CODE BEGIN Includes */
3941

4042
/* USER CODE END Includes */
@@ -78,7 +80,6 @@ void LINKLAYER_PLAT_ClockInit(void)
7880
/* Enable AHB5ENR peripheral clock (bus CLK) */
7981
__HAL_RCC_RADIO_CLK_ENABLE();
8082
}
81-
8283
#ifndef __ZEPHYR__
8384
/**
8485
* @brief Link Layer active waiting loop.
@@ -87,12 +88,12 @@ void LINKLAYER_PLAT_ClockInit(void)
8788
*/
8889
void LINKLAYER_PLAT_DelayUs(uint32_t delay)
8990
{
90-
__IO register uint32_t Delay = delay * (SystemCoreClock / 1000000U);
91-
do
92-
{
93-
__NOP();
94-
}
95-
while (Delay --);
91+
__IO register uint32_t Delay = delay * (SystemCoreClock / 1000000U);
92+
do
93+
{
94+
__NOP();
95+
}
96+
while (Delay --);
9697
}
9798

9899
/**
@@ -113,8 +114,12 @@ void LINKLAYER_PLAT_Assert(uint8_t condition)
113114
*/
114115
void LINKLAYER_PLAT_WaitHclkRdy(void)
115116
{
116-
/* Wait on radio bus clock readiness */
117-
while(HAL_RCCEx_GetRadioBusClockReadiness() != RCC_RADIO_BUS_CLOCK_READY);
117+
/* Wait on radio bus clock readiness if it has been turned of */
118+
if (AHB5_SwitchedOff == 1)
119+
{
120+
AHB5_SwitchedOff = 0;
121+
while (radio_sleep_timer_val == ll_intf_cmn_get_slptmr_value());
122+
}
118123
}
119124

120125
/**
@@ -470,16 +475,15 @@ void LINKLAYER_PLAT_StopRadioEvt(void)
470475
*/
471476
void LINKLAYER_PLAT_RCOStartClbr(void)
472477
{
473-
#if (CFG_SCM_SUPPORTED == 1)
474478
#if (CFG_LPM_LEVEL != 0)
475-
#if (CFG_LPM_STDBY_SUPPORTED == 1)
476-
UTIL_LPM_SetOffMode(1U << CFG_LPM_LL_HW_RCO_CLBR, UTIL_LPM_DISABLE);
477-
#endif /* (CFG_LPM_STDBY_SUPPORTED == 1) */
479+
PWR_DisableSleepMode();
480+
/* Disabling stop mode prevents also from entering in standby */
478481
UTIL_LPM_SetStopMode(1U << CFG_LPM_LL_HW_RCO_CLBR, UTIL_LPM_DISABLE);
479482
#endif /* (CFG_LPM_LEVEL != 0) */
483+
#if (CFG_SCM_SUPPORTED == 1)
480484
scm_setsystemclock(SCM_USER_LL_HW_RCO_CLBR, HSE_32MHZ);
481485
while (LL_PWR_IsActiveFlag_VOS() == 0);
482-
#endif /* CFG_SCM_SUPPORTED */
486+
#endif /* (CFG_SCM_SUPPORTED == 1) */
483487
}
484488

485489
/**
@@ -489,16 +493,14 @@ void LINKLAYER_PLAT_RCOStartClbr(void)
489493
*/
490494
void LINKLAYER_PLAT_RCOStopClbr(void)
491495
{
492-
#if (CFG_SCM_SUPPORTED == 1)
493496
#if (CFG_LPM_LEVEL != 0)
494-
#if (CFG_LPM_STDBY_SUPPORTED == 1)
495-
UTIL_LPM_SetOffMode(1U << CFG_LPM_LL_HW_RCO_CLBR, UTIL_LPM_ENABLE);
496-
#endif /* (CFG_LPM_STDBY_SUPPORTED == 1) */
497+
PWR_EnableSleepMode();
497498
UTIL_LPM_SetStopMode(1U << CFG_LPM_LL_HW_RCO_CLBR, UTIL_LPM_ENABLE);
498499
#endif /* (CFG_LPM_LEVEL != 0) */
500+
#if (CFG_SCM_SUPPORTED == 1)
499501
scm_setsystemclock(SCM_USER_LL_HW_RCO_CLBR, HSE_16MHZ);
500502
while (LL_PWR_IsActiveFlag_VOS() == 0);
501-
#endif /* CFG_SCM_SUPPORTED */
503+
#endif /* (CFG_SCM_SUPPORTED == 1) */
502504
}
503505

504506
/**

0 commit comments

Comments
 (0)