Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f2d1a68

Browse filesBrowse files
HalfSweetHalfSweet
authored
Merge pull request #46 from Air-duino/menu-add-boot
add: 菜单，选择boot控制方式
2 parents 56eba20 + 304b737 commit f2d1a68
Copy full SHA for f2d1a68

File tree

Expand file treeCollapse file tree

2 files changed

+21
-4
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+21
-4
lines changed

‎boards.txt

Copy file name to clipboardExpand all lines: boards.txt
+18-1Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ menu.xserial=U(S)ART support
77
menu.usb=USB support (if available)
88
menu.xusb=USB speed (if available)
99
menu.virtio=Virtual serial support
10+
menu.BootConnection=Boot Connection
1011

1112
menu.opt=Optimize
1213
menu.dbg=Debug symbols and core logs
@@ -161,6 +162,11 @@ Air001Dev.menu.SupplyVoltage.3V3.build.sv_tmp=-DVDD_3V8
161162
Air001Dev.menu.SupplyVoltage.5V=5V
162163
Air001Dev.menu.SupplyVoltage.5V.build.sv_tmp=-DVDD_5V
163164

165+
# boot
166+
Air001Dev.menu.BootConnection.defaule=default isp circuit
167+
Air001Dev.menu.BootConnection.defaule.upload.boot=default_reset
168+
Air001Dev.menu.BootConnection.direct=direct connect
169+
Air001Dev.menu.BootConnection.direct.upload.boot=direct_connect
164170

165171
Air001Dev.build.extra_flags={build.temp} -DF_CPU={build.f_cpu} {build.lsc_temp} {build.sv_tmp} -DAIR001_DEV
166172
# Upload menu
@@ -209,6 +215,11 @@ Air32F103xx.menu.pnum.AIR32F103CB.build.product_line=AIR32F103xB
209215
Air32F103xx.menu.pnum.AIR32F103CB.build.board=AIR32F103CB
210216
Air32F103xx.menu.pnum.AIR32F103CB.build.variant=AIR32F103/F103CB
211217

218+
# boot
219+
Air32F103xx.menu.BootConnection.defaule=default isp circuit
220+
Air32F103xx.menu.BootConnection.defaule.upload.boot=default_reset
221+
Air32F103xx.menu.BootConnection.direct=direct connect
222+
Air32F103xx.menu.BootConnection.direct.upload.boot=direct_connect
212223

213224
Air32F103xx.build.extra_flags=-DAIR32F1xx
214225

@@ -287,4 +298,10 @@ AirM2M_Air001_Board.menu.opt.ogstd.build.flags.optimize=-Og
287298
AirM2M_Air001_Board.menu.opt.o0std=No Optimization (-O0)
288299
AirM2M_Air001_Board.menu.opt.o0std.build.flags.optimize=-O0
289300

290-
AirM2M_Air001_Board.build.extra_flags=-DAIR001xx_HSE_24M_HCLK_48M -DF_CPU=48000000 -DAIR001xx_LSC_LSI -DVDD_3V3 -DAIR001_DEV
301+
# boot
302+
AirM2M_Air001_Board.menu.BootConnection.defaule=default isp circuit
303+
AirM2M_Air001_Board.menu.BootConnection.defaule.upload.boot=default_reset
304+
AirM2M_Air001_Board.menu.BootConnection.direct=direct connect
305+
AirM2M_Air001_Board.menu.BootConnection.direct.upload.boot=direct_connect
306+
307+
AirM2M_Air001_Board.build.extra_flags=-DAIR001xx_HSE_24M_HCLK_48M -DF_CPU=48000000 -DAIR001xx_LSC_LSI -DVDD_3V3 -DAIR001_DEV

‎platform.txt

Copy file name to clipboardExpand all lines: platform.txt
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,22 @@ tools.AirISP.cmd.windows=AirISP.exe
176176
tools.AirISP.upload.protocol=serial
177177
tools.AirISP.upload.params.verbose=
178178
tools.AirISP.upload.params.quiet=
179-
tools.AirISP.upload.pattern_args=--chip "auto" --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -e -p 0x08000000 "{build.path}/{build.project_name}.bin"
179+
tools.AirISP.upload.pattern_args=--chip "auto" --port "{serial.port}" --baud {upload.speed} --before {upload.boot} --after hard_reset write_flash -e -p 0x08000000 "{build.path}/{build.project_name}.bin"
180180
tools.AirISP.upload.pattern="{path}/{cmd}" {upload.pattern_args}
181181

182182
## Program Application
183183
## -------------------
184184
tools.AirISP.program.params.verbose=
185185
tools.AirISP.program.params.quiet=
186-
tools.AirISP.program.pattern_args=--chip "auto" --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -e -p 0x08000000 "{build.path}/{build.project_name}.bin"
186+
tools.AirISP.program.pattern_args=--chip "auto" --port "{serial.port}" --baud {upload.speed} --before {upload.boot} --after hard_reset write_flash -e -p 0x08000000 "{build.path}/{build.project_name}.bin"
187187
tools.AirISP.program.pattern="{path}/{cmd}" {program.pattern_args}
188188

189189
## Erase Chip (before burning the bootloader)
190190
## ------------------------------------------
191191
tools.AirISP.erase.protocol=serial
192192
tools.AirISP.erase.params.verbose=
193193
tools.AirISP.erase.params.quiet=
194-
tools.AirISP.erase.pattern_args=---chip "auto" --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset erase_flash
194+
tools.AirISP.erase.pattern_args=---chip "auto" --port "{serial.port}" --baud {upload.speed} --before {upload.boot} --after hard_reset erase_flash
195195
tools.AirISP.erase.pattern="{path}/{cmd}" {erase.pattern_args}
196196

197197
## Burn Bootloader

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.