Skip to content

Commit 998fd7b

Browse files
raiden00plraiden00pl
committed
boards/stm32f3: migrate to new pinmap
migrate stm32f3 to new pinmap Signed-off-by: raiden00pl <raiden00@railab.me>
1 parent e2cc71f commit 998fd7b

42 files changed

Lines changed: 241 additions & 155 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎boards/arm/stm32/nucleo-f302r8/configs/can/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
66
# modifications.
77
#
8+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
89
CONFIG_ARCH="arm"
910
CONFIG_ARCH_BOARD="nucleo-f302r8"
1011
CONFIG_ARCH_BOARD_NUCLEO_F302R8=y

‎boards/arm/stm32/nucleo-f302r8/configs/cansock/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# CONFIG_ARCH_FPU is not set
99
# CONFIG_NET_ETHERNET is not set
1010
# CONFIG_NET_IPv4 is not set
11+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1112
CONFIG_ALLOW_BSD_COMPONENTS=y
1213
CONFIG_ARCH="arm"
1314
CONFIG_ARCH_BOARD="nucleo-f302r8"

‎boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# modifications.
77
#
88
# CONFIG_LIBC_LONG_LONG is not set
9+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
910
CONFIG_ARCH="arm"
1011
CONFIG_ARCH_BOARD="nucleo-f302r8"
1112
CONFIG_ARCH_BOARD_NUCLEO_F302R8=y

‎boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_b16/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#
88
# CONFIG_DISABLE_MQUEUE is not set
99
# CONFIG_DISABLE_PTHREAD is not set
10+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1011
CONFIG_ADC=y
1112
CONFIG_ADC_FIFOSIZE=3
1213
CONFIG_ANALOG=y

‎boards/arm/stm32/nucleo-f302r8/configs/ihm07m1_f32/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#
88
# CONFIG_DISABLE_MQUEUE is not set
99
# CONFIG_DISABLE_PTHREAD is not set
10+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1011
CONFIG_ADC=y
1112
CONFIG_ADC_FIFOSIZE=3
1213
CONFIG_ANALOG=y

‎boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# CONFIG_ARCH_FPU is not set
99
# CONFIG_LIBC_LONG_LONG is not set
1010
# CONFIG_SYSTEM_DD is not set
11+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1112
CONFIG_ARCH="arm"
1213
CONFIG_ARCH_BOARD="nucleo-f302r8"
1314
CONFIG_ARCH_BOARD_NUCLEO_F302R8=y

‎boards/arm/stm32/nucleo-f302r8/configs/qenco/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
# CONFIG_NSH_DISABLE_USLEEP is not set
5858
# CONFIG_NSH_DISABLE_WGET is not set
5959
# CONFIG_NSH_DISABLE_XD is not set
60+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
6061
CONFIG_ARCH="arm"
6162
CONFIG_ARCH_BOARD="nucleo-f302r8"
6263
CONFIG_ARCH_BOARD_COMMON=y

‎boards/arm/stm32/nucleo-f302r8/include/board.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@
193193

194194
/* TIM2 input ***************************************************************/
195195

196-
#define GPIO_TIM2_CH1IN (GPIO_TIM2_CH1IN_2 | GPIO_PULLUP) /* PA15 */
197-
#define GPIO_TIM2_CH2IN (GPIO_TIM2_CH2IN_2 | GPIO_PULLUP) /* PB3 */
196+
#define GPIO_TIM2_CH1IN (GPIO_TIM2_CH1IN_2 | GPIO_PULLUP | GPIO_SPEED_50MHz) /* PA15 */
197+
#define GPIO_TIM2_CH2IN (GPIO_TIM2_CH2IN_2 | GPIO_PULLUP | GPIO_SPEED_50MHz) /* PB3 */
198198

199199
/* USART */
200200

@@ -203,8 +203,8 @@
203203
* USART2_TX - PA2
204204
*/
205205

206-
#define GPIO_USART2_RX GPIO_USART2_RX_2 /* PA3 */
207-
#define GPIO_USART2_TX GPIO_USART2_TX_2 /* PA2 */
206+
#define GPIO_USART2_RX (GPIO_USART2_RX_2|GPIO_SPEED_50MHz) /* PA3 */
207+
#define GPIO_USART2_TX (GPIO_USART2_TX_2|GPIO_SPEED_50MHz) /* PA2 */
208208

209209
/* USART1
210210
*
@@ -222,39 +222,39 @@
222222
*/
223223

224224
#ifdef CONFIG_NUCLEOF302R8_RS485_WAVESHARE
225-
# define GPIO_USART1_RX GPIO_USART1_RX_1 /* PA10 */
226-
# define GPIO_USART1_TX GPIO_USART1_TX_1 /* PA9 */
225+
# define GPIO_USART1_RX (GPIO_USART1_RX_1|GPIO_SPEED_50MHz) /* PA10 */
226+
# define GPIO_USART1_TX (GPIO_USART1_TX_1|GPIO_SPEED_50MHz) /* PA9 */
227227
# define GPIO_USART1_RS485_DIR (GPIO_OUTPUT | GPIO_PUSHPULL | \
228228
GPIO_SPEED_50MHz | GPIO_OUTPUT_CLEAR | \
229229
GPIO_PORTA | GPIO_PIN8)
230230
#else
231-
# define GPIO_USART1_RX GPIO_USART1_RX_2 /* PB7 */
232-
# define GPIO_USART1_TX GPIO_USART1_TX_2 /* PB6 */
231+
# define GPIO_USART1_RX (GPIO_USART1_RX_2|GPIO_SPEED_50MHz) /* PB7 */
232+
# define GPIO_USART1_TX (GPIO_USART1_TX_2|GPIO_SPEED_50MHz) /* PB6 */
233233
#endif
234234

235235
/* CAN */
236236

237-
#define GPIO_CAN1_RX GPIO_CAN_RX_3 /* PB8 */
238-
#define GPIO_CAN1_TX GPIO_CAN_TX_3 /* PB9 */
237+
#define GPIO_CAN1_RX (GPIO_CAN_RX_3|GPIO_SPEED_50MHz) /* PB8 */
238+
#define GPIO_CAN1_TX (GPIO_CAN_TX_3|GPIO_SPEED_50MHz) /* PB9 */
239239

240240
/* PWM configuration ********************************************************/
241241

242242
/* TIM1 PWM */
243243

244244
#define STM32_TIM1_TRGO 0
245245

246-
#define GPIO_TIM1_CH1OUT GPIO_TIM1_CH1OUT_2 /* PA8 */
247-
#define GPIO_TIM1_CH1NOUT GPIO_TIM1_CH1N_3 /* PA11 */
248-
#define GPIO_TIM1_CH2OUT GPIO_TIM1_CH2OUT_2 /* PA9 */
249-
#define GPIO_TIM1_CH2NOUT GPIO_TIM1_CH2N_2 /* PA12 */
250-
#define GPIO_TIM1_CH3OUT GPIO_TIM1_CH3OUT_2 /* PA10 */
251-
#define GPIO_TIM1_CH3NOUT GPIO_TIM1_CH3N_3 /* PB1 */
246+
#define GPIO_TIM1_CH1OUT (GPIO_TIM1_CH1OUT_2|GPIO_SPEED_50MHz) /* PA8 */
247+
#define GPIO_TIM1_CH1NOUT (GPIO_TIM1_CH1N_3|GPIO_SPEED_50MHz) /* PA11 */
248+
#define GPIO_TIM1_CH2OUT (GPIO_TIM1_CH2OUT_2|GPIO_SPEED_50MHz) /* PA9 */
249+
#define GPIO_TIM1_CH2NOUT (GPIO_TIM1_CH2N_2|GPIO_SPEED_50MHz) /* PA12 */
250+
#define GPIO_TIM1_CH3OUT (GPIO_TIM1_CH3OUT_2|GPIO_SPEED_50MHz) /* PA10 */
251+
#define GPIO_TIM1_CH3NOUT (GPIO_TIM1_CH3N_3|GPIO_SPEED_50MHz) /* PB1 */
252252

253253
/* TIM2 PWM */
254254

255-
#define GPIO_TIM2_CH1OUT GPIO_TIM2_CH1_ETR_1 /* PA0 */
256-
#define GPIO_TIM2_CH2OUT GPIO_TIM2_CH2OUT_1 /* PA1 */
257-
#define GPIO_TIM2_CH3OUT GPIO_TIM2_CH3OUT_1 /* PA9 */
255+
#define GPIO_TIM2_CH1OUT (GPIO_TIM2_CH1_ETR_1|GPIO_SPEED_50MHz) /* PA0 */
256+
#define GPIO_TIM2_CH2OUT (GPIO_TIM2_CH2OUT_1|GPIO_SPEED_50MHz) /* PA1 */
257+
#define GPIO_TIM2_CH3OUT (GPIO_TIM2_CH3OUT_1|GPIO_SPEED_50MHz) /* PA9 */
258258

259259
/* DMA channels *************************************************************/
260260

@@ -270,10 +270,10 @@
270270

271271
/* TIM1 configuration *******************************************************/
272272

273-
# define GPIO_TIM1_CH1OUT GPIO_TIM1_CH1OUT_2 /* TIM1 CH1 - PA8 - U high */
274-
# define GPIO_TIM1_CH2OUT GPIO_TIM1_CH2OUT_2 /* TIM1 CH2 - PA9 - V high */
275-
# define GPIO_TIM1_CH3OUT GPIO_TIM1_CH3OUT_2 /* TIM1 CH3 - PA10 - W high */
276-
# define GPIO_TIM1_CH4OUT 0 /* not used as output */
273+
# define GPIO_TIM1_CH1OUT (GPIO_TIM1_CH1OUT_2|GPIO_SPEED_50MHz) /* TIM1 CH1 - PA8 - U high */
274+
# define GPIO_TIM1_CH2OUT (GPIO_TIM1_CH2OUT_2|GPIO_SPEED_50MHz) /* TIM1 CH2 - PA9 - V high */
275+
# define GPIO_TIM1_CH3OUT (GPIO_TIM1_CH3OUT_2|GPIO_SPEED_50MHz) /* TIM1 CH3 - PA10 - W high */
276+
# define GPIO_TIM1_CH4OUT 0 /* not used as output */
277277

278278
/* UVW ENABLE */
279279

‎boards/arm/stm32/nucleo-f302r8/src/stm32_adc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ static const uint8_t g_adc1_chanlist[ADC1_NCHANNELS] =
5959

6060
static const uint32_t g_adc1_pinlist[ADC1_NCHANNELS] =
6161
{
62-
GPIO_ADC1_IN6, /* PC0 */
63-
GPIO_ADC1_IN7, /* PC1 */
64-
GPIO_ADC1_IN8, /* PC2 */
65-
GPIO_ADC1_IN9, /* PC3 */
62+
GPIO_ADC1_IN6_0, /* PC0 */
63+
GPIO_ADC1_IN7_0, /* PC1 */
64+
GPIO_ADC1_IN8_0, /* PC2 */
65+
GPIO_ADC1_IN9_0, /* PC3 */
6666
};
6767

6868
/****************************************************************************

‎boards/arm/stm32/nucleo-f302r8/src/stm32_foc_ihm07m1.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@ static uint8_t g_adc1_chan[] =
102102
static uint32_t g_adc1_pins[] =
103103
{
104104
#ifdef CONFIG_BOARD_STM32_IHM07M1_VBUS
105-
GPIO_ADC1_IN2,
105+
GPIO_ADC1_IN2_0,
106106
#endif
107107
#ifdef CONFIG_BOARD_STM32_IHM07M1_POT
108-
GPIO_ADC1_IN12,
108+
GPIO_ADC1_IN12_0,
109109
#endif
110-
GPIO_ADC1_IN1,
110+
GPIO_ADC1_IN1_0,
111111
#if CONFIG_MOTOR_FOC_SHUNTS > 1
112-
GPIO_ADC1_IN7,
112+
GPIO_ADC1_IN7_0,
113113
#endif
114114
#if CONFIG_MOTOR_FOC_SHUNTS > 2
115-
GPIO_ADC1_IN6,
115+
GPIO_ADC1_IN6_0,
116116
#endif
117117
};
118118

0 commit comments

Comments
 (0)