Skip to content

Commit 4451eee

Browse files
fpistmfpistm
committed
Aligns configuration with master
Signed-off-by: fpr <[email protected]>
1 parent 4a05684 commit 4451eee

File tree

2 files changed

+28
-40
lines changed

2 files changed

+28
-40
lines changed

Diff for: ‎variants/BLUEPILL_F103C8/PeripheralPins.c

+14-20
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@ const PinMap PinMap_ADC[] = {
5959
// {PB0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
6060
{PB1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
6161
// {PB1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
62-
{NC, NC, 0}
63-
};
64-
65-
//*** DAC ***
66-
67-
const PinMap PinMap_DAC[] = {
68-
{NC, NC, 0}
62+
{NC, NP, 0}
6963
};
7064

7165
//*** I2C ***
@@ -74,14 +68,14 @@ const PinMap PinMap_I2C_SDA[] = {
7468
{PB7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
7569
{PB9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 2)}, // GPIO_Remap_I2C1
7670
{PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
77-
{NC, NC, 0}
71+
{NC, NP, 0}
7872
};
7973

8074
const PinMap PinMap_I2C_SCL[] = {
8175
{PB6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
8276
{PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 2)}, // GPIO_Remap_I2C1
8377
{PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
84-
{NC, NC, 0}
78+
{NC, NP, 0}
8579
};
8680

8781
//*** PWM ***
@@ -115,7 +109,7 @@ const PinMap PinMap_PWM[] = {
115109
{PB13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 1, 1)}, // TIM1_CH1N
116110
{PB14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 2, 1)}, // TIM1_CH2N
117111
{PB15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 3, 1)}, // TIM1_CH3N
118-
{NC, NC, 0}
112+
{NC, NP, 0}
119113
};
120114

121115
//*** SERIAL ***
@@ -125,29 +119,29 @@ const PinMap PinMap_UART_TX[] = {
125119
{PA9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
126120
{PB6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 3)}, // GPIO_Remap_USART1
127121
{PB10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
128-
{NC, NC, 0}
122+
{NC, NP, 0}
129123
};
130124

131125
const PinMap PinMap_UART_RX[] = {
132126
{PA3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
133127
{PA10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
134128
{PB7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 3)}, // GPIO_Remap_USART1
135129
{PB11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
136-
{NC, NC, 0}
130+
{NC, NP, 0}
137131
};
138132

139133
const PinMap PinMap_UART_RTS[] = {
140134
{PA1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
141135
{PA12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
142136
{PB14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
143-
{NC, NC, 0}
137+
{NC, NP, 0}
144138
};
145139

146140
const PinMap PinMap_UART_CTS[] = {
147141
{PA0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
148142
{PA11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
149143
{PB13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
150-
{NC, NC, 0}
144+
{NC, NP, 0}
151145
};
152146

153147
//*** SPI ***
@@ -156,40 +150,40 @@ const PinMap PinMap_SPI_MOSI[] = {
156150
{PA7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
157151
{PB5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
158152
{PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
159-
{NC, NC, 0}
153+
{NC, NP, 0}
160154
};
161155

162156
const PinMap PinMap_SPI_MISO[] = {
163157
{PA6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
164158
{PB4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
165159
{PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
166-
{NC, NC, 0}
160+
{NC, NP, 0}
167161
};
168162

169163
const PinMap PinMap_SPI_SCLK[] = {
170164
{PA5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
171165
{PB3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
172166
{PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
173-
{NC, NC, 0}
167+
{NC, NP, 0}
174168
};
175169

176170
const PinMap PinMap_SPI_SSEL[] = {
177171
{PA4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
178172
{PA15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
179173
{PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
180-
{NC, NC, 0}
174+
{NC, NP, 0}
181175
};
182176

183177
//*** CAN ***
184178

185179
const PinMap PinMap_CAN_RD[] = {
186180
{PA11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 0)},
187181
{PB8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 10)}, // Remap CAN_RX to PB_9
188-
{NC, NC, 0}
182+
{NC, NP, 0}
189183
};
190184

191185
const PinMap PinMap_CAN_TD[] = {
192186
{PA12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 0)},
193187
{PB9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 10)}, // Remap CAN_TX to PB_9
194-
{NC, NC, 0}
188+
{NC, NP, 0}
195189
};

Diff for: ‎variants/MAPLEMINI_F103CB/PeripheralPins.c

+14-20
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@ const PinMap PinMap_ADC[] = {
5959
// {PB0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
6060
{PB1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
6161
// {PB1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
62-
{NC, NC, 0}
63-
};
64-
65-
//*** DAC ***
66-
67-
const PinMap PinMap_DAC[] = {
68-
{NC, NC, 0}
62+
{NC, NP, 0}
6963
};
7064

7165
//*** I2C ***
@@ -74,14 +68,14 @@ const PinMap PinMap_I2C_SDA[] = {
7468
{PB7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
7569
{PB9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 2)}, // GPIO_Remap_I2C1
7670
{PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
77-
{NC, NC, 0}
71+
{NC, NP, 0}
7872
};
7973

8074
const PinMap PinMap_I2C_SCL[] = {
8175
{PB6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
8276
{PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 2)}, // GPIO_Remap_I2C1
8377
{PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, 0)},
84-
{NC, NC, 0}
78+
{NC, NP, 0}
8579
};
8680

8781
//*** PWM ***
@@ -115,7 +109,7 @@ const PinMap PinMap_PWM[] = {
115109
{PB13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 1, 1)}, // TIM1_CH1N
116110
{PB14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 2, 1)}, // TIM1_CH2N
117111
{PB15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 3, 1)}, // TIM1_CH3N
118-
{NC, NC, 0}
112+
{NC, NP, 0}
119113
};
120114

121115
//*** SERIAL ***
@@ -125,29 +119,29 @@ const PinMap PinMap_UART_TX[] = {
125119
{PA9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
126120
{PB6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 3)}, // GPIO_Remap_USART1
127121
{PB10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
128-
{NC, NC, 0}
122+
{NC, NP, 0}
129123
};
130124

131125
const PinMap PinMap_UART_RX[] = {
132126
{PA3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
133127
{PA10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
134128
{PB7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 3)}, // GPIO_Remap_USART1
135129
{PB11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
136-
{NC, NC, 0}
130+
{NC, NP, 0}
137131
};
138132

139133
const PinMap PinMap_UART_RTS[] = {
140134
{PA1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
141135
{PA12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
142136
{PB14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
143-
{NC, NC, 0}
137+
{NC, NP, 0}
144138
};
145139

146140
const PinMap PinMap_UART_CTS[] = {
147141
{PA0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
148142
{PA11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
149143
{PB13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
150-
{NC, NC, 0}
144+
{NC, NP, 0}
151145
};
152146

153147
//*** SPI ***
@@ -156,40 +150,40 @@ const PinMap PinMap_SPI_MOSI[] = {
156150
{PA7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
157151
{PB5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
158152
{PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
159-
{NC, NC, 0}
153+
{NC, NP, 0}
160154
};
161155

162156
const PinMap PinMap_SPI_MISO[] = {
163157
{PA6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
164158
{PB4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
165159
{PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
166-
{NC, NC, 0}
160+
{NC, NP, 0}
167161
};
168162

169163
const PinMap PinMap_SPI_SCLK[] = {
170164
{PA5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
171165
{PB3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
172166
{PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
173-
{NC, NC, 0}
167+
{NC, NP, 0}
174168
};
175169

176170
const PinMap PinMap_SPI_SSEL[] = {
177171
{PA4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
178172
{PA15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 1)}, // GPIO_Remap_SPI1
179173
{PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, 0)},
180-
{NC, NC, 0}
174+
{NC, NP, 0}
181175
};
182176

183177
//*** CAN ***
184178

185179
const PinMap PinMap_CAN_RD[] = {
186180
{PA11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 0)},
187181
{PB8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 10)}, // Remap CAN_RX to PB_9
188-
{NC, NC, 0}
182+
{NC, NP, 0}
189183
};
190184

191185
const PinMap PinMap_CAN_TD[] = {
192186
{PA12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 0)},
193187
{PB9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 10)}, // Remap CAN_TX to PB_9
194-
{NC, NC, 0}
188+
{NC, NP, 0}
195189
};

0 commit comments

Comments
 (0)