Skip to content

Commit 83cc361

Browse files
fpistmfpistm
authored
Merge pull request #1511 from fpistm/Swan
Move Swan board to dedicated menu and add a workaround for SWD upload method
2 parents 5f0c78d + 6443704 commit 83cc361

File tree

2 files changed

+102
-16
lines changed

2 files changed

+102
-16
lines changed

‎README.md‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
6969
- [Generic STM32WB boards](#generic-stm32wb-boards)
7070
- [Generic STM32WL boards](#generic-stm32wb-boards)
7171
- [3D printer boards](#3d-printer-boards)
72+
- [Blues Wireless boards](#blues-wireless-boards)
7273
- [Elecgator boards](#elecgator-boards)
7374
- [Electronic Speed Controller boards](#electronic-speed-controller-boards)
7475
- [Garatronics boards](#Garatronic/McHobby-boards)
@@ -407,7 +408,6 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
407408
| :green_heart: | STM32L4S7ZITx | Generic Board | *2.0.0* | |
408409
| :green_heart: | STM32L4S9ZIJx | Generic Board | *2.0.0* | |
409410
| :yellow_heart: | STM32L4S9ZIYx | Generic Board | **2.1.0** | |
410-
| :yellow_heart: | STM32L4R5ZIYx | Swan R5 | **2.1.0** | [Blues Wireless](https://blues.io/) |
411411

412412
### Generic STM32L5 boards
413413

@@ -460,14 +460,11 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
460460
| :green_heart: | STM32F446RE | [VAkE v1.0](https://www.facebook.com/pages/category/Product-Service/VAkE-Board-2290066274575218/) | *1.6.0* | |
461461
| :green_heart: | STM32F446VE | [FYSETC_S6](https://wiki.fysetc.com/FYSETC_S6/) | *1.9.0* | |
462462

463-
### [Garatronic](https://www.garatronic.fr)/[McHobby](https://shop.mchobby.be) boards
463+
### [Blues Wireless](https://blues.io/) boards
464464

465465
| Status | Device(s) | Name | Release | Notes |
466466
| :----: | :-------: | ---- | :-----: | :---- |
467-
| :green_heart: | STM32F072RB | [PYBStick 26 Duino](https://shop.mchobby.be/fr/compatibles-arduino/1851-pybstick-duino-arduino-uniquement-3232100018518-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
468-
| :green_heart: | STM32F401CE | [PYBStick 26 Lite](https://shop.mchobby.be/fr/micropython/1830-pybstick-lite-26-micropython-et-arduino-3232100018303-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
469-
| :green_heart: | STM32F411RE | [PYBStick 26 Standard](https://shop.mchobby.be/fr/micropython/1844-pybstick-standard-26-micropython-et-arduino-3232100018440-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
470-
| :green_heart: | STM32F412RE | [PYBStick 26 Pro](https://shop.mchobby.be/fr/micropython/1850-pybstick-pro-26-micropython-et-arduino-3232100018501-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
467+
| :yellow_heart: | STM32L4R5ZIYx | Swan R5 | **2.1.0** | |
471468

472469
### [Elecgator](https://www.elecgator.com/) boards
473470

@@ -482,6 +479,15 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
482479
| :green_heart: | STM32F051K6U | [Wraith V1 ESC](https://www.readytoflyquads.com/35a-wraith32-v11-32bit-blheli-esc) | *1.8.0* | |
483480
| :yellow_heart: | STM32F103RCT | [STorM32 V1.31 RC](http://www.olliw.eu/storm32bgc-wiki/STorM32_Boards#STorM32-BGC_v1.3) | **2.1.0** | |
484481

482+
### [Garatronic](https://www.garatronic.fr)/[McHobby](https://shop.mchobby.be) boards
483+
484+
| Status | Device(s) | Name | Release | Notes |
485+
| :----: | :-------: | ---- | :-----: | :---- |
486+
| :green_heart: | STM32F072RB | [PYBStick 26 Duino](https://shop.mchobby.be/fr/compatibles-arduino/1851-pybstick-duino-arduino-uniquement-3232100018518-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
487+
| :green_heart: | STM32F401CE | [PYBStick 26 Lite](https://shop.mchobby.be/fr/micropython/1830-pybstick-lite-26-micropython-et-arduino-3232100018303-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
488+
| :green_heart: | STM32F411RE | [PYBStick 26 Standard](https://shop.mchobby.be/fr/micropython/1844-pybstick-standard-26-micropython-et-arduino-3232100018440-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
489+
| :green_heart: | STM32F412RE | [PYBStick 26 Pro](https://shop.mchobby.be/fr/micropython/1850-pybstick-pro-26-micropython-et-arduino-3232100018501-garatronic.html) | *1.9.0* | [More info](https://github.com/mchobby/pyboard-driver/tree/master/PYBStick) |
490+
485491
### Generic flight controllers
486492

487493
| Status | Device(s) | Name | Release | Notes |

‎boards.txt‎

Lines changed: 90 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4563,16 +4563,6 @@ GenL4.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
45634563
GenL4.build.series=STM32L4xx
45644564
GenL4.build.cmsis_lib_gcc=arm_cortexM4lf_math
45654565

4566-
# Swan R5
4567-
GenL4.menu.pnum.SWAN_R5=Swan R5
4568-
GenL4.menu.pnum.SWAN_R5.upload.maximum_size=2097152
4569-
GenL4.menu.pnum.SWAN_R5.upload.maximum_data_size=655360
4570-
GenL4.menu.pnum.SWAN_R5.build.board=SWAN_R5
4571-
GenL4.menu.pnum.SWAN_R5.build.product_line=STM32L4R5xx
4572-
GenL4.menu.pnum.SWAN_R5.build.variant=STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY
4573-
GenL4.menu.pnum.SWAN_R5.build.variant_h=variant_{build.board}.h
4574-
GenL4.menu.pnum.SWAN_R5.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
4575-
45764566
# Generic L412K8Tx
45774567
GenL4.menu.pnum.GENERIC_L412K8TX=Generic L412K8Tx
45784568
GenL4.menu.pnum.GENERIC_L412K8TX.upload.maximum_size=65536
@@ -5679,6 +5669,45 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
56795669
3dprinter.menu.upload_method.dfuMethod.upload.options=-g
56805670
3dprinter.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
56815671

5672+
################################################################################
5673+
# Blues Wireless boards
5674+
5675+
BluesW.name= Blues Wireless boards
5676+
5677+
BluesW.build.core=arduino
5678+
BluesW.build.board=BluesWireless
5679+
BluesW.build.variant_h=variant_{build.board}.h
5680+
BluesW.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
5681+
5682+
# Swan R5 board
5683+
BluesW.menu.pnum.SWAN_R5=Swan R5
5684+
BluesW.menu.pnum.SWAN_R5.upload.maximum_size=2097152
5685+
BluesW.menu.pnum.SWAN_R5.upload.maximum_data_size=655360
5686+
BluesW.menu.pnum.SWAN_R5.build.mcu=cortex-m4
5687+
BluesW.menu.pnum.SWAN_R5.build.cmsis_lib_gcc=arm_cortexM4lf_math
5688+
BluesW.menu.pnum.SWAN_R5.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
5689+
BluesW.menu.pnum.SWAN_R5.build.board=SWAN_R5
5690+
BluesW.menu.pnum.SWAN_R5.build.series=STM32L4xx
5691+
BluesW.menu.pnum.SWAN_R5.build.product_line=STM32L4R5xx
5692+
BluesW.menu.pnum.SWAN_R5.build.variant=STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY
5693+
BluesW.menu.pnum.SWAN_R5.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
5694+
5695+
# Upload menu
5696+
BluesW.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
5697+
BluesW.menu.upload_method.swdMethod.upload.protocol=0
5698+
BluesW.menu.upload_method.swdMethod.upload.options=-g -ob nBOOT0=0 -ob nBOOT0=1
5699+
BluesW.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
5700+
5701+
BluesW.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
5702+
BluesW.menu.upload_method.serialMethod.upload.protocol=1
5703+
BluesW.menu.upload_method.serialMethod.upload.options={serial.port.file} -s
5704+
BluesW.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
5705+
5706+
BluesW.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
5707+
BluesW.menu.upload_method.dfuMethod.upload.protocol=2
5708+
BluesW.menu.upload_method.dfuMethod.upload.options=-g
5709+
BluesW.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
5710+
56825711
################################################################################
56835712
# Elecgator boards
56845713

@@ -6199,6 +6228,12 @@ GenWL.menu.xserial.disabled.build.xSerial=
61996228
3dprinter.menu.xserial.disabled=Disabled (no Serial support)
62006229
3dprinter.menu.xserial.disabled.build.xSerial=
62016230

6231+
BluesW.menu.xserial.generic=Enabled (generic 'Serial')
6232+
BluesW.menu.xserial.none=Enabled (no generic 'Serial')
6233+
BluesW.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
6234+
BluesW.menu.xserial.disabled=Disabled (no Serial support)
6235+
BluesW.menu.xserial.disabled.build.xSerial=
6236+
62026237
Elecgator.menu.xserial.generic=Enabled (generic 'Serial')
62036238
Elecgator.menu.xserial.none=Enabled (no generic 'Serial')
62046239
Elecgator.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
@@ -6485,6 +6520,19 @@ GenWB.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
64856520
3dprinter.menu.xusb.HSFS=High Speed in Full Speed mode
64866521
3dprinter.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
64876522

6523+
BluesW.menu.usb.none=None
6524+
BluesW.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
6525+
BluesW.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
6526+
BluesW.menu.usb.CDC=CDC (no generic 'Serial')
6527+
BluesW.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
6528+
BluesW.menu.usb.HID=HID (keyboard and mouse)
6529+
BluesW.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
6530+
BluesW.menu.xusb.FS=Low/Full Speed
6531+
BluesW.menu.xusb.HS=High Speed
6532+
BluesW.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
6533+
BluesW.menu.xusb.HSFS=High Speed in Full Speed mode
6534+
BluesW.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
6535+
64886536
Elecgator.menu.usb.none=None
64896537
Elecgator.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
64906538
Elecgator.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -6959,6 +7007,24 @@ GenWL.menu.opt.ogstd.build.flags.optimize=-Og
69597007
3dprinter.menu.opt.ogstd=Debug (-Og)
69607008
3dprinter.menu.opt.ogstd.build.flags.optimize=-Og
69617009

7010+
BluesW.menu.opt.osstd=Smallest (-Os default)
7011+
BluesW.menu.opt.oslto=Smallest (-Os) with LTO
7012+
BluesW.menu.opt.oslto.build.flags.optimize=-Os -flto
7013+
BluesW.menu.opt.o1std=Fast (-O1)
7014+
BluesW.menu.opt.o1std.build.flags.optimize=-O1
7015+
BluesW.menu.opt.o1lto=Fast (-O1) with LTO
7016+
BluesW.menu.opt.o1lto.build.flags.optimize=-O1 -flto
7017+
BluesW.menu.opt.o2std=Faster (-O2)
7018+
BluesW.menu.opt.o2std.build.flags.optimize=-O2
7019+
BluesW.menu.opt.o2lto=Faster (-O2) with LTO
7020+
BluesW.menu.opt.o2lto.build.flags.optimize=-O2 -flto
7021+
BluesW.menu.opt.o3std=Fastest (-O3)
7022+
BluesW.menu.opt.o3std.build.flags.optimize=-O3
7023+
BluesW.menu.opt.o3lto=Fastest (-O3) with LTO
7024+
BluesW.menu.opt.o3lto.build.flags.optimize=-O3 -flto
7025+
BluesW.menu.opt.ogstd=Debug (-Og)
7026+
BluesW.menu.opt.ogstd.build.flags.optimize=-Og
7027+
69627028
Elecgator.menu.opt.osstd=Smallest (-Os default)
69637029
Elecgator.menu.opt.oslto=Smallest (-Os) with LTO
69647030
Elecgator.menu.opt.oslto.build.flags.optimize=-Os -flto
@@ -7156,6 +7222,10 @@ GenWL.menu.dbg.enable.build.flags.debug=-g
71567222
3dprinter.menu.dbg.enable=Enabled (-g)
71577223
3dprinter.menu.dbg.enable.build.flags.debug=-g
71587224

7225+
BluesW.menu.dbg.none=None
7226+
BluesW.menu.dbg.enable=Enabled (-g)
7227+
BluesW.menu.dbg.enable.build.flags.debug=-g
7228+
71597229
Elecgator.menu.dbg.none=None
71607230
Elecgator.menu.dbg.enable=Enabled (-g)
71617231
Elecgator.menu.dbg.enable.build.flags.debug=-g
@@ -7411,6 +7481,16 @@ GenWL.menu.rtlib.full.build.flags.ldspecs=
74117481
3dprinter.menu.rtlib.full=Newlib Standard
74127482
3dprinter.menu.rtlib.full.build.flags.ldspecs=
74137483

7484+
BluesW.menu.rtlib.nano=Newlib Nano (default)
7485+
BluesW.menu.rtlib.nanofp=Newlib Nano + Float Printf
7486+
BluesW.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
7487+
BluesW.menu.rtlib.nanofs=Newlib Nano + Float Scanf
7488+
BluesW.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
7489+
BluesW.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
7490+
BluesW.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
7491+
BluesW.menu.rtlib.full=Newlib Standard
7492+
BluesW.menu.rtlib.full.build.flags.ldspecs=
7493+
74147494
Elecgator.menu.rtlib.nano=Newlib Nano (default)
74157495
Elecgator.menu.rtlib.nanofp=Newlib Nano + Float Printf
74167496
Elecgator.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float

0 commit comments

Comments
 (0)