libraries(WBA): ADC support

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

cores/arduino/stm32/stm32_def.h

@@ -71,7 +71,7 @@
 #endif
 
 // Here define some compatibility
-#ifndef ADC1
+#if !defined (ADC1) && defined (ADC)
   #define ADC1 ADC
 #endif
 #ifndef CAN1

libraries/SrcWrapper/src/stm32/analog.cpp

@@ -82,6 +82,8 @@ static PinName g_current_pin = NC;
 #define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_239CYCLES_5
 #elif defined(ADC_SAMPLETIME_160CYCLES_5)
 #define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_160CYCLES_5
+#elif defined(ADC_SAMPLETIME_814CYCLES_5)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_814CYCLES_5
 #else
 #error "ADC sampling time could not be defined for internal channels!"
 #endif
@@ -157,6 +159,7 @@ uint32_t get_adc_channel(PinName pin, uint32_t *bank)
     case 13:
       channel = ADC_CHANNEL_13;
       break;
+#ifdef ADC_CHANNEL_14
     case 14:
       channel = ADC_CHANNEL_14;
       break;
@@ -224,6 +227,7 @@ uint32_t get_adc_channel(PinName pin, uint32_t *bank)
 #endif
 #endif
 #endif
+#endif
 #endif
     default:
       _Error_Handler("ADC: Unknown adc channel", (int)(STM_PIN_CHANNEL(function)));
@@ -563,6 +567,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
 {
   /*##-1- Enable peripherals and GPIO Clocks #################################*/
   /* ADC Periph clock enable */
+#ifdef ADC1
   if (hadc->Instance == ADC1) {
 #ifdef __HAL_RCC_ADC1_CLK_ENABLE
     __HAL_RCC_ADC1_CLK_ENABLE();
@@ -571,8 +576,9 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
     __HAL_RCC_ADC12_CLK_ENABLE();
 #endif
   }
+#endif
 #ifdef ADC2
-  else if (hadc->Instance == ADC2) {
+  if (hadc->Instance == ADC2) {
 #ifdef __HAL_RCC_ADC2_CLK_ENABLE
     __HAL_RCC_ADC2_CLK_ENABLE();
 #endif
@@ -582,7 +588,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
   }
 #endif
 #ifdef ADC3
-  else if (hadc->Instance == ADC3) {
+  if (hadc->Instance == ADC3) {
 #ifdef __HAL_RCC_ADC3_CLK_ENABLE
     __HAL_RCC_ADC3_CLK_ENABLE();
 #endif
@@ -595,7 +601,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
   }
 #endif
 #ifdef ADC4
-  else if (hadc->Instance == ADC4) {
+  if (hadc->Instance == ADC4) {
 #ifdef __HAL_RCC_ADC4_CLK_ENABLE
     __HAL_RCC_ADC4_CLK_ENABLE();
 #endif
@@ -608,7 +614,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
   }
 #endif
 #ifdef ADC5
-  else if (hadc->Instance == ADC5) {
+  if (hadc->Instance == ADC5) {
 #if defined(ADC345_COMMON)
     __HAL_RCC_ADC345_CLK_ENABLE();
 #endif
@@ -647,6 +653,7 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
   __HAL_RCC_ADC_RELEASE_RESET();
 #endif
 
+#ifdef ADC1
   if (hadc->Instance == ADC1) {
 #ifdef __HAL_RCC_ADC1_FORCE_RESET
     __HAL_RCC_ADC1_FORCE_RESET();
@@ -667,8 +674,9 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
     __HAL_RCC_ADC12_CLK_DISABLE();
 #endif
   }
+#endif
 #ifdef ADC2
-  else if (hadc->Instance == ADC2) {
+  if (hadc->Instance == ADC2) {
 #ifdef __HAL_RCC_ADC2_FORCE_RESET
     __HAL_RCC_ADC2_FORCE_RESET();
 #endif
@@ -690,7 +698,7 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
   }
 #endif
 #ifdef ADC3
-  else if (hadc->Instance == ADC3) {
+  if (hadc->Instance == ADC3) {
 #ifdef __HAL_RCC_ADC3_FORCE_RESET
     __HAL_RCC_ADC3_FORCE_RESET();
 #endif
@@ -717,7 +725,7 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
   }
 #endif
 #ifdef ADC4
-  else if (hadc->Instance == ADC4) {
+  if (hadc->Instance == ADC4) {
 #ifdef __HAL_RCC_ADC4_FORCE_RESET
     __HAL_RCC_ADC4_FORCE_RESET();
 #endif
@@ -744,7 +752,7 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
   }
 #endif
 #ifdef ADC5
-  else if (hadc->Instance == ADC5) {
+  if (hadc->Instance == ADC5) {
 #if defined(ADC345_COMMON)
     __HAL_RCC_ADC345_FORCE_RESET();
     __HAL_RCC_ADC345_RELEASE_RESET();
@@ -781,6 +789,8 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
 #else
     AdcHandle.Instance = ADC2;
 #endif
+#elif defined(STM32WBAxx)
+    AdcHandle.Instance = ADC4;
 #else
     AdcHandle.Instance = ADC1;
 #if defined(ADC5) && defined(ADC_CHANNEL_TEMPSENSOR_ADC5)
@@ -877,7 +887,8 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
 #endif
   AdcHandle.Init.DiscontinuousConvMode = DISABLE;                       /* Parameter discarded because sequencer is disabled */
 #if !defined(STM32C0xx) && !defined(STM32F0xx) && !defined(STM32G0xx) && \
-    !defined(STM32L0xx) && !defined(STM32WLxx) && !defined(ADC_SUPPORT_2_5_MSPS)
+    !defined(STM32L0xx) && !defined(STM32WBAxx) && !defined(STM32WLxx) && \
+    !defined(ADC_SUPPORT_2_5_MSPS)
   AdcHandle.Init.NbrOfDiscConversion   = 0;                             /* Parameter discarded because sequencer is disabled */
 #endif
   AdcHandle.Init.ExternalTrigConv      = ADC_SOFTWARE_START;            /* Software start to trig the 1st conversion manually, without external event */
@@ -902,7 +913,7 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
   AdcHandle.Init.SamplingTimeCommon    = samplingTime;
 #endif
 #if defined(STM32C0xx) || defined(STM32G0xx) || defined(STM32U5xx) || \
-    defined(STM32WLxx) || defined(ADC_SUPPORT_2_5_MSPS)
+    defined(STM32WBAxx) || defined(STM32WLxx) || defined(ADC_SUPPORT_2_5_MSPS)
   AdcHandle.Init.SamplingTimeCommon1   = samplingTime;              /* Set sampling time common to a group of channels. */
   AdcHandle.Init.SamplingTimeCommon2   = samplingTime;              /* Set sampling time common to a group of channels, second common setting possible.*/
 #endif
@@ -966,8 +977,8 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
 #endif
 #if !defined(STM32C0xx) && !defined(STM32F0xx) && !defined(STM32F1xx) && \
     !defined(STM32F2xx) && !defined(STM32G0xx) && !defined(STM32L0xx) && \
-    !defined(STM32L1xx) && !defined(STM32WBxx) && !defined(STM32WLxx) && \
-    !defined(ADC1_V2_5)
+    !defined(STM32L1xx) && !defined(STM32WBAxx) && !defined(STM32WBxx) && \
+    !defined(STM32WLxx) && !defined(ADC1_V2_5)
   AdcChannelConf.Offset = 0;                                      /* Parameter discarded because offset correction is disabled */
 #endif
 #if defined (STM32H7xx) || defined(STM32MP1xx)