@@ -33,6 +33,8 @@ static PinName g_current_pin = NC;
33
33
#ifndef ADC_SAMPLINGTIME
34
34
#if defined(ADC_SAMPLETIME_8CYCLES_5)
35
35
#define ADC_SAMPLINGTIME ADC_SAMPLETIME_8CYCLES_5;
36
+ #elif defined(ADC_SAMPLETIME_12CYCLES)
37
+ #define ADC_SAMPLINGTIME ADC_SAMPLETIME_12CYCLES;
36
38
#elif defined(ADC_SAMPLETIME_12CYCLES_5)
37
39
#define ADC_SAMPLINGTIME ADC_SAMPLETIME_12CYCLES_5;
38
40
#elif defined(ADC_SAMPLETIME_13CYCLES_5)
@@ -60,6 +62,8 @@ static PinName g_current_pin = NC;
60
62
#define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_384CYCLES
61
63
#elif defined(ADC_SAMPLETIME_810CYCLES_5)
62
64
#define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_810CYCLES_5
65
+ #elif defined(ADC_SAMPLETIME_814CYCLES)
66
+ #define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_814CYCLES
63
67
#elif defined(ADC_SAMPLETIME_640CYCLES_5)
64
68
#define ADC_SAMPLINGTIME_INTERNAL ADC_SAMPLETIME_640CYCLES_5
65
69
#elif defined(ADC_SAMPLETIME_601CYCLES_5)
@@ -176,6 +180,7 @@ static uint32_t get_adc_channel(PinName pin, uint32_t *bank)
176
180
case 23 :
177
181
channel = ADC_CHANNEL_23;
178
182
break ;
183
+ #ifdef ADC_CHANNEL_24
179
184
case 24 :
180
185
channel = ADC_CHANNEL_24;
181
186
break ;
@@ -202,6 +207,7 @@ static uint32_t get_adc_channel(PinName pin, uint32_t *bank)
202
207
channel = ADC_CHANNEL_31;
203
208
break ;
204
209
#endif
210
+ #endif
205
211
#endif
206
212
default :
207
213
channel = 0 ;
@@ -910,7 +916,7 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
910
916
#endif /* STM32L4xx || STM32WBxx */
911
917
return 0 ;
912
918
}
913
- #ifdef ADC_SCAN_SEQ_FIXED
919
+ #if defined( ADC_SCAN_SEQ_FIXED) && defined(ADC_RANK_CHANNEL_NUMBER)
914
920
AdcChannelConf.Rank = ADC_RANK_CHANNEL_NUMBER; /* Enable the rank of the selected channels when not fully configurable */
915
921
#else
916
922
AdcChannelConf.Rank = ADC_REGULAR_RANK_1; /* Specifies the rank in the regular group sequencer */
0 commit comments