Skip to content

Commit ef8af10

Browse files
fpistmfpistm
committed
Update BLUEPILL_F103C6 to use proper MCU files
Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 706f66e commit ef8af10

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed

‎boards.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,12 @@ GenF1.build.cmsis_lib_gcc=arm_cortexM3l_math
528528
GenF1.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
529529

530530
# BLUEPILL_F103C6 board
531-
# Support: Serial2 (USART2 on PA3, PA2) and Serial3 (USART3 on PB11, PB10)
531+
# Support: Serial2 (USART2 on PA3, PA2)
532532
GenF1.menu.pnum.BLUEPILL_F103C6=BluePill F103C6 (32K)
533533
GenF1.menu.pnum.BLUEPILL_F103C6.upload.maximum_size=32768
534534
GenF1.menu.pnum.BLUEPILL_F103C6.upload.maximum_data_size=10240
535-
GenF1.menu.pnum.BLUEPILL_F103C6.build.board=BLUEPILL_F103C8
536-
GenF1.menu.pnum.BLUEPILL_F103C6.build.product_line=STM32F103xB
535+
GenF1.menu.pnum.BLUEPILL_F103C6.build.board=BLUEPILL_F103C6
536+
GenF1.menu.pnum.BLUEPILL_F103C6.build.product_line=STM32F103x6
537537
GenF1.menu.pnum.BLUEPILL_F103C6.build.variant=BLUEPILL_F103C8
538538

539539
# BLUEPILL_F103C8 board

‎variants/BLUEPILL_F103C8/PeripheralPins.c

+23-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2727
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*******************************************************************************
29-
* Automatically generated from STM32F103C(8-B)Tx.xml
29+
* Automatically generated from STM32F103C(4-6)|(8-B)Tx.xml
3030
*/
3131
#include "Arduino.h"
3232
#include "PeripheralPins.h"
@@ -73,7 +73,9 @@ const PinMap PinMap_ADC[] = {
7373
const PinMap PinMap_I2C_SDA[] = {
7474
{PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
7575
{PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_I2C1_ENABLE)},
76+
#ifndef ARDUINO_BLUEPILL_F103C6
7677
{PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
78+
#endif
7779
{NC, NP, 0}
7880
};
7981
#endif
@@ -82,7 +84,9 @@ const PinMap PinMap_I2C_SDA[] = {
8284
const PinMap PinMap_I2C_SCL[] = {
8385
{PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
8486
{PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_I2C1_ENABLE)},
87+
#ifndef ARDUINO_BLUEPILL_F103C6
8588
{PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
89+
#endif
8690
{NC, NP, 0}
8791
};
8892
#endif
@@ -122,10 +126,12 @@ const PinMap PinMap_PWM[] = {
122126
{PB_3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 2, 0)}, // TIM2_CH2
123127
{PB_4, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 1, 0)}, // TIM3_CH1
124128
{PB_5, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 2, 0)}, // TIM3_CH2
129+
#ifndef ARDUINO_BLUEPILL_F103C6
125130
{PB_6, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM4_CH1
126131
{PB_7, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM4_CH2
127132
{PB_8, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM4_CH3
128133
{PB_9, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM4_CH4
134+
#endif
129135
// {PB_10, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 3, 0)}, // TIM2_CH3
130136
{PB_10, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 3, 0)}, // TIM2_CH3
131137
// {PB_11, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 4, 0)}, // TIM2_CH4
@@ -144,7 +150,9 @@ const PinMap PinMap_UART_TX[] = {
144150
{PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
145151
{PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
146152
{PB_6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART1_ENABLE)},
153+
#ifndef ARDUINO_BLUEPILL_F103C6
147154
{PB_10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
155+
#endif
148156
{NC, NP, 0}
149157
};
150158
#endif
@@ -154,7 +162,9 @@ const PinMap PinMap_UART_RX[] = {
154162
{PA_3, USART2, STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
155163
{PA_10, USART1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
156164
{PB_7, USART1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_USART1_ENABLE)},
165+
#ifndef ARDUINO_BLUEPILL_F103C6
157166
{PB_11, USART3, STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
167+
#endif
158168
{NC, NP, 0}
159169
};
160170
#endif
@@ -163,8 +173,10 @@ const PinMap PinMap_UART_RX[] = {
163173
const PinMap PinMap_UART_RTS[] = {
164174
{PA_1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
165175
{PA_12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
176+
#ifndef ARDUINO_BLUEPILL_F103C6
166177
{PB_14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
167178
// {PB_14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
179+
#endif
168180
{NC, NP, 0}
169181
};
170182
#endif
@@ -173,8 +185,10 @@ const PinMap PinMap_UART_RTS[] = {
173185
const PinMap PinMap_UART_CTS[] = {
174186
{PA_0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
175187
{PA_11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
188+
#ifndef ARDUINO_BLUEPILL_F103C6
176189
{PB_13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
177190
// {PB_13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
191+
#endif
178192
{NC, NP, 0}
179193
};
180194
#endif
@@ -185,7 +199,9 @@ const PinMap PinMap_UART_CTS[] = {
185199
const PinMap PinMap_SPI_MOSI[] = {
186200
{PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
187201
{PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
202+
#ifndef ARDUINO_BLUEPILL_F103C6
188203
{PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
204+
#endif
189205
{NC, NP, 0}
190206
};
191207
#endif
@@ -194,7 +210,9 @@ const PinMap PinMap_SPI_MOSI[] = {
194210
const PinMap PinMap_SPI_MISO[] = {
195211
{PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
196212
{PB_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
213+
#ifndef ARDUINO_BLUEPILL_F103C6
197214
{PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
215+
#endif
198216
{NC, NP, 0}
199217
};
200218
#endif
@@ -203,7 +221,9 @@ const PinMap PinMap_SPI_MISO[] = {
203221
const PinMap PinMap_SPI_SCLK[] = {
204222
{PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
205223
{PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
224+
#ifndef ARDUINO_BLUEPILL_F103C6
206225
{PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
226+
#endif
207227
{NC, NP, 0}
208228
};
209229
#endif
@@ -212,7 +232,9 @@ const PinMap PinMap_SPI_SCLK[] = {
212232
const PinMap PinMap_SPI_SSEL[] = {
213233
{PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
214234
{PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
235+
#ifndef ARDUINO_BLUEPILL_F103C6
215236
{PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
237+
#endif
216238
{NC, NP, 0}
217239
};
218240
#endif

‎variants/BLUEPILL_F103C8/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ extern const PinName digitalPin[];
110110

111111
// Timer Definitions
112112
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
113-
#define TIMER_TONE TIM4
113+
#define TIMER_TONE TIM3
114114

115115
// Do not use basic timer: OC is required
116116
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work

0 commit comments

Comments
 (0)