Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c0f859a

Browse files
kbumsikkbumsik
authoredNov 2, 2019
Merge branch 'master' into stm32mp1
2 parents 89d27dc + 5cf1048 commit c0f859a

File tree

435 files changed

+177705
-142456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+177705
-142456
lines changed
 

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
124124
| :---: | --- | :---: | :--- |
125125
| :yellow_heart: | [ThunderPack](https://github.com/jgillick/ThunderPack) | **1.8.0** | |
126126

127-
128127
| Status | 3D printer boards | Release | Comment |
129128
| :---: | --- | :---: | :--- |
130129
| :green_heart: | [ARMED V1](https://github.com/ktand/Armed) | *1.5.0* | |
@@ -142,13 +141,14 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
142141
| :green_heart: | [RAK811 LoRa Tracker](https://www.rakwireless.com/en/) | *1.4.0* | Basic support |
143142
| :green_heart: | [RHF76-052](https://www.ai-thinker.com/) | *1.7.0* | Basic support |
144143

145-
| Status | Sparky flight controllers | Release | Comment |
144+
| Status | Electronic Speed Controller boards | Release | Comment |
146145
| :---: | --- | :---: | :--- |
147-
| :green_heart: | [Sparky V1](https://github.com/TauLabs/TauLabs/wiki/Sparky) | *1.6.0* | |
146+
| :yellow_heart: | Wraith V1 ESC | **1.8.0** | |
148147

149148
| Status | Generic flight controllers | Release | Comment |
150149
| :---: | --- | :---: | :--- |
151150
| :green_heart: | Afro Flight Rev5 (8/12MHz) | *1.7.0* | |
151+
| :green_heart: | [Sparky V1](https://github.com/TauLabs/TauLabs/wiki/Sparky) | *1.6.0* | |
152152

153153
| Status | [Midatronics](https://midatronics.com/) | Release | Comment |
154154
| :---: | --- | :---: | :--- |

‎boards.txt

Lines changed: 81 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,43 +1095,42 @@ GenL0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
10951095
GenL0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
10961096
GenL0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
10971097

1098-
###############################
1099-
# Sparky Flight Controllers
1100-
1101-
Sparky.name=Sparky flight controllers
1102-
1103-
Sparky.build.vid=0x0483
1104-
Sparky.build.core=arduino
1105-
Sparky.build.board=Sparky
1106-
Sparky.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1107-
1108-
# Sparky_V1 board
1109-
Sparky.menu.pnum.Sparky_V1=Sparky V1
1110-
Sparky.menu.pnum.Sparky_V1.upload.maximum_size=262144
1111-
Sparky.menu.pnum.Sparky_V1.upload.maximum_data_size=40960
1112-
Sparky.menu.pnum.Sparky_V1.build.mcu=cortex-m4
1113-
Sparky.menu.pnum.Sparky_V1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
1114-
Sparky.menu.pnum.Sparky_V1.build.board=Sparky_V1
1115-
Sparky.menu.pnum.Sparky_V1.build.series=STM32F3xx
1116-
Sparky.menu.pnum.Sparky_V1.build.product_line=STM32F303xC
1117-
Sparky.menu.pnum.Sparky_V1.build.variant=SPARKY_F303CC
1118-
Sparky.menu.pnum.Sparky_V1.build.cmsis_lib_gcc=arm_cortexM4lf_math
1098+
################################################################################
1099+
# Electronic Speed Controller boards
1100+
1101+
ESC_board.name=Electronic speed controllers
1102+
1103+
ESC_board.build.vid=0x0483
1104+
ESC_board.build.core=arduino
1105+
ESC_board.build.board=FCE_board
1106+
ESC_board.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1107+
1108+
# Wraith32_V1 board
1109+
ESC_board.menu.pnum.Wraith32_V1=Wraith V1 ESC
1110+
ESC_board.menu.pnum.Wraith32_V1.upload.maximum_size=32768
1111+
ESC_board.menu.pnum.Wraith32_V1.upload.maximum_data_size=7936
1112+
ESC_board.menu.pnum.Wraith32_V1.build.mcu=cortex-m0
1113+
ESC_board.menu.pnum.Wraith32_V1.build.board=Wraith32_V1
1114+
ESC_board.menu.pnum.Wraith32_V1.build.series=STM32F0xx
1115+
ESC_board.menu.pnum.Wraith32_V1.build.product_line=STM32F051x8
1116+
ESC_board.menu.pnum.Wraith32_V1.build.variant=WRAITH32_F051K6
1117+
ESC_board.menu.pnum.Wraith32_V1.build.cmsis_lib_gcc=arm_cortexM0l_math
11191118

11201119
# Upload menu
1121-
Sparky.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
1122-
Sparky.menu.upload_method.swdMethod.upload.protocol=0
1123-
Sparky.menu.upload_method.swdMethod.upload.options=-g
1124-
Sparky.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
1120+
ESC_board.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
1121+
ESC_board.menu.upload_method.swdMethod.upload.protocol=0
1122+
ESC_board.menu.upload_method.swdMethod.upload.options=-g
1123+
ESC_board.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
11251124

1126-
Sparky.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
1127-
Sparky.menu.upload_method.serialMethod.upload.protocol=1
1128-
Sparky.menu.upload_method.serialMethod.upload.options={serial.port.file} -s
1129-
Sparky.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
1125+
ESC_board.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
1126+
ESC_board.menu.upload_method.serialMethod.upload.protocol=1
1127+
ESC_board.menu.upload_method.serialMethod.upload.options={serial.port.file} -s
1128+
ESC_board.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
11301129

1131-
Sparky.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
1132-
Sparky.menu.upload_method.dfuMethod.upload.protocol=2
1133-
Sparky.menu.upload_method.dfuMethod.upload.options=-g
1134-
Sparky.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
1130+
ESC_board.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
1131+
ESC_board.menu.upload_method.dfuMethod.upload.protocol=2
1132+
ESC_board.menu.upload_method.dfuMethod.upload.options=-g
1133+
ESC_board.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
11351134

11361135
################################################################################
11371136
# LoRa boards
@@ -1338,26 +1337,41 @@ Genericflight.name=Generic flight controllers
13381337
Genericflight.build.vid=0x0483
13391338
Genericflight.build.core=arduino
13401339
Genericflight.build.board=Genericflight
1341-
Genericflight.build.mcu=cortex-m3
1342-
Genericflight.build.series=STM32F1xx
1343-
Genericflight.build.cmsis_lib_gcc=arm_cortexM3l_math
13441340
Genericflight.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} {build.bootloader_flags}
13451341

13461342
# AfroFlight Rev5
13471343
Genericflight.menu.pnum.AFROFLIGHT_F103CB=Afro Flight Rev5 (8MHz)
13481344
Genericflight.menu.pnum.AFROFLIGHT_F103CB.upload.maximum_size=131072
13491345
Genericflight.menu.pnum.AFROFLIGHT_F103CB.upload.maximum_data_size=20480
1346+
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.mcu=cortex-m3
1347+
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.series=STM32F1xx
1348+
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
13501349
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.board=AFROFLIGHT_F103CB
13511350
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.product_line=STM32F103xB
13521351
Genericflight.menu.pnum.AFROFLIGHT_F103CB.build.variant=AFROFLIGHT_F103CB
13531352

13541353
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M=Afro Flight Rev5 (12MHz)
13551354
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.maximum_size=131072
13561355
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.maximum_data_size=20480
1356+
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.mcu=cortex-m3
1357+
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.series=STM32F1xx
1358+
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.cmsis_lib_gcc=arm_cortexM3l_math
13571359
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.board=AFROFLIGHT_F103CB_12M
13581360
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.product_line=STM32F103xB
13591361
Genericflight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant=AFROFLIGHT_F103CB
13601362

1363+
# Sparky_V1 board
1364+
Genericflight.menu.pnum.Sparky_V1=Sparky V1 F303 FC
1365+
Genericflight.menu.pnum.Sparky_V1.upload.maximum_size=262144
1366+
Genericflight.menu.pnum.Sparky_V1.upload.maximum_data_size=40960
1367+
Genericflight.menu.pnum.Sparky_V1.build.mcu=cortex-m4
1368+
Genericflight.menu.pnum.Sparky_V1.build.series=STM32F3xx
1369+
Genericflight.menu.pnum.Sparky_V1.build.cmsis_lib_gcc=arm_cortexM4lf_math
1370+
Genericflight.menu.pnum.Sparky_V1.build.board=Sparky_V1
1371+
Genericflight.menu.pnum.Sparky_V1.build.product_line=STM32F303xC
1372+
Genericflight.menu.pnum.Sparky_V1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
1373+
Genericflight.menu.pnum.Sparky_V1.build.variant=SPARKY_F303CC
1374+
13611375
# Upload menu
13621376
Genericflight.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
13631377
Genericflight.menu.upload_method.swdMethod.upload.protocol=0
@@ -1520,11 +1534,11 @@ GenL0.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
15201534
GenL0.menu.xserial.disabled=Disabled (no Serial support)
15211535
GenL0.menu.xserial.disabled.build.xSerial=
15221536

1523-
Sparky.menu.xserial.generic=Enabled (generic 'Serial')
1524-
Sparky.menu.xserial.none=Enabled (no generic 'Serial')
1525-
Sparky.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
1526-
Sparky.menu.xserial.disabled=Disabled (no Serial support)
1527-
Sparky.menu.xserial.disabled.build.xSerial=
1537+
ESC_board.menu.xserial.generic=Enabled (generic 'Serial')
1538+
ESC_board.menu.xserial.none=Enabled (no generic 'Serial')
1539+
ESC_board.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
1540+
ESC_board.menu.xserial.disabled=Disabled (no Serial support)
1541+
ESC_board.menu.xserial.disabled.build.xSerial=
15281542

15291543
LoRa.menu.xserial.generic=Enabled (generic 'Serial')
15301544
LoRa.menu.xserial.none=Enabled (no generic 'Serial')
@@ -1665,17 +1679,6 @@ GenL0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_G
16651679
GenL0.menu.usb.HID=HID (keyboard and mouse)
16661680
GenL0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
16671681

1668-
Sparky.menu.usb.none=None
1669-
Sparky.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
1670-
Sparky.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
1671-
Sparky.menu.usb.CDC=CDC (no generic 'Serial')
1672-
Sparky.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
1673-
Sparky.menu.xusb.FS=Low/Full Speed
1674-
Sparky.menu.xusb.HS=High Speed
1675-
Sparky.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
1676-
Sparky.menu.xusb.HSFS=High Speed in Full Speed mode
1677-
Sparky.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
1678-
16791682
3dprinter.menu.usb.none=None
16801683
3dprinter.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
16811684
3dprinter.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -1914,23 +1917,23 @@ GenL0.menu.opt.o3lto.build.flags.optimize=-O3 -flto
19141917
GenL0.menu.opt.ogstd=Debug (-g)
19151918
GenL0.menu.opt.ogstd.build.flags.optimize=-g -Og
19161919

1917-
Sparky.menu.opt.osstd=Smallest (-Os default)
1918-
Sparky.menu.opt.oslto=Smallest (-Os) with LTO
1919-
Sparky.menu.opt.oslto.build.flags.optimize=-Os -flto
1920-
Sparky.menu.opt.o1std=Fast (-O1)
1921-
Sparky.menu.opt.o1std.build.flags.optimize=-O1
1922-
Sparky.menu.opt.o1lto=Fast (-O1) with LTO
1923-
Sparky.menu.opt.o1lto.build.flags.optimize=-O1 -flto
1924-
Sparky.menu.opt.o2std=Faster (-O2)
1925-
Sparky.menu.opt.o2std.build.flags.optimize=-O2
1926-
Sparky.menu.opt.o2lto=Faster (-O2) with LTO
1927-
Sparky.menu.opt.o2lto.build.flags.optimize=-O2 -flto
1928-
Sparky.menu.opt.o3std=Fastest (-O3)
1929-
Sparky.menu.opt.o3std.build.flags.optimize=-O3
1930-
Sparky.menu.opt.o3lto=Fastest (-O3) with LTO
1931-
Sparky.menu.opt.o3lto.build.flags.optimize=-O3 -flto
1932-
Sparky.menu.opt.ogstd=Debug (-g)
1933-
Sparky.menu.opt.ogstd.build.flags.optimize=-g -Og
1920+
ESC_board.menu.opt.osstd=Smallest (-Os default)
1921+
ESC_board.menu.opt.oslto=Smallest (-Os) with LTO
1922+
ESC_board.menu.opt.oslto.build.flags.optimize=-Os -flto
1923+
ESC_board.menu.opt.o1std=Fast (-O1)
1924+
ESC_board.menu.opt.o1std.build.flags.optimize=-O1
1925+
ESC_board.menu.opt.o1lto=Fast (-O1) with LTO
1926+
ESC_board.menu.opt.o1lto.build.flags.optimize=-O1 -flto
1927+
ESC_board.menu.opt.o2std=Faster (-O2)
1928+
ESC_board.menu.opt.o2std.build.flags.optimize=-O2
1929+
ESC_board.menu.opt.o2lto=Faster (-O2) with LTO
1930+
ESC_board.menu.opt.o2lto.build.flags.optimize=-O2 -flto
1931+
ESC_board.menu.opt.o3std=Fastest (-O3)
1932+
ESC_board.menu.opt.o3std.build.flags.optimize=-O3
1933+
ESC_board.menu.opt.o3lto=Fastest (-O3) with LTO
1934+
ESC_board.menu.opt.o3lto.build.flags.optimize=-O3 -flto
1935+
ESC_board.menu.opt.ogstd=Debug (-g)
1936+
ESC_board.menu.opt.ogstd.build.flags.optimize=-g -Og
19341937

19351938
LoRa.menu.opt.osstd=Smallest (-Os default)
19361939
LoRa.menu.opt.oslto=Smallest (-Os) with LTO
@@ -2115,15 +2118,15 @@ GenL0.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float
21152118
GenL0.menu.rtlib.full=Newlib Standard
21162119
GenL0.menu.rtlib.full.build.flags.ldspecs=
21172120

2118-
Sparky.menu.rtlib.nano=Newlib Nano (default)
2119-
Sparky.menu.rtlib.nanofp=Newlib Nano + Float Printf
2120-
Sparky.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
2121-
Sparky.menu.rtlib.nanofs=Newlib Nano + Float Scanf
2122-
Sparky.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
2123-
Sparky.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
2124-
Sparky.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
2125-
Sparky.menu.rtlib.full=Newlib Standard
2126-
Sparky.menu.rtlib.full.build.flags.ldspecs=
2121+
ESC_board.menu.rtlib.nano=Newlib Nano (default)
2122+
ESC_board.menu.rtlib.nanofp=Newlib Nano + Float Printf
2123+
ESC_board.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
2124+
ESC_board.menu.rtlib.nanofs=Newlib Nano + Float Scanf
2125+
ESC_board.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
2126+
ESC_board.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
2127+
ESC_board.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
2128+
ESC_board.menu.rtlib.full=Newlib Standard
2129+
ESC_board.menu.rtlib.full.build.flags.ldspecs=
21272130

21282131
LoRa.menu.rtlib.nano=Newlib Nano (default)
21292132
LoRa.menu.rtlib.nanofp=Newlib Nano + Float Printf

0 commit comments

Comments
 (0)
Please sign in to comment.