Skip to content

Commit 129c663

Browse files
committed
Fix for firmata
Remove STLink Rx/TX from Ax and comment in PinMap arrays other than UARTyx one. Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent dcf9c17 commit 129c663

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

variants/NUCLEO_F103RB/PeripheralPins.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ const PinMap PinMap_ADC[] = {
4343
// {PA0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
4444
{PA1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
4545
// {PA1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
46-
{PA2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
46+
// {PA2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 - STLink Tx
4747
// {PA2, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
48-
{PA3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
48+
// {PA3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3 - STLink Rx
4949
// {PA3, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
5050
{PA4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
5151
// {PA4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
@@ -95,8 +95,8 @@ const PinMap PinMap_I2C_SCL[] = {
9595
const PinMap PinMap_PWM[] = {
9696
{PA0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 1, 0)}, // TIM2_CH1
9797
{PA1, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 2, 0)}, // TIM2_CH2
98-
{PA2, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 3, 0)}, // TIM2_CH3
99-
{PA3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 4, 0)}, // TIM2_CH4
98+
// {PA2, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 3, 0)}, // TIM2_CH3 - STLink Rx
99+
// {PA3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 4, 0)}, // TIM2_CH4 - STLink Tx
100100
{PA6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 1, 0)}, // TIM3_CH1
101101
// {PA7, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 6, 1, 1)}, // TIM1_CH1N - GPIO_PartialRemap_TIM1
102102
{PA7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 2, 0)}, // TIM3_CH2

variants/NUCLEO_F103RB/variant.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,13 @@ const PinName digitalPin[] = {
8282
PC1, //D50/A4
8383
PC0, //D51/A5
8484
// Duplicated pins in order to be aligned with PinMap_ADC
85-
PA3, //D52/A6 = D0
86-
PA2, //D53/A7 = D1
87-
PA7, //D54/A8 = D11
88-
PA6, //D55/A9 = D12
89-
PA5, //D56/A10 = D13
90-
PC2, //D57/A11 = D28
91-
PC3, //D58/A12 = D29
92-
PB1, //D59/A13 = D41
93-
PC4, //D60/A14 = D45
85+
PA7, //D52/A6 = D11
86+
PA6, //D53/A7 = D12
87+
PA5, //D54/A8 = D13
88+
PC2, //D55/A9 = D28
89+
PC3, //D56/A10 = D29
90+
PB1, //D57/A11 = D41
91+
PC4 //D58/A12 = D45
9492
};
9593

9694
#ifdef __cplusplus

variants/NUCLEO_F103RB/variant.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,14 @@ enum {
4242
D20, D21, D22, D23, D24, D25, D26, D27, D28, D29,
4343
D30, D31, D32, D33, D34, D35, D36, D37, D38, D39,
4444
D40, D41, D42, D43, D44, D45, D46, D47, D48, D49,
45-
D50, D51, D52, D53, D54, D55, D56, D57, D58, D59,
46-
D60,
45+
D50, D51, D52, D53, D54, D55, D56, D57, D58,
4746
DEND
4847
};
4948

5049
enum {
5150
A_START_AFTER = D45,
5251
A0, A1, A2, A3, A4, A5, A6, A7, A8, A9,
53-
A10, A11, A12, A13, A14,
52+
A10, A11, A12,
5453
AEND
5554
};
5655

0 commit comments

Comments
 (0)