Skip to content

Commit 735f213

Browse files
fpistmfpistm
committed
Update pins mapping according to board.
Signed-off-by: Frederic Pillon <[email protected]>
1 parent 6a67398 commit 735f213

File tree

3 files changed

+52
-60
lines changed

3 files changed

+52
-60
lines changed

‎variants/NUCLEO_F030R8/PeripheralPins.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ const PinMap PinMap_PWM[] = {
8686
{PA2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM15, 1, 0)}, // TIM15_CH1
8787
{PA3, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM15, 2, 0)}, // TIM15_CH2
8888
{PA4, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
89-
{PA6, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM16, 1, 0)}, // TIM16_CH1
89+
// {PA6, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM16, 1, 0)}, // TIM16_CH1
9090
{PA6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
91-
{PA7, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
92-
{PA7, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM17, 1, 0)}, // TIM17_CH1
93-
{PA7, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
91+
// {PA7, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
92+
// {PA7, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM17, 1, 0)}, // TIM17_CH1
93+
// {PA7, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
9494
{PA7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
9595
{PA8, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
9696
{PA9, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
9797
{PA10, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
9898
{PA11, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
9999
{PB0, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
100100
{PB0, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3
101-
{PB1, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM14, 1, 0)}, // TIM14_CH1
102-
{PB1, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
101+
// {PB1, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM14, 1, 0)}, // TIM14_CH1
102+
// {PB1, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
103103
{PB1, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 4, 0)}, // TIM3_CH4
104104
{PB4, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
105105
{PB5, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
@@ -109,10 +109,10 @@ const PinMap PinMap_PWM[] = {
109109
{PB9, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM17, 1, 0)}, // TIM17_CH1
110110
{PB13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
111111
{PB14, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM15, 1, 0)}, // TIM15_CH1
112-
{PB14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
113-
{PB15, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 1)}, // TIM15_CH1N
112+
// {PB14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
113+
// {PB15, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 1)}, // TIM15_CH1N
114114
{PB15, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM15, 2, 0)}, // TIM15_CH2
115-
{PB15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
115+
// {PB15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
116116
{PC6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_MCO, 1, 0)}, // TIM3_CH1
117117
{PC7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_MCO, 2, 0)}, // TIM3_CH2
118118
{PC8, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3

‎variants/NUCLEO_F030R8/variant.cpp

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ const PinName digital_arduino[] = {
2727
PA3, //D0
2828
PA2, //D1
2929
PA10, //D2
30-
PB3, //D3
30+
PB3, //D3 - no PWM
3131
PB5, //D4
3232
PB4, //D5
33-
PB10, //D6
33+
PB10, //D6 - no PWM
3434
PA8, //D7
3535
PA9, //D8
3636
PC7, //D9
@@ -44,43 +44,46 @@ const PinName digital_arduino[] = {
4444
// CN7 Left Side
4545
PC10, //D16
4646
PC12, //D17
47-
PF11, //D18 - BOOT0
48-
PA13, //D19 - SWD
49-
PA14, //D20 - SWD
50-
PA15, //D21
51-
PB7, //D22
52-
PC13, //D23
53-
PC14, //D24
54-
PC15, //D25
55-
PF0, //D26
56-
PF1, //D27
57-
PC2, //D28
58-
PC3, //D29
47+
PF6, //D18
48+
PF7, //D19
49+
PA13, //D20 - SWD
50+
PA14, //D21 - SWD
51+
PA15, //D22
52+
PB7, //D23
53+
PC13, //D24
54+
PC14, //D25
55+
PC15, //D26
56+
PF0, //D27
57+
PF1, //D28
58+
PC2, //D29
59+
PC3, //D30
5960
// CN7 Right Side
60-
PC11, //D30
61-
PD2, //D31
61+
PC11, //D31
62+
PD2, //D32
6263
// CN10 Left Side
63-
PC9, //D32
64+
PC9, //D33
6465
// CN10 Right side
65-
PC8, //D33
66-
PC6, //D34
67-
PC5, //D35
68-
PA12, //D36
69-
PA11, //D37
70-
PB12, //D38
71-
PB11, //D39
72-
PB2, //D40
73-
PB1, //D41
74-
PB15, //D42
75-
PB14, //D43
76-
PB13, //D44
77-
PC4, //D45
78-
PA0, //D46/A0
79-
PA1, //D47/A1
80-
PA4, //D48/A2
81-
PB0, //D49/A3
82-
PC1, //D50/A4
83-
PC0, //D51/A5
66+
PC8, //D34
67+
PC6, //D35
68+
PC5, //D36
69+
PA12, //D37
70+
PA11, //D38
71+
PB12, //D39
72+
PB11, //D40
73+
PB2, //D41
74+
PB1, //D42
75+
PB15, //D43
76+
PB14, //D44
77+
PB13, //D45
78+
PC4, //D46
79+
PF5, //D47
80+
PF4, //D48
81+
PA0, //D49/A0
82+
PA1, //D50/A1
83+
PA4, //D51/A2
84+
PB0, //D52/A3
85+
PC1, //D53/A4
86+
PC0, //D54/A5
8487
};
8588

8689
#ifdef __cplusplus
@@ -92,22 +95,18 @@ const PinName digital_arduino[] = {
9295
*/
9396
HardwareSerial Serial(PA3, PA2); //Connected to ST-Link
9497
HardwareSerial Serial1(PA10, PA9);
95-
HardwareSerial Serial2(PA1, PA0);
9698

9799
// Need rework to be generic
98100

99101
void serialEvent() __attribute__((weak));
100102
void serialEvent() { }
101103
void serialEvent1() __attribute__((weak));
102104
void serialEvent1() { }
103-
void serialEvent2() __attribute__((weak));
104-
void serialEvent2() { }
105105

106106
void serialEventRun(void)
107107
{
108108
if (Serial.available()) serialEvent();
109109
if (Serial1.available()) serialEvent1();
110-
if (Serial2.available()) serialEvent2();
111110
}
112111

113112
// ----------------------------------------------------------------------------

‎variants/NUCLEO_F030R8/variant.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ enum {
5959
D20, D21, D22, D23, D24, D25, D26, D27, D28, D29,
6060
D30, D31, D32, D33, D34, D35, D36, D37, D38, D39,
6161
D40, D41, D42, D43, D44, D45, D46, D47, D48, D49,
62-
D50, D51,
62+
D50, D51, D52, D53, D54,
6363
DEND
6464
};
6565

6666
enum {
67-
A_START_AFTER = D45,
67+
A_START_AFTER = D48,
6868
A0, A1, A2, A3, A4, A5,
6969
AEND
7070
};
@@ -88,7 +88,6 @@ uint32_t pinNametoPinNumber(PinName p);
8888

8989
//ADC resolution is 12bits
9090
#define ADC_RESOLUTION 12
91-
#define DACC_RESOLUTION 12
9291

9392
//PWR resolution
9493
#define PWM_RESOLUTION 8
@@ -100,7 +99,7 @@ uint32_t pinNametoPinNumber(PinName p);
10099
#define LED_GREEN LED_BUILTIN
101100

102101
//On-board user button
103-
#define USER_BTN 23
102+
#define USER_BTN 24
104103

105104

106105
//SPI definitions
@@ -129,17 +128,12 @@ uint32_t pinNametoPinNumber(PinName p);
129128
//Timer Definitions
130129
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
131130
#define TIMER_TONE TIM6
132-
#define TIMER_UART_EMULATED TIM7
133131

134132
//Do not use basic timer: OC is required
135-
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
133+
#define TIMER_SERVO TIM3 //TODO: advanced-control timers don't work
136134

137135
#define DEBUG_UART ((USART_TypeDef *) USART2)
138136

139-
// UART Emulation
140-
#define UART_EMUL_RX PB14
141-
#define UART_EMUL_TX PB13
142-
143137
//Enable Firmata
144138
#define STM32 1
145139

@@ -153,7 +147,6 @@ uint32_t pinNametoPinNumber(PinName p);
153147
#ifdef __cplusplus
154148
extern HardwareSerial Serial;
155149
extern HardwareSerial Serial1;
156-
extern HardwareSerial Serial2;
157150

158151
// These serial port names are intended to allow libraries and architecture-neutral
159152
// sketches to automatically default to the correct port name for a particular type

0 commit comments

Comments
 (0)