Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit884c7b9

Browse files
committed
system(wb0) update STM32WB0x HAL Drivers to v1.4.0
Included in STM32CubeWB0 FW v1.4.0Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parente3c8ffd commit884c7b9

16 files changed

+381
-424
lines changed

‎system/Drivers/STM32WB0x_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,10 @@ extern "C" {
361361
#if defined(STM32L4R5xx)|| defined(STM32L4R9xx)|| defined(STM32L4R9xx)|| defined(STM32L4S5xx)|| \
362362
defined(STM32L4S7xx)|| defined(STM32L4S9xx)
363363
#defineDMA_REQUEST_DCMI_PSSI DMA_REQUEST_DCMI
364-
#endif
364+
#elif defined(STM32L4P5xx)|| defined(STM32L4Q5xx)
365+
#defineDMA_REQUEST_PSSI DMA_REQUEST_DCMI_PSSI
366+
#defineLL_DMAMUX_REQ_PSSI LL_DMAMUX_REQ_DCMI_PSSI
367+
#endif/* STM32L4R5xx || STM32L4R9xx || STM32L4R9xx || STM32L4S5xx || STM32L4S7xx || STM32L4S9xx */
365368

366369
#endif/* STM32L4 */
367370

@@ -2149,6 +2152,13 @@ extern "C" {
21492152
#defineUFB_MODE_BitNumber UFB_MODE_BIT_NUMBER
21502153
#defineCMP_PD_BitNumber CMP_PD_BIT_NUMBER
21512154

2155+
#if defined(STM32H7RS)|| defined(STM32N6)
2156+
#defineFMC_SWAPBMAP_DISABLE FMC_SWAPBANK_MODE0
2157+
#defineFMC_SWAPBMAP_SDRAM_SRAM FMC_SWAPBANK_MODE1
2158+
#defineHAL_SetFMCMemorySwappingConfig HAL_FMC_SetBankSwapConfig
2159+
#defineHAL_GetFMCMemorySwappingConfig HAL_FMC_GetBankSwapConfig
2160+
#endif/* STM32H7RS || STM32N6 */
2161+
21522162
/**
21532163
* @}
21542164
*/
@@ -3701,9 +3711,7 @@ extern "C" {
37013711
#defineRCC_SYSCLKSOURCE_STATUS_PLLR RCC_SYSCLKSOURCE_STATUS_PLLCLK
37023712
#endif
37033713

3704-
#if defined(STM32L4)|| defined(STM32WB)|| defined(STM32G0)|| defined(STM32G4)|| defined(STM32L5)|| \
3705-
defined(STM32WL)|| defined(STM32C0)|| defined(STM32N6)|| defined(STM32H7RS)|| \
3706-
defined(STM32U0)
3714+
#if defined(STM32L4)|| defined(STM32WB)|| defined(STM32G0)|| defined(STM32G4)|| defined(STM32L5)|| defined(STM32WL)|| defined(STM32C0)|| defined(STM32N6)|| defined(STM32H7RS)|| defined(STM32U0)
37073715
#defineRCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
37083716
#else
37093717
#defineRCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3952,10 +3960,7 @@ extern "C" {
39523960
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
39533961
* @{
39543962
*/
3955-
#if defined (STM32G0)|| defined (STM32L5)|| defined (STM32L412xx)|| defined (STM32L422xx)|| \
3956-
defined (STM32L4P5xx)|| defined (STM32L4Q5xx)|| defined (STM32G4)|| defined (STM32WL)|| defined (STM32U5)|| \
3957-
defined (STM32WBA)|| defined (STM32H5)|| \
3958-
defined (STM32C0)|| defined (STM32N6)|| defined (STM32H7RS)|| defined (STM32U0)|| defined (STM32U3)
3963+
#if defined (STM32G0)|| defined (STM32L5)|| defined (STM32L412xx)|| defined (STM32L422xx)|| defined (STM32L4P5xx)|| defined (STM32L4Q5xx)|| defined (STM32G4)|| defined (STM32WL)|| defined (STM32U5)|| defined (STM32WBA)|| defined (STM32H5)|| defined (STM32C0)|| defined (STM32N6)|| defined (STM32H7RS)|| defined (STM32U0)|| defined (STM32U3)
39593964
#else
39603965
#define__HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39613966
#endif

‎system/Drivers/STM32WB0x_HAL_Driver/Inc/stm32wb0x_hal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extern "C" {
4848
* @brief HAL Driver version number
4949
*/
5050
#define__STM32WB0x_HAL_VERSION_MAIN (0x01U)/*!< [31:24] main version */
51-
#define__STM32WB0x_HAL_VERSION_SUB1 (0x03U)/*!< [23:16] sub1 version */
51+
#define__STM32WB0x_HAL_VERSION_SUB1 (0x04U)/*!< [23:16] sub1 version */
5252
#define__STM32WB0x_HAL_VERSION_SUB2 (0x00U)/*!< [15:8] sub2 version */
5353
#define__STM32WB0x_HAL_VERSION_RC (0x00U)/*!< [7:0] release candidate */
5454
#define__STM32WB0x_HAL_VERSION ((__STM32WB0x_HAL_VERSION_MAIN << 24U)\

‎system/Drivers/STM32WB0x_HAL_Driver/Inc/stm32wb0x_hal_adc.h‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,10 +365,14 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
365365
* @{
366366
*/
367367

368-
#defineADC_SAMPLING_AT_START (LL_ADC_SAMPLING_AT_START)/*!< Sampling only at conversion start (default) */
369-
#defineADC_SAMPLING_AT_END (LL_ADC_SAMPLING_AT_END)/*!< Sampling sampling phase starts after end of
370-
conversion, and stops upon trigger event
371-
(Also known as Bulb sampling mode). */
368+
#defineADC_SAMPLING_AT_START (LL_ADC_SAMPLING_AT_START)/*!< Sampling phase starts only at conversion start and
369+
sampling time is 125ns regardless of the sampling
370+
period (default). */
371+
#defineADC_SAMPLING_AT_END (LL_ADC_SAMPLING_AT_END)/*!< Sampling phase starts after end of
372+
conversion, and stops upon trigger event (Also known
373+
as Bulb sampling mode).
374+
Sampling time is a function of the sampling period
375+
(Sample rate). */
372376

373377
/**
374378
* @}

‎system/Drivers/STM32WB0x_HAL_Driver/Inc/stm32wb0x_hal_radio.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,20 @@ typedef struct
9696
#endif/* USE_RADIO_PROPRIETARY_DRIVER */
9797

9898

99+
/**
100+
* @}
101+
*/
102+
103+
/** @defgroup RADIO_TIMER_Exported_Constants Radio Timer Exported Constants
104+
* @{
105+
*/
106+
107+
#defineRADIO_INITDELAY_WAKEUP (64U)
108+
#defineRADIO_INITDELAY_TIMER12_CAL (63U)
109+
#defineRADIO_INITDELAY_TIMER2_NOCAL (9U)
110+
111+
#defineRADIO_TXDELAY_START (16U)
112+
#defineRADIO_TXDELAY_END (24U)
99113
/**
100114
* @}
101115
*/
@@ -109,10 +123,14 @@ void HAL_RADIO_Init(RADIO_HandleTypeDef *hradio);
109123

110124
voidHAL_RADIO_TXRX_IRQHandler(void);
111125

126+
voidHAL_RADIO_RRM_IRQHandler(void);
127+
112128
voidHAL_RADIO_TXRX_SEQ_IRQHandler(void);
113129

114130
voidHAL_RADIO_TxRxCallback(uint32_tflags);
115131

132+
voidHAL_RADIO_RRMCallback(uint32_tble_irq_status);
133+
116134
voidHAL_RADIO_TxRxSeqCallback(void);
117135

118136
int8_tHAL_RADIO_ReadRSSI(void);

‎system/Drivers/STM32WB0x_HAL_Driver/Inc/stm32wb0x_hal_radio_timer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ RADIO_TIMER_Status HAL_RADIO_TIMER_GetRadioTimerStatus(uint64_t *time);
173173
* @param event_type: Specify if it is a TX (1) or RX (0) event.
174174
* @param cal_req: Specify if PLL calibration is requested (1) or not (0).
175175
* @retval 0 if radio activity has been scheduled successfully.
176-
* @retval 1 if radio activity has been rejected (it is too close or in the past).
176+
* @retval 1 if radio activity has been rejected.
177177
*/
178178
uint32_tHAL_RADIO_TIMER_SetRadioTimerValue(uint32_ttime,uint8_tevent_type,uint8_tcal_req);
179179

‎system/Drivers/STM32WB0x_HAL_Driver/Inc/stm32wb0x_ll_adc.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,14 @@ typedef struct
348348
* @{
349349
*/
350350

351-
#defineLL_ADC_SAMPLING_AT_START (0x00000000UL)/*!< Sampling only at conversion start */
352-
#defineLL_ADC_SAMPLING_AT_END (ADC_CONF_ADC_CONT_1V2)/*!< Sampling starts at the end of conversion (default)*/
351+
#defineLL_ADC_SAMPLING_AT_START (0x00000000UL)/*!< Sampling phase starts only at conversion start and
352+
sampling time is 125ns regardless of the sampling
353+
period (default). */
354+
#defineLL_ADC_SAMPLING_AT_END (ADC_CONF_ADC_CONT_1V2)/*!< Sampling phase starts after end of
355+
conversion, and stops upon trigger event (Also known
356+
as Bulb sampling mode).
357+
Sampling time is a function of the sampling period
358+
(Sample rate). */
353359

354360
/**
355361
* @}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp