Skip to content

Commit b086968

Browse files
authored
Merge pull request #154 from damienWi6labs/fixe_adc
Fixe adc
2 parents 19930bf + 88e139e commit b086968

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

cores/arduino/stm32/analog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ uint16_t adc_read_value(PinName pin)
614614
return 0;
615615
}
616616

617-
#if defined (STM32F0xx) || defined (STM32F1xx) || defined (STM32F3xx) || defined (STM32L4xx)
617+
#if defined (STM32F0xx) || defined (STM32F1xx) || defined (STM32F3xx) || defined (STM32L0xx) || defined (STM32L4xx)
618618
/*##-2.1- Calibrate ADC then Start the conversion process ####################*/
619619
#if defined (STM32F0xx) || defined (STM32F1xx)
620620
if (HAL_ADCEx_Calibration_Start(&AdcHandle) != HAL_OK)

variants/NUCLEO_F103RB/variant.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ const PinName digitalPin[] = {
8888
PC_2, //D55/A9 = D28
8989
PC_3, //D56/A10 = D29
9090
PB_1, //D57/A11 = D41
91-
PC_4 //D58/A12 = D45
91+
PC_4, //D58/A12 = D45
92+
PC_5 //D59/A13 = D35
9293
};
9394

9495
#ifdef __cplusplus

variants/NUCLEO_F103RB/variant.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,14 @@ enum {
100100
PC3_2,//D56/A10 = D29
101101
PB1_2,//D57/A11 = D41
102102
PC4_2,//D58/A12 = D45
103+
PC5_2,//D59/A13 = D35
103104
PEND
104105
};
105106

106107
enum {
107108
A_START_AFTER = D45,
108109
A0, A1, A2, A3, A4, A5, A6, A7, A8, A9,
109-
A10, A11, A12,
110+
A10, A11, A12, A13,
110111
AEND
111112
};
112113

variants/NUCLEO_F303RE/variant.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ const PinName digitalPin[] = {
8787
PC_2, //D54/A8 = D28
8888
PC_3, //D55/A9 = D29
8989
PC_5, //D56/A10 = D35
90-
PC_4 //D57/A11 = D45
90+
PB_11, //D57/A11 = D39
91+
PB_2, //D58/A12 = D40
92+
PC_4 //D59/A13 = D45
9193
};
9294

9395
#ifdef __cplusplus

variants/NUCLEO_F303RE/variant.h

+9-7
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,21 @@ enum {
9393
PC1, //D50/A4
9494
PC0, //D51/A5
9595
// Duplicated pins in order to be aligned with PinMap_ADC
96-
PA7_2,//D52/A6 = D11
97-
PA6_2,//D53/A7 = D12
98-
PC2_2,//D54/A8 = D28
99-
PC3_2,//D55/A9 = D29
100-
PC5_2,//D56/A10 = D35
101-
PC4_2,//D57/A11 = D45
96+
PA7_2, //D52/A6 = D11
97+
PA6_2, //D53/A7 = D12
98+
PC2_2, //D54/A8 = D28
99+
PC3_2, //D55/A9 = D29
100+
PC5_2, //D56/A10 = D35
101+
PB11_2,//D57/A11 = D39
102+
PB2_2, //D58/A12 = D40
103+
PC4_2, //D59/A13 = D45
102104
PEND
103105
};
104106

105107
enum {
106108
A_START_AFTER = D45,
107109
A0, A1, A2, A3, A4, A5, A6, A7, A8, A9,
108-
A10, A11,
110+
A10, A11, A12, A13,
109111
AEND
110112
};
111113

0 commit comments

Comments
 (0)