Skip to content

Commit 1b159f8

Browse files
committed
core: update to support STM32WLxx serie
Signed-off-by: Frederic Pillon <[email protected]>
1 parent 06893ba commit 1b159f8

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

cores/arduino/stm32/backup.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ static inline void setBackupRegister(uint32_t index, uint32_t value)
106106
#elif defined(RTC_BKP0R)
107107
LL_RTC_BAK_SetRegister(RTC, index, value);
108108
#elif defined(TAMP_BKP0R)
109-
#if defined(STM32G4xx) || defined(STM32L5xx) || defined(STM32MP1xx)
109+
#if defined(STM32G4xx) || defined(STM32L5xx) ||\
110+
defined(STM32MP1xx) || defined(STM32WLxx)
110111
/* For those series this API requires RTC even if it is not used
111112
and TAMP is used instead */
112113
LL_RTC_BKP_SetRegister(RTC, index, value);
@@ -126,7 +127,8 @@ static inline uint32_t getBackupRegister(uint32_t index)
126127
#elif defined(RTC_BKP0R)
127128
return LL_RTC_BAK_GetRegister(RTC, index);
128129
#elif defined(TAMP_BKP0R)
129-
#if defined(STM32G4xx) || defined(STM32L5xx) || defined(STM32MP1xx)
130+
#if defined(STM32G4xx) || defined(STM32L5xx) ||\
131+
defined(STM32MP1xx) || defined(STM32WLxx)
130132
/* For those series this API requires RTC even if it is not used
131133
and TAMP is used instead */
132134
return LL_RTC_BKP_GetRegister(RTC, index);

cores/arduino/stm32/stm32_def.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,15 @@
6363
#endif
6464

6565
// Here define some compatibility
66+
#ifndef ADC1
67+
#define ADC1 ADC
68+
#endif
6669
#ifndef CAN1
6770
#define CAN1 CAN
6871
#endif
72+
#ifndef DAC1
73+
#define DAC1 DAC
74+
#endif
6975

7076
/* STM32G0xx defined USB_DRD_FS */
7177
#if !defined(USB ) && defined(USB_DRD_FS)

cores/arduino/stm32/timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ extern "C" {
5858
#define TIM1_IRQn TIM1_UP_TIM10_IRQn
5959
#define TIM1_IRQHandler TIM1_UP_TIM10_IRQHandler
6060
#endif
61-
#elif defined(STM32H7xx) || defined(STM32L5xx) || defined(STM32MP1xx)
61+
#elif defined(STM32H7xx) || defined(STM32L5xx) || defined(STM32MP1xx) || defined(STM32WLxx)
6262
#define TIM1_IRQn TIM1_UP_IRQn
6363
#define TIM1_IRQHandler TIM1_UP_IRQHandler
6464
#endif

libraries/SrcWrapper/src/stm32/analog.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,8 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
841841
AdcHandle.Init.NbrOfConversion = 1; /* Specifies the number of ranks that will be converted within the regular group sequencer. */
842842
#endif
843843
AdcHandle.Init.DiscontinuousConvMode = DISABLE; /* Parameter discarded because sequencer is disabled */
844-
#if !defined(STM32F0xx) && !defined(STM32G0xx) && !defined(STM32L0xx)
844+
#if !defined(STM32F0xx) && !defined(STM32G0xx) && !defined(STM32L0xx) && \
845+
!defined(STM32WLxx)
845846
AdcHandle.Init.NbrOfDiscConversion = 0; /* Parameter discarded because sequencer is disabled */
846847
#endif
847848
AdcHandle.Init.ExternalTrigConv = ADC_SOFTWARE_START; /* Software start to trig the 1st conversion manually, without external event */
@@ -923,14 +924,15 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
923924
#endif
924925
#if !defined(STM32F0xx) && !defined(STM32F1xx) && !defined(STM32F2xx) && \
925926
!defined(STM32F4xx) && !defined(STM32F7xx) && !defined(STM32G0xx) && \
926-
!defined(STM32L0xx) && !defined(STM32L1xx) && \
927+
!defined(STM32L0xx) && !defined(STM32L1xx) && !defined(STM32WLxx) && \
927928
!defined(STM32F373xC) && !defined(STM32F378xx)
928929
AdcChannelConf.SingleDiff = ADC_SINGLE_ENDED; /* Single-ended input channel */
929930
AdcChannelConf.OffsetNumber = ADC_OFFSET_NONE; /* No offset subtraction */
930931
#endif
931932
#if !defined(STM32F0xx) && !defined(STM32F1xx) && !defined(STM32F2xx) && \
932933
!defined(STM32G0xx) && !defined(STM32L0xx) && !defined(STM32L1xx) && \
933-
!defined(STM32WBxx) && !defined(STM32F373xC) && !defined(STM32F378xx)
934+
!defined(STM32WBxx) && !defined(STM32WLxx) && \
935+
!defined(STM32F373xC) && !defined(STM32F378xx)
934936
AdcChannelConf.Offset = 0; /* Parameter discarded because offset correction is disabled */
935937
#endif
936938
#if defined (STM32H7xx) || defined(STM32MP1xx)
@@ -947,10 +949,10 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
947949
#if defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32F3xx) || \
948950
defined(STM32G0xx) || defined(STM32G4xx) || defined(STM32H7xx) || \
949951
defined(STM32L0xx) || defined(STM32L4xx) || defined(STM32MP1xx) || \
950-
defined(STM32WBxx)
952+
defined(STM32WBxx) || defined(STM32WLxx)
951953
/*##-2.1- Calibrate ADC then Start the conversion process ####################*/
952954
#if defined(STM32F0xx) || defined(STM32G0xx) || defined(STM32F1xx) || \
953-
defined(STM32F373xC) || defined(STM32F378xx)
955+
defined(STM32WLxx) || defined(STM32F373xC) || defined(STM32F378xx)
954956
if (HAL_ADCEx_Calibration_Start(&AdcHandle) != HAL_OK)
955957
#elif defined (STM32H7xx) || defined(STM32MP1xx)
956958
if (HAL_ADCEx_Calibration_Start(&AdcHandle, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED) != HAL_OK)

0 commit comments

Comments
 (0)