Skip to content

Commit e3d460d

Browse files
author
rogerclarkmelbourne
committed
Added STM32F103V series boards from files supplied by VictorPV (after updating to latest changes to -DSERIAL_USB etc) , also added victors experimental USB reset code - which partially works !
1 parent 2ab2e5c commit e3d460d

31 files changed

Lines changed: 1571 additions & 30 deletions

File tree

STM32F1/boards.txt

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,3 +285,65 @@ genericSTM32F103Z.menu.upload_method.STLinkMethod=STLink
285285
genericSTM32F103Z.menu.upload_method.STLinkMethod.upload.protocol=STLink
286286
genericSTM32F103Z.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
287287
genericSTM32F103Z.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB
288+
289+
290+
291+
292+
########################### Generic STM32F103V ###########################
293+
294+
295+
genericSTM32F103V.name=Generic STM32F103V series
296+
genericSTM32F103V.build.variant=generic_stm32f103v
297+
genericSTM32F103V.build.vect=VECT_TAB_ADDR=0x8000000
298+
genericSTM32F103V.build.core=maple
299+
genericSTM32F103V.build.board=GENERIC_STM32F103V
300+
genericSTM32F103V.upload.use_1200bps_touch=false
301+
genericSTM32F103V.upload.file_type=bin
302+
genericSTM32F103V.upload.auto_reset=true
303+
304+
genericSTM32F103V.build.error_led_port=GPIOE
305+
genericSTM32F103V.build.error_led_pin=6
306+
307+
308+
genericSTM32F103V.menu.device_variant.STM32F103VC=STM32F103VC
309+
genericSTM32F103V.menu.device_variant.STM32F103VC.build.cpu_flags=-DMCU_STM32F103VC
310+
genericSTM32F103V.menu.device_variant.STM32F103VC.upload.maximum_size=262144
311+
genericSTM32F103V.menu.device_variant.STM32F103VC.upload.ram.maximum_size=492152
312+
genericSTM32F103V.menu.device_variant.STM32F103VC.upload.flash.maximum_size=262144
313+
genericSTM32F103V.menu.device_variant.STM32F103VC.build.ldscript=ld/stm32f103vc.ld
314+
315+
316+
genericSTM32F103V.menu.device_variant.STM32F103VD=STM32F103VD
317+
genericSTM32F103V.menu.device_variant.STM32F103VD.build.cpu_flags=-DMCU_STM32F103VD
318+
genericSTM32F103V.menu.device_variant.STM32F103VD.upload.maximum_size=393216
319+
genericSTM32F103V.menu.device_variant.STM32F103VD.upload.ram.maximum_size=65536
320+
genericSTM32F103V.menu.device_variant.STM32F103VD.upload.flash.maximum_size=393216
321+
genericSTM32F103V.menu.device_variant.STM32F103VD.build.ldscript=ld/stm32f103vd.ld
322+
323+
324+
genericSTM32F103V.menu.device_variant.STM32F103VE=STM32F103VE
325+
genericSTM32F103V.menu.device_variant.STM32F103VE.build.cpu_flags=-DMCU_STM32F103VE -DSERIAL_USB
326+
genericSTM32F103V.menu.device_variant.STM32F103VE.upload.maximum_size=524288
327+
genericSTM32F103V.menu.device_variant.STM32F103VE.upload.ram.maximum_size=65536
328+
genericSTM32F103V.menu.device_variant.STM32F103VE.upload.flash.maximum_size=524288
329+
genericSTM32F103V.menu.device_variant.STM32F103VE.build.ldscript=ld/stm32f103ve.ld
330+
331+
#---------------------------- UPLOAD METHODS ---------------------------
332+
genericSTM32F103V.menu.upload_method.serialMethod=Serial
333+
genericSTM32F103V.menu.upload_method.serialMethod.upload.protocol=maple_serial
334+
genericSTM32F103V.menu.upload_method.serialMethod.upload.tool=serial_upload
335+
336+
337+
genericSTM32F103V.menu.upload_method.STLinkMethod=STLink
338+
genericSTM32F103V.menu.upload_method.STLinkMethod.upload.protocol=STLink
339+
genericSTM32F103V.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
340+
genericSTM32F103V.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
341+
342+
genericSTM32F103V.menu.upload_method.DFUUploadMethod=Maple DFU
343+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu
344+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload
345+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB
346+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000
347+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103veDFU.ld
348+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003
349+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.altID=1

STM32F1/cores/maple/usb_serial.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ class USBSerial : public Stream {
7373
uint8 pending();
7474
};
7575

76-
#if BOARD_HAVE_SERIALUSB
77-
#ifdef SERIAL_USB
76+
#ifdef SERIAL_USB
7877
extern USBSerial Serial;
79-
#endif
8078
#endif
8179

8280
#endif

STM32F1/variants/generic_stm32f103c/wirish/boards_setup.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,9 @@ namespace wirish {
7474
}
7575

7676
__weak void board_setup_usb(void) {
77-
#if BOARD_HAVE_SERIALUSB
78-
#ifdef SERIAL_USB
77+
#ifdef SERIAL_USB
7978
Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
80-
#endif
81-
#endif
79+
#endif
8280
}
8381

8482
__weak void series_init(void) {

STM32F1/variants/generic_stm32f103r/wirish/boards_setup.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,8 @@ namespace wirish {
7474
}
7575

7676
__weak void board_setup_usb(void) {
77-
#if BOARD_HAVE_SERIALUSB
78-
#ifdef SERIAL_USB
77+
#ifdef SERIAL_USB
7978
Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
80-
#endif
8179
#endif
8280
}
8381

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
/******************************************************************************
2+
* The MIT License
3+
*
4+
* Copyright (c) 2011 LeafLabs, LLC.
5+
*
6+
* Permission is hereby granted, free of charge, to any person
7+
* obtaining a copy of this software and associated documentation
8+
* files (the "Software"), to deal in the Software without
9+
* restriction, including without limitation the rights to use, copy,
10+
* modify, merge, publish, distribute, sublicense, and/or sell copies
11+
* of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be
15+
* included in all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
20+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
21+
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
22+
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
23+
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24+
* SOFTWARE.
25+
*****************************************************************************/
26+
27+
/**
28+
* @file wirish/boards/maple/board.cpp
29+
* @author Marti Bolivar <mbolivar@leaflabs.com>
30+
* @brief Maple board file.
31+
*/
32+
33+
#include <board/board.h> // For this board's header file
34+
35+
#include <wirish_types.h> // For stm32_pin_info and its contents
36+
// (these go into PIN_MAP).
37+
38+
#include "boards_private.h" // For PMAP_ROW(), which makes
39+
// PIN_MAP easier to read.
40+
41+
// boardInit(): nothing special to do for Maple.
42+
//
43+
// When defining your own board.cpp, you can put extra code in this
44+
// function if you have anything you want done on reset, before main()
45+
// or setup() are called.
46+
//
47+
// If there's nothing special you need done, feel free to leave this
48+
// function out, as we do here.
49+
/*
50+
void boardInit(void) {
51+
}
52+
*/
53+
54+
// Pin map: this lets the basic I/O functions (digitalWrite(),
55+
// analogRead(), pwmWrite()) translate from pin numbers to STM32
56+
// peripherals.
57+
//
58+
// PMAP_ROW() lets us specify a row (really a struct stm32_pin_info)
59+
// in the pin map. Its arguments are:
60+
//
61+
// - GPIO device for the pin (GPIOA, etc.)
62+
// - GPIO bit for the pin (0 through 15)
63+
// - Timer device, or NULL if none
64+
// - Timer channel (1 to 4, for PWM), or 0 if none
65+
// - ADC device, or NULL if none
66+
// - ADC channel, or ADCx if none
67+
68+
extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
69+
/*
70+
gpio_dev *gpio_device; GPIO device
71+
timer_dev *timer_device; Pin's timer device, if any.
72+
const adc_dev *adc_device; ADC device, if any.
73+
uint8 gpio_bit; Pin's GPIO port bit.
74+
uint8 timer_channel; Timer channel, or 0 if none.
75+
uint8 adc_channel; Pin ADC channel, or ADCx if none.
76+
*/
77+
78+
{GPIOA, TIMER2, ADC1, 0, 1, 0}, /* PA0 */
79+
{GPIOA, TIMER2, ADC1, 1, 2, 1}, /* PA1 */
80+
{GPIOA, TIMER2, ADC1, 2, 3, 2}, /* PA2 */
81+
{GPIOA, TIMER2, ADC1, 3, 4, 3}, /* PA3 */
82+
{GPIOA, NULL, ADC1, 4, 0, 4}, /* PA4 */
83+
{GPIOA, NULL, ADC1, 5, 0, 5}, /* PA5 */
84+
{GPIOA, TIMER3, ADC1, 6, 1, 6}, /* PA6 */
85+
{GPIOA, TIMER3, ADC1, 7, 2, 7}, /* PA7 */
86+
{GPIOA, TIMER1, NULL, 8, 1, ADCx}, /* PA8 */
87+
{GPIOA, TIMER1, NULL, 9, 2, ADCx}, /* PA9 */
88+
{GPIOA, TIMER1, NULL, 10, 3, ADCx}, /* PA10 */
89+
{GPIOA, NULL, NULL, 11, 0, ADCx}, /* PA11 */ //Could have TIMER1_CH4, but is also CAN_RX and USBDM
90+
{GPIOA, NULL, NULL, 12, 0, ADCx}, /* PA12 */ //Could have TIMER1_ETR, but is also CAN_TX and USBDP
91+
{GPIOA, NULL, NULL, 13, 0, ADCx}, /* PA13 */
92+
{GPIOA, NULL, NULL, 14, 0, ADCx}, /* PA14 */
93+
{GPIOA, NULL, NULL, 15, 0, ADCx}, /* PA15 */ //SPI3_NSS
94+
95+
{GPIOB, TIMER3, ADC1, 0, 3, 8}, /* PB0 */
96+
{GPIOB, TIMER3, ADC1, 1, 4, 9}, /* PB1 */
97+
/* NOTE PB2 is not included as its Boot 1 */
98+
{GPIOB, NULL, NULL, 3, 0, ADCx}, /* PB3 */ //JTDO, SPI3_SCK / I2S3_CK/
99+
{GPIOB, NULL, NULL, 4, 0, ADCx}, /* PB4 */ //NJTRST, SPI3_MISO
100+
{GPIOB, NULL, NULL, 5, 0, ADCx}, /* PB5 */ //I2C1_SMBA/ SPI3_MOSI
101+
{GPIOB, TIMER4, NULL, 6, 1, ADCx}, /* PB6 */ //I2C1_SCL(9)
102+
{GPIOB, TIMER4, NULL, 7, 2, ADCx}, /* PB7 */ //I2C1_SDA(9) / FSMC_NADV
103+
{GPIOB, TIMER4, NULL, 8, 3, ADCx}, /* PB8 */ //SDIO_D4
104+
{GPIOB, TIMER4, NULL, 9, 4, ADCx}, /* PB9 */ //SDIO_D5
105+
{GPIOB, NULL, NULL, 10, 0, ADCx}, /* PB10 */ //I2C2_SCL/USART3_TX
106+
{GPIOB, NULL, NULL, 11, 0, ADCx}, /* PB11 */ //I2C2_SDA/USART3_RX
107+
{GPIOB, NULL, NULL, 12, 0, ADCx}, /* PB12 */ //SPI2_NSS/I2S2_WS/I2C2_SMBA/USART3_CK
108+
{GPIOB, NULL, NULL, 13, 0, ADCx}, /* PB13 */ //SPI2_SCK/I2S2_CK/USART3_CTS
109+
{GPIOB, NULL, NULL, 14, 0, ADCx}, /* PB14 */ //SPI2_MISO/TIM1_CH2N/USART3_RTS
110+
{GPIOB, NULL, NULL, 15, 0, ADCx}, /* PB15 */ //SPI2_MOSI/I2S2_SD
111+
112+
113+
{GPIOC, NULL, ADC1, 0, 0, 10}, /* PC0 */
114+
{GPIOC, NULL, ADC1, 1, 0, 11}, /* PC1 */
115+
{GPIOC, NULL, ADC1, 2, 0, 12}, /* PC2 */
116+
{GPIOC, NULL, ADC1, 3, 0, 13}, /* PC3 */
117+
{GPIOC, NULL, ADC1, 4, 0, 14}, /* PC4 */
118+
{GPIOC, NULL, ADC1, 5, 0, 15}, /* PC5 */
119+
{GPIOC, TIMER8, NULL, 6, 1, ADCx}, /* PC6 I2S2_MCK/SDIO_D6*/
120+
{GPIOC, TIMER8, NULL, 7, 2, ADCx}, /* PC7 I2S3_MCK/SDIO_D7*/
121+
{GPIOC, TIMER8, NULL, 8, 3, ADCx}, /* PC8 SDIO_D0*/
122+
{GPIOC, TIMER8, NULL, 9, 4, ADCx}, /* PC9 SDIO_D1*/
123+
{GPIOC, NULL, NULL, 10, 0, ADCx}, /* PC10 UART4_TX/SDIO_D2 */
124+
{GPIOC, NULL, NULL, 11, 0, ADCx}, /* PC11 UART4_RX/SDIO_D3 */
125+
{GPIOC, NULL, NULL, 12, 0, ADCx}, /* PC12 UART5_TX/SDIO_CK */
126+
{GPIOC, NULL, NULL, 13, 0, ADCx}, /* PC13 TAMPER-RTC/ Limited output*/
127+
{GPIOC, NULL, NULL, 14, 0, ADCx}, /* PC14 OSC32_IN/ Limited output*/
128+
{GPIOC, NULL, NULL, 15, 0, ADCx}, /* PC15 OSC32_OUT/ Limited output*/
129+
130+
{GPIOD, NULL, NULL, 0, 0, ADCx} , /* PD0 OSC_IN */
131+
{GPIOD, NULL, NULL, 1, 0, ADCx} , /* PD1 OSC_OUT */
132+
{GPIOD, NULL, NULL, 2, 0, ADCx} , /* PD2 TIM3_ETR/UART5_RX SDIO_CMD */
133+
{GPIOD, NULL, NULL, 3, 0, ADCx} , /* PD3 FSMC_CLK */
134+
{GPIOD, NULL, NULL, 4, 0, ADCx} , /* PD4 FSMC_NOE */
135+
{GPIOD, NULL, NULL, 5, 0, ADCx} , /* PD5 FSMC_NWE */
136+
{GPIOD, NULL, NULL, 6, 0, ADCx} , /* PD6 FSMC_NWAIT */
137+
{GPIOD, NULL, NULL, 7, 0, ADCx} , /* PD7 FSMC_NE1/FSMC_NCE2 */
138+
{GPIOD, NULL, NULL, 8, 0, ADCx} , /* PD8 FSMC_D13 */
139+
{GPIOD, NULL, NULL, 9, 0, ADCx} , /* PD9 FSMC_D14 */
140+
{GPIOD, NULL, NULL, 10, 0, ADCx} , /* PD10 FSMC_D15 */
141+
{GPIOD, NULL, NULL, 11, 0, ADCx} , /* PD11 FSMC_A16 */
142+
{GPIOD, NULL, NULL, 12, 0, ADCx} , /* PD12 FSMC_A17 */
143+
{GPIOD, NULL, NULL, 13, 0, ADCx} , /* PD13 FSMC_A18 */
144+
{GPIOD, NULL, NULL, 14, 0, ADCx} , /* PD14 FSMC_D0 */
145+
{GPIOD, NULL, NULL, 15, 0, ADCx} , /* PD15 FSMC_D1 */
146+
147+
{GPIOE, NULL, NULL, 0, 0, ADCx} , /* PE0 TIM4_ETR / FSMC_NBL0 */
148+
{GPIOE, NULL, NULL, 1, 0, ADCx} , /* PE1 FSMC_NBL1 */
149+
{GPIOE, NULL, NULL, 2, 0, ADCx} , /* PE2 TRACECK/ FSMC_A23 */
150+
{GPIOE, NULL, NULL, 3, 0, ADCx} , /* PE3 TRACED0/FSMC_A19 */
151+
{GPIOE, NULL, NULL, 4, 0, ADCx} , /* PE4 TRACED1/FSMC_A20 */
152+
{GPIOE, NULL, NULL, 5, 0, ADCx} , /* PE5 TRACED2/FSMC_A21 */
153+
{GPIOE, NULL, NULL, 6, 0, ADCx} , /* PE6 TRACED3/FSMC_A22 */
154+
{GPIOE, NULL, NULL, 7, 0, ADCx} , /* PE7 FSMC_D4 */
155+
{GPIOE, NULL, NULL, 8, 0, ADCx} , /* PE8 FSMC_D5 */
156+
{GPIOE, NULL, NULL, 9, 0, ADCx} , /* PE9 FSMC_D6 */
157+
{GPIOE, NULL, NULL, 10, 0, ADCx} , /* PE10 FSMC_D7 */
158+
{GPIOE, NULL, NULL, 11, 0, ADCx} , /* PE11 FSMC_D8 */
159+
{GPIOE, NULL, NULL, 12, 0, ADCx} , /* PE12 FSMC_D9 */
160+
{GPIOE, NULL, NULL, 13, 0, ADCx} , /* PE13 FSMC_D10 */
161+
{GPIOE, NULL, NULL, 14, 0, ADCx} , /* PE14 FSMC_D11 */
162+
{GPIOE, NULL, NULL, 15, 0, ADCx} , /* PE15 FSMC_D12 */
163+
164+
};
165+
166+
/* Basically everything that is defined as having a timer us PWM */
167+
extern const uint8 boardPWMPins[BOARD_NR_PWM_PINS] __FLASH__ = {
168+
PA0,PA1,PA2,PA3,PA6,PA7,PA8,PA9,PA10,PB0,PB1,PB6,PB7,PB8,PB9,PC6,PC7,PC8,PC9
169+
};
170+
171+
/* Basically everything that is defined having ADC */
172+
extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
173+
PA0,PA1,PA2,PA3,PA4,PA5,PA6,PA7,PB0,PB1,PC0,PC1,PC2,PC3,PC4,PC5
174+
};
175+
176+
/* not sure what this us used for */
177+
extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
178+
BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
179+
BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
180+
};

0 commit comments

Comments
 (0)