Skip to content

Commit e8aa9b0

Browse files
rogerclarkmelbournerogerclarkmelbourne
committed
Changed generic stm32f103c board definitions to tidy up the order of the PIN MAP
1 parent 6fec429 commit e8aa9b0

2 files changed

Lines changed: 45 additions & 49 deletions

File tree

‎STM32F1/variants/generic_stm32f103c/board.cpp‎

Lines changed: 42 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -46,70 +46,66 @@ void boardInit(void) {
4646
#endif
4747
}
4848

49-
extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
50-
51-
/* Top header */
52-
{GPIOA, TIMER2, ADC1, 0, 1, 0}, /* D11/PA0 */
53-
{GPIOA, TIMER2, ADC1, 1, 2, 1}, /* D10/PA1 */
54-
{GPIOA, TIMER2, ADC1, 2, 3, 2}, /* D9/PA2 */
55-
{GPIOA, TIMER2, ADC1, 3, 4, 3}, /* D8/PA3 */
56-
{GPIOA, NULL, ADC1, 4, 0, 4}, /* D7/PA4 */
57-
{GPIOA, NULL, ADC1, 5, 0, 5}, /* D6/PA5 */
58-
{GPIOA, TIMER3, ADC1, 6, 1, 6}, /* D5/PA6 */
59-
{GPIOA, TIMER3, ADC1, 7, 2, 7}, /* D4/PA7 */
60-
{GPIOA, TIMER1, NULL, 8, 1, ADCx}, /* D27/PA8 */
61-
{GPIOA, TIMER1, NULL, 9, 2, ADCx}, /* D26/PA9 */
62-
{GPIOA, TIMER1, NULL, 10, 3, ADCx}, /* D25/PA10 */
63-
{GPIOA, TIMER1, NULL, 11, 4, ADCx}, /* D24/PA11 */
64-
{GPIOA, NULL, NULL, 12, 0, ADCx}, /* D23/PA12 */
65-
{GPIOA, NULL, NULL, 13, 0, ADCx}, /* D22/PA13 */
66-
{GPIOA, NULL, NULL, 14, 0, ADCx}, /* D21/PA14 */
67-
{GPIOA, NULL, NULL, 15, 0, ADCx}, /* D20/PA15 */
68-
69-
{GPIOB, TIMER3, ADC1, 0, 3, 8}, /* D3/PB0 */
70-
{GPIOB, NULL, NULL, 11, 0, ADCx}, /* D0/PB11 */
71-
{GPIOB, NULL, NULL, 10, 0, ADCx}, /* D1/PB10 */
72-
{GPIOB, NULL, NULL, 2, 0, ADCx}, /* D2/PB2 */
49+
// Note. See the enum of pin names in board.h
7350

51+
extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
7452

75-
{GPIOC, NULL, NULL, 15, 0, ADCx}, /* D12/PC15 */
76-
{GPIOC, NULL, NULL, 14, 0, ADCx}, /* D13/PC14 */
77-
{GPIOC, NULL, NULL, 13, 0, ADCx}, /* D14/PC13 */
7853

79-
/* Bottom header */
54+
{GPIOA, TIMER2, ADC1, 0, 1, 0}, /* PA0 */
55+
{GPIOA, TIMER2, ADC1, 1, 2, 1}, /* PA1 */
56+
{GPIOA, TIMER2, ADC1, 2, 3, 2}, /* PA2 */
57+
{GPIOA, TIMER2, ADC1, 3, 4, 3}, /* PA3 */
58+
{GPIOA, NULL, ADC1, 4, 0, 4}, /* PA4 */
59+
{GPIOA, NULL, ADC1, 5, 0, 5}, /* PA5 */
60+
{GPIOA, TIMER3, ADC1, 6, 1, 6}, /* PA6 */
61+
{GPIOA, TIMER3, ADC1, 7, 2, 7}, /* PA7 */
62+
{GPIOA, TIMER1, NULL, 8, 1, ADCx}, /* PA8 */
63+
{GPIOA, TIMER1, NULL, 9, 2, ADCx}, /* PA9 */
64+
{GPIOA, TIMER1, NULL, 10, 3, ADCx}, /* PA10 */
65+
{GPIOA, TIMER1, NULL, 11, 4, ADCx}, /* PA11 */
66+
{GPIOA, NULL, NULL, 12, 0, ADCx}, /* PA12 */
67+
{GPIOA, NULL, NULL, 13, 0, ADCx}, /* PA13 */
68+
{GPIOA, NULL, NULL, 14, 0, ADCx}, /* PA14 */
69+
{GPIOA, NULL, NULL, 15, 0, ADCx}, /* PA15 */
70+
71+
{GPIOB, TIMER3, ADC1, 0, 3, 8}, /* PB0 */
72+
{GPIOB, TIMER3, ADC1, 1, 4, 9}, /* PB1 */
73+
{GPIOB, NULL, NULL, 2, 0, ADCx}, /* PB2 */
74+
{GPIOB, NULL, NULL, 3, 0, ADCx}, /* PB3 */
75+
{GPIOB, NULL, NULL, 4, 0, ADCx}, /* PB4 */
76+
{GPIOB, NULL, NULL, 5, 0, ADCx}, /* PB5 */
77+
{GPIOB, TIMER4, NULL, 6, 1, ADCx}, /* PB6 */
78+
{GPIOB, TIMER4, NULL, 7, 2, ADCx}, /* PB7 */
79+
{GPIOB, TIMER4, NULL, 8, 3, ADCx}, /* PB8 */
80+
{GPIOB, NULL, NULL, 9, 0, ADCx}, /* PB9 */
81+
{GPIOB, NULL, NULL, 10, 0, ADCx}, /* PB10 */
82+
{GPIOB, NULL, NULL, 11, 0, ADCx}, /* PB11 */
83+
{GPIOB, NULL, NULL, 12, 0, ADCx}, /* PB12 */
84+
{GPIOB, NULL, NULL, 13, 0, ADCx}, /* PB13 */
85+
{GPIOB, NULL, NULL, 14, 0, ADCx}, /* PB14 */
86+
{GPIOB, NULL, NULL, 15, 0, ADCx}, /* PB15 */
87+
88+
{GPIOC, NULL, NULL, 13, 0, ADCx}, /* PC13 */
89+
{GPIOC, NULL, NULL, 14, 0, ADCx}, /* PC14 */
90+
{GPIOC, NULL, NULL, 15, 0, ADCx}, /* PC15 */
8091

81-
{GPIOB, TIMER4, NULL, 7, 2, ADCx}, /* D15/PB7 */
82-
{GPIOB, TIMER4, NULL, 6, 1, ADCx}, /* D16/PB6 */
83-
{GPIOB, NULL, NULL, 5, 0, ADCx}, /* D17/PB5 */
84-
{GPIOB, NULL, NULL, 4, 0, ADCx}, /* D18/PB4 */
85-
{GPIOB, NULL, NULL, 3, 0, ADCx}, /* D19/PB3 */
8692

8793

88-
{GPIOB, NULL, NULL, 15, 0, ADCx}, /* D28/PB15 */
89-
{GPIOB, NULL, NULL, 14, 0, ADCx}, /* D29/PB14 */
90-
{GPIOB, NULL, NULL, 13, 0, ADCx}, /* D30/PB13 */
91-
{GPIOB, NULL, NULL, 12, 0, ADCx}, /* D31/PB12 */
92-
{GPIOB, TIMER4, NULL, 8, 3, ADCx}, /* D32/PB8 */
93-
{GPIOB, TIMER3, ADC1, 1, 4, 9}, /* D33/PB1 */
94-
{GPIOB, NULL, NULL, 9, 0, ADCx}, /* PB9 */
9594
};
9695

9796
extern const uint8 boardPWMPins[BOARD_NR_PWM_PINS] __FLASH__ = {
9897
PB0, PA7, PA6, PA3, PA2, PA1, PA0, PB7, PB6, PA10, PA9, PA8
9998
};
100-
/*
101-
old maple mini mapping enum
102-
PB11, PB10, PB2, PB0, PA7, PA6, PA5, PA4, PA3, PA2, PA1, PA0, PC15, PC14,
103-
PC13, PB7, PB6, PB5, PB4, PB3, PA15, PA14, PA13, PA12, PA11, PA10, PA9,
104-
PA8, PB15, PB14, PB13, PB12, PB8, PB1
105-
*/
99+
106100
extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
107101
PB0, PA7, PA6 , PA5 , PA4 , PA3 , PA2 , PA1 , PA0
108102
};
109103

104+
// Note. These defines are not really used by generic boards. They are for Maple Serial USB
110105
#define USB_DP PA12
111106
#define USB_DM PA11
112107

108+
// NOte. These definitions are not really used for generic boards, they only relate to boards modified to behave like Maple boards
113109
extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
114110
BOARD_LED_PIN, BOARD_BUTTON_PIN, USB_DP, USB_DM
115111
};

‎STM32F1/variants/generic_stm32f103c/board/board.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@
7878

7979

8080
enum {
81-
PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9,PA10,PA11,PA12,PA13,PA14,PA15,
82-
PB0,PB11, PB10, PB2, PC15, PC14,
83-
PC13, PB7, PB6, PB5, PB4, PB3, PB15, PB14, PB13, PB12, PB8, PB1, PB9
81+
PA0, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13,PA14,PA15,
82+
PB0, PB1, PB2, PB3, PB4, PB5, PB6, PB7, PB8, PB9, PB10, PB11, PB12, PB13,PB14,PB15,
83+
PC13, PC14,PC15
8484
};
8585

8686
#endif

0 commit comments

Comments
 (0)