Skip to content

Commit b8085ab

Browse files
zfieldszfields
committed
chore: Reorder pin defines
Maintain consistency across all Blues board definitions
1 parent 45301c4 commit b8085ab

3 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/PeripheralPins_HERON.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ WEAK const PinMap PinMap_ADC[] = {
3838
{PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 8, 0)}, // ADC1_IN8 - A3/D3
3939
{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 9, 0)}, // ADC1_IN9 - A8/BATTERY_VOLTAGE (STAT)
4040
{PA_4_ALT1, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 9, 0)}, // ADC4_IN9 - A8/BATTERY_VOLTAGE (STAT)
41-
// {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 10, 0)}, // ADC1_IN10 - USART3_VCP_RX
42-
// {PA_5_ALT1, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 10, 0)}, // ADC4_IN10 - USART3_VCP_RX
41+
// {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 10, 0)}, // ADC1_IN10 - A9/USART3_VCP_RX
42+
// {PA_5_ALT1, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 10, 0)}, // ADC4_IN10 - A9/USART3_VCP_RX
4343
{PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 11, 0)}, // ADC1_IN11 - A6/MI
4444
{PA_6_ALT1, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 11, 0)}, // ADC4_IN11 - A6/MI
4545
{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 12, 0)}, // ADC1_IN12 - A5
@@ -48,7 +48,7 @@ WEAK const PinMap PinMap_ADC[] = {
4848
{PB_0_ALT1, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 18, 0)}, // ADC4_IN18 - A7/D11
4949
{PB_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 16, 0)}, // ADC1_IN16 - A4/D4
5050
{PB_1_ALT1, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 19, 0)}, // ADC4_IN19 - A4/D4
51-
{PB_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 17, 0)}, // ADC1_IN17 - USB_DETECT
51+
{PB_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 17, 0)}, // ADC1_IN17 - A10/USB_DETECT
5252
// {PC_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 1, 0)}, // ADC1_IN1
5353
// {PC_0_ALT1, ADC4, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 1, 0)}, // ADC4_IN1
5454
// {PC_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 2, 0)}, // ADC1_IN2
@@ -68,7 +68,7 @@ WEAK const PinMap PinMap_ADC[] = {
6868
#ifdef HAL_DAC_MODULE_ENABLED
6969
WEAK const PinMap PinMap_DAC[] = {
7070
// {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 1, 0)}, // DAC1_OUT1 - A8/BATTERY_VOLTAGE (STAT)
71-
// {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 2, 0)}, // DAC1_OUT2 - USART3_VCP_RX
71+
// {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, LL_GPIO_PULL_NO, 0, 2, 0)}, // DAC1_OUT2 - A9/USART3_VCP_RX
7272
{NC, NP, 0}
7373
};
7474
#endif
@@ -121,8 +121,8 @@ WEAK const PinMap PinMap_TIM[] = {
121121
{PA_3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4 - A3/D3
122122
{PA_3_ALT1, TIM5, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4 - A3/D3
123123
{PA_3_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF14_TIM15, 2, 0)}, // TIM15_CH2 - A3/D3
124-
// {PA_5, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 - USART3_VCP_RX
125-
// {PA_5_ALT1, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N - USART3_VCP_RX
124+
// {PA_5, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 - A9/USART3_VCP_RX
125+
// {PA_5_ALT1, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N - A9/USART3_VCP_RX
126126
{PA_6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1 - A6/MI
127127
{PA_6_ALT1, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF14_TIM16, 1, 0)}, // TIM16_CH1 - A6/MI
128128
{PA_7, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N - A5
@@ -140,7 +140,7 @@ WEAK const PinMap PinMap_TIM[] = {
140140
{PB_1, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N - A4/D4
141141
{PB_1_ALT1, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4 - A4/D4
142142
{PB_1_ALT2, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N - A4/D4
143-
{PB_2, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N - USB_DETECT
143+
{PB_2, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF3_TIM8, 4, 1)}, // TIM8_CH4N - A10/USB_DETECT
144144
{PB_3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2 - CK
145145
{PB_4, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1 - D13
146146
{PB_5, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2 - MO
@@ -213,7 +213,7 @@ WEAK const PinMap PinMap_UART_RX[] = {
213213
{PA_1, UART4, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF8_UART4)}, // A1/D1
214214
{PA_3, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF8_LPUART1)}, // A3/D3
215215
{PA_3_ALT1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF7_USART2)}, // A3/D3
216-
{PA_5, USART3, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF7_USART3)}, // USART3_VCP_RX
216+
{PA_5, USART3, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF7_USART3)}, // A9/USART3_VCP_RX
217217
{PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF7_USART1)}, // RX
218218
// {PA_15, USART2, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF3_USART2)}, // CHARGE_DETECT
219219
{PB_7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF7_USART1)}, // SDA
@@ -297,7 +297,7 @@ WEAK const PinMap PinMap_SPI_MISO[] = {
297297
#ifdef HAL_SPI_MODULE_ENABLED
298298
WEAK const PinMap PinMap_SPI_SCLK[] = {
299299
{PA_1, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF5_SPI1)}, // A1/D1
300-
// {PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF5_SPI1)}, // USART3_VCP_RX
300+
// {PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF5_SPI1)}, // A9/USART3_VCP_RX
301301
{PA_9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF3_SPI2)}, // TX
302302
{PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF5_SPI1)}, // CK
303303
{PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF6_SPI3)}, // CK

‎variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_HERON.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ const PinName digitalPin[] = {
4040
PB_7, // 22 - SDA
4141
PA_13, // 23 - SWDIO
4242
PA_14, // 24 - SWCLK
43-
PA_5, // 25 - USART3_VCP_RX
43+
PA_5, // 25 - A9/USART3_VCP_RX
4444
PB_10, // 26 - USART3_VCP_TX
4545
PH_0, // 27 - ENABLE_3V3
4646
PH_1, // 28 - DISCHARGE_3V3
4747
PA_15, // 29 - CHARGE_DETECT
4848
PA_4, // 30 - A8/BATTERY_VOLTAGE (STAT)
49-
PB_2, // 31 - USB_DETECT
49+
PB_2, // 31 - A10/USB_DETECT
5050
PA_11, // 32 - USB_D_N
5151
PA_12, // 33 - USB_D_P
5252
PC_14, // 34 - OSC32_IN (LSE)
5353
PC_15, // 35 - OSC32_OUT (LSE)
54-
// PC_0, // 36 - D30/A11
55-
// PC_1, // 37 - D31/A12
56-
// PC_2, // 38 - D32/A13
57-
// PC_3, // 39 - D33/A14
58-
// PC_5, // 40 - D34/A15
54+
// PC_0, // 36 - A11/D30
55+
// PC_1, // 37 - A12/D31
56+
// PC_2, // 38 - A13/D32
57+
// PC_3, // 39 - A14/D33
58+
// PC_5, // 40 - A15/D34
5959
// PC_6, // 41 - D35
6060
// PC_7, // 42 - D36
6161
// PC_8, // 43 - D37
@@ -97,8 +97,8 @@ const uint32_t analogInputPin[] = {
9797
17, // PA6, A6/MI
9898
11, // PB0, A7/D11
9999
30 // PA4, A8/BATTERY_VOLTAGE (STAT)
100-
// 25, // PA5, USART3_VCP_RX
101-
// 31, // PB2, USB_DETECT
100+
// 25, // PA5, A9/USART3_VCP_RX
101+
// 31, // PB2, A10/USB_DETECT
102102
// 36, // PC0, A11
103103
// 37, // PC1, A12
104104
// 38, // PC2, A13

‎variants/STM32U5xx/U575O(G-I)YxQ_U585OIYxQ/variant_HERON.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,32 @@
2727
#define PA1 PIN_A1 // A1/D1
2828
#define PA2 PIN_A2 // A2/D2
2929
#define PA3 PIN_A3 // A3/D3
30-
#define PB1 PIN_A4 // A4/D4
31-
#define PB8 5 // D5
32-
#define PB9 6 // D6
30+
#define PA4 PIN_A8 // A8/BATTERY_VOLTAGE (STAT)
31+
#define PA5 25 // A9/USART3_VCP_RX
32+
#define PA6 PIN_A6 // A6/MI
33+
#define PA7 PIN_A5 // A5
3334
#define PA8 7 // LED_BUILTIN
34-
#define PC13 8 // USER_BTN
35-
#define PB14 9 // D9
36-
#define PB13 10 // D10
35+
#define PA9 19 // TX
36+
#define PA10 18 // RX
37+
#define PA11 32 // USB_D_N
38+
#define PA12 33 // USB_D_P
39+
#define PA13 23 // SWDIO
40+
#define PA14 24 // SWCLK
41+
#define PA15 29 // CHARGE_DETECT
3742
#define PB0 PIN_A7 // A7/D11
38-
#define PB15 12 // D12
39-
#define PB4 13 // D13
40-
#define PA7 PIN_A5 // A5
43+
#define PB1 PIN_A4 // A4/D4
44+
#define PB2 31 // A10/USB_DETECT
4145
#define PB3 15 // CK
46+
#define PB4 13 // D13
4247
#define PB5 16 // MO
43-
#define PA6 PIN_A6 // A6/MI
44-
#define PA10 18 // RX
45-
#define PA9 19 // TX
46-
#define PH3 20 // B
4748
#define PB6 21 // SCL
4849
#define PB7 22 // SDA
49-
#define PA13 23 // SWDIO
50-
#define PA14 24 // SWCLK
51-
#define PA5 25 // USART3_VCP_RX
50+
#define PB8 5 // D5
51+
#define PB9 6 // D6
5252
#define PB10 26 // USART3_VCP_TX
53-
#define PH0 27 // ENABLE_3V3
54-
#define PH1 28 // DISCHARGE_3V3
55-
#define PA15 29 // CHARGE_DETECT
56-
#define PA4 PIN_A8 // A8/BATTERY_VOLTAGE (STAT)
57-
#define PB2 31 // USB_DETECT
58-
#define PA11 32 // USB_D_N
59-
#define PA12 33 // USB_D_P
60-
#define PC14 34 // OSC32_IN (LSE)
61-
#define PC15 35 // OSC32_OUT (LSE)
53+
#define PB13 10 // D10
54+
#define PB14 9 // D9
55+
#define PB15 12 // D12
6256
// #define PC0 PIN_A11
6357
// #define PC1 PIN_A12
6458
// #define PC2 PIN_A13
@@ -71,6 +65,9 @@
7165
// #define PC10 39
7266
// #define PC11 40
7367
// #define PC12 41
68+
#define PC13 8 // USER_BTN
69+
#define PC14 34 // OSC32_IN (LSE)
70+
#define PC15 35 // OSC32_OUT (LSE)
7471
// #define PD0 45
7572
// #define PD1 46
7673
// #define PD2 47
@@ -92,6 +89,9 @@
9289
// #define PG12 63
9390
// #define PG13 64
9491
// #define PG14 65
92+
#define PH0 27 // ENABLE_3V3
93+
#define PH1 28 // DISCHARGE_3V3
94+
#define PH3 20 // B
9595

9696
// Alternate pins number
9797
#define PA0_ALT1 (PA0 | ALT1)

0 commit comments

Comments
 (0)