Skip to content

Commit c0f4142

Browse files
fpistmfpistm
committed
chore(adc): add HAL v2 support
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 9ca0b9f commit c0f4142

6 files changed

Lines changed: 303 additions & 39 deletions

File tree

‎cores/arduino/pins_arduino.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ PinName analogInputToPinName(pin_size_t pin)
4141
PinName pn = digitalPinToPinName(analogInputToDigitalPin(pin));
4242
if (pn == NC) {
4343
switch (pin) {
44-
#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1)
44+
#ifdef ATEMP
4545
case ATEMP:
4646
pn = PADC_TEMP;
4747
break;
4848
#endif
49-
#if defined(ADC5) && defined(ADC_CHANNEL_TEMPSENSOR_ADC5)
49+
#ifdef ATEMP_ADC5
5050
case ATEMP_ADC5:
5151
pn = PADC_TEMP_ADC5;
5252
break;

‎cores/arduino/pins_arduino_analog.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141

4242
/* ADC internal channels (not a pins) */
4343
/* Only used for analogRead() */
44-
#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1)
44+
#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1) ||\
45+
defined(LL_ADC_CHANNEL_TEMPSENSOR)
4546
#define ATEMP (NUM_ANALOG_INTERNAL_FIRST)
4647
#endif
47-
#ifdef ADC_CHANNEL_VREFINT
48+
#if defined(ADC_CHANNEL_VREFINT) || defined(LL_ADC_CHANNEL_VREFINT)
4849
#define AVREF (NUM_ANALOG_INTERNAL_FIRST + 1)
4950
#endif
5051
#ifdef ADC_CHANNEL_VBAT

‎cores/arduino/wiring_analog.c‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ static int _internalWriteResolution =
4141
static uint32_t _writeFreq = PWM_FREQUENCY;
4242

4343
/* ADC */
44-
#if defined(ADC_RESOLUTION_16B) || defined(ADC_DS_DATA_WIDTH_16_BIT)
44+
#if defined(LL_ADC_RESOLUTION_16B) || defined(LL_ADC_DS_DATA_WIDTH_16_BIT)
4545
#define MAX_ADC_RESOLUTION 16
46-
#elif defined(ADC_DS_DATA_WIDTH_15_BIT)
46+
#elif defined(LL_ADC_DS_DATA_WIDTH_15_BIT)
4747
#define MAX_ADC_RESOLUTION 15
48-
#elif defined(ADC_RESOLUTION_14B) || defined(ADC_DS_DATA_WIDTH_14_BIT)
48+
#elif defined(LL_ADC_RESOLUTION_14B) || defined(LL_ADC_DS_DATA_WIDTH_14_BIT)
4949
#define MAX_ADC_RESOLUTION 14
50-
#elif defined(ADC_DS_DATA_WIDTH_13_BIT)
50+
#elif defined(LL_ADC_DS_DATA_WIDTH_13_BIT)
5151
#define MAX_ADC_RESOLUTION 13
5252
#else
5353
#define MAX_ADC_RESOLUTION 12
@@ -58,27 +58,23 @@ static int _internalReadResolution =
5858
#if ADC_RESOLUTION > MAX_ADC_RESOLUTION
5959
MAX_ADC_RESOLUTION
6060
#else
61-
#if defined(ADC_RESOLUTION_12B) || defined(ADC_DS_DATA_WIDTH_12_BIT)
62-
#if ADC_RESOLUTION <= 6 && defined(ADC_RESOLUTION_6B)
61+
#if ADC_RESOLUTION <= 6 && defined(LL_ADC_RESOLUTION_6B)
6362
6
64-
#elif ADC_RESOLUTION <= 8 && defined(ADC_RESOLUTION_8B)
63+
#elif ADC_RESOLUTION <= 8 && defined(LL_ADC_RESOLUTION_8B)
6564
8
66-
#elif ADC_RESOLUTION <= 10 && defined(ADC_RESOLUTION_10B)
65+
#elif ADC_RESOLUTION <= 10 && defined(LL_ADC_RESOLUTION_10B)
6766
10
68-
#elif ADC_RESOLUTION <= 12
67+
#elif ADC_RESOLUTION <= 12 /* Common for all series */
6968
12
70-
#elif ADC_RESOLUTION <= 13 && defined(ADC_DS_DATA_WIDTH_13_BIT)
69+
#elif ADC_RESOLUTION <= 13 && defined(LL_ADC_DS_DATA_WIDTH_13_BIT)
7170
13
72-
#elif ADC_RESOLUTION <= 14 && (defined(ADC_RESOLUTION_14B) || defined(ADC_DS_DATA_WIDTH_14_BIT))
71+
#elif ADC_RESOLUTION <= 14 && (defined(LL_ADC_RESOLUTION_14B) || defined(LL_ADC_DS_DATA_WIDTH_14_BIT))
7372
14
74-
#elif ADC_RESOLUTION <= 15 && defined(ADC_DS_DATA_WIDTH_15_BIT)
73+
#elif ADC_RESOLUTION <= 15 && defined(LL_ADC_DS_DATA_WIDTH_15_BIT)
7574
15
76-
#elif defined(ADC_RESOLUTION_16B) || defined(ADC_DS_DATA_WIDTH_16_BIT)
75+
#elif defined(LL_ADC_RESOLUTION_16B) || defined(LL_ADC_DS_DATA_WIDTH_16_BIT)
7776
16
7877
#endif
79-
#else /* ADC_RESOLUTION_12B */
80-
12
81-
#endif /* ADC_RESOLUTION_12B || ADC_DS_DATA_WIDTH_12_BIT */
8278
#endif /* ADC_RESOLUTION > MAX_ADC_RESOLUTION */
8379
;
8480

@@ -106,53 +102,49 @@ void analogReadResolution(int res)
106102
if (_readResolution > MAX_ADC_RESOLUTION) {
107103
_internalReadResolution = MAX_ADC_RESOLUTION;
108104
} else {
109-
#if defined(ADC_RESOLUTION_12B) || defined(ADC_DS_DATA_WIDTH_12_BIT)
110-
#ifdef ADC_RESOLUTION_6B
105+
#ifdef LL_ADC_RESOLUTION_6B
111106
if (_internalReadResolution <= 6) {
112107
_internalReadResolution = 6;
113108
} else
114109
#endif
115-
#if defined(ADC_RESOLUTION_8B)
110+
#if defined(LL_ADC_RESOLUTION_8B)
116111
if (_internalReadResolution <= 8) {
117112
_internalReadResolution = 8;
118113
} else
119114
#endif
120-
#if defined(ADC_RESOLUTION_10B)
115+
#if defined(LL_ADC_RESOLUTION_10B)
121116
if (_internalReadResolution <= 10) {
122117
_internalReadResolution = 10;
123118
} else
124119
#endif
125-
#if defined(ADC_DS_DATA_WIDTH_11_BIT)
120+
#if defined(LL_ADC_DS_DATA_WIDTH_11_BIT)
126121
else if (_internalReadResolution <= 11) {
127122
_internalReadResolution = 11;
128123
}
129124
#endif
125+
/* Common for all series */
130126
if (_internalReadResolution <= 12) {
131127
_internalReadResolution = 12;
132128
}
133-
#if defined(ADC_DS_DATA_WIDTH_13_BIT)
129+
#if defined(LL_ADC_DS_DATA_WIDTH_13_BIT)
134130
else if (_internalReadResolution <= 13) {
135131
_internalReadResolution = 13;
136132
}
137133
#endif
138-
#if defined(ADC_RESOLUTION_14B) || defined(ADC_DS_DATA_WIDTH_14_BIT)
134+
#if defined(LL_ADC_RESOLUTION_14B) || defined(LL_ADC_DS_DATA_WIDTH_14_BIT)
139135
else if (_internalReadResolution <= 14) {
140136
_internalReadResolution = 14;
141137
}
142138
#endif
143-
#if defined(ADC_DS_DATA_WIDTH_15_BIT)
139+
#if defined(LL_ADC_DS_DATA_WIDTH_15_BIT)
144140
else if (_internalReadResolution <= 15) {
145141
_internalReadResolution = 15;
146142
}
147143
#endif
148-
#if defined( ADC_RESOLUTION_16B) || defined(ADC_DS_DATA_WIDTH_16_BIT)
144+
#if defined(LL_ADC_RESOLUTION_16B) || defined(LL_ADC_DS_DATA_WIDTH_16_BIT)
149145
else if (_internalReadResolution <= 16) {
150146
_internalReadResolution = 16;
151147
}
152-
#endif
153-
#else
154-
/* STM32F1xx have no ADC_RESOLUTION_xB */
155-
_internalReadResolution = 12;
156148
#endif
157149
}
158150
} else {
@@ -170,7 +162,9 @@ void analogReference(uint8_t mode)
170162
int analogRead(pin_size_t pinNumber)
171163
{
172164
pin_size_t value = 0;
173-
#if defined(HAL_ADC_MODULE_ENABLED) && !defined(HAL_ADC_MODULE_ONLY)
165+
#if !defined(HAL_ADC_MODULE_ONLY) &&\
166+
(defined(HAL_ADC_MODULE_ENABLED) || (defined(USE_HAL_ADC_MODULE) && (USE_HAL_ADC_MODULE == 1)))
167+
174168
PinName p = analogInputToPinName(pinNumber);
175169
if (p != NC) {
176170
value = adc_read_value(p, _internalReadResolution);

‎libraries/SrcWrapper/inc/PinNames.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,14 @@ typedef enum {
264264
#endif
265265
// Specific pin name
266266
PADC_BASE = PNAME_ANALOG_INTERNAL_BASE,
267-
#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1)
267+
#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1) ||\
268+
defined(LL_ADC_CHANNEL_TEMPSENSOR)
268269
PADC_TEMP,
269270
#endif
270271
#if defined(ADC5) && defined(ADC_CHANNEL_TEMPSENSOR_ADC5)
271272
PADC_TEMP_ADC5,
272273
#endif
273-
#ifdef ADC_CHANNEL_VREFINT
274+
#if defined(ADC_CHANNEL_VREFINT) || defined(LL_ADC_CHANNEL_VREFINT)
274275
PADC_VREF,
275276
#endif
276277
#ifdef ADC_CHANNEL_VBAT

‎libraries/SrcWrapper/inc/analog.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,19 @@ extern "C" {
4949
#endif
5050

5151
/* Exported functions ------------------------------------------------------- */
52-
#if defined(HAL_ADC_MODULE_ENABLED) && !defined(HAL_ADC_MODULE_ONLY)
52+
#if !defined(HAL_ADC_MODULE_ONLY)
53+
#if defined(HAL_ADC_MODULE_ENABLED)
5354
uint32_t get_adc_channel(PinName pin, uint32_t *bank);
5455
uint32_t get_adc_internal_channel(PinName pin);
56+
#endif
57+
#if defined(USE_HAL_ADC_MODULE) && (USE_HAL_ADC_MODULE == 1)
58+
hal_adc_channel_t get_adc_channel(PinName pin);
59+
hal_adc_channel_t get_adc_internal_channel(PinName pin);
60+
#endif
61+
#if defined(HAL_ADC_MODULE_ENABLED) || (defined(USE_HAL_ADC_MODULE) && (USE_HAL_ADC_MODULE == 1))
5562
uint16_t adc_read_value(PinName pin, uint32_t resolution);
5663
#endif
64+
#endif /* !HAL_ADC_MODULE_ONLY */
5765
#if defined(HAL_DAC_MODULE_ENABLED) && !defined(HAL_DAC_MODULE_ONLY)
5866
uint32_t get_dac_channel(PinName pin);
5967
void dac_write_value(PinName pin, uint32_t value, uint8_t do_init);

0 commit comments

Comments
 (0)