diff --git a/STM32F1/boards.txt b/STM32F1/boards.txt index d81d84e..cc16007 100644 --- a/STM32F1/boards.txt +++ b/STM32F1/boards.txt @@ -211,6 +211,11 @@ genericSTM32F103C.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp genericSTM32F103C.menu.upload_method.BMPMethod.upload.tool=bmp_upload genericSTM32F103C.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG + +genericSTM32F103C.menu.upload_method.jlinkMethod=JLink +genericSTM32F103C.menu.upload_method.jlinkMethod.upload.protocol=jlink +genericSTM32F103C.menu.upload_method.jlinkMethod.upload.tool=jlink_upload + ########################### Generic STM32F103R ########################### genericSTM32F103R.name=Generic STM32F103R series @@ -519,4 +524,4 @@ genericGD32F103C.menu.cpu_speed.speed_96mhz=96Mhz (Stable) genericGD32F103C.menu.cpu_speed.speed_96mhz.build.f_cpu=96000000L genericGD32F103C.menu.cpu_speed.speed_72mhz=72Mhz (compatibility) -genericGD32F103C.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L \ No newline at end of file +genericGD32F103C.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L diff --git a/STM32F1/platform.txt b/STM32F1/platform.txt index 9862be0..3ffde2e 100644 --- a/STM32F1/platform.txt +++ b/STM32F1/platform.txt @@ -149,4 +149,15 @@ tools.bmp_upload.path={runtime.tools.arm-none-eabi-gcc.path}/bin/ tools.bmp_upload.upload.speed=230400 tools.bmp_upload.upload.params.verbose= tools.bmp_upload.upload.params.quiet=-q --batch-silent -tools.bmp_upload.upload.pattern="{path}{cmd}" -cd "{build.path}" -b {upload.speed} {upload.verbose} -ex "set debug remote 0" -ex "set target-async off" -ex "set remotetimeout 60" -ex "set mem inaccessible-by-default off" -ex "set confirm off" -ex "set height 0" -ex "target extended-remote {serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "x/wx 0x8000004" -ex "monitor erase_mass" -ex "echo 0x8000004 expect 0xffffffff after erase\n" -ex "x/wx 0x8000004" -ex "file {build.project_name}.elf" -ex "load" -ex "x/wx 0x08000004" -ex "tbreak main" -ex "run" -ex "echo \n\n\nUpload finished!" -ex "quit" \ No newline at end of file +tools.bmp_upload.upload.pattern="{path}{cmd}" -cd "{build.path}" -b {upload.speed} {upload.verbose} -ex "set debug remote 0" -ex "set target-async off" -ex "set remotetimeout 60" -ex "set mem inaccessible-by-default off" -ex "set confirm off" -ex "set height 0" -ex "target extended-remote {serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "x/wx 0x8000004" -ex "monitor erase_mass" -ex "echo 0x8000004 expect 0xffffffff after erase\n" -ex "x/wx 0x8000004" -ex "file {build.project_name}.elf" -ex "load" -ex "x/wx 0x08000004" -ex "tbreak main" -ex "run" -ex "echo \n\n\nUpload finished!" -ex "quit" + +tools.jlink_upload.cmd=jlink_upload +tools.jlink_upload.cmd.windows=jlink_upload.bat +tools.jlink_upload.cmd.macosx=jlink_upload +tools.jlink_upload.path={runtime.hardware.path}/tools/win +tools.jlink_upload.path.macosx={runtime.hardware.path}/tools/macosx +tools.jlink_upload.path.linux={runtime.hardware.path}/tools/linux +tools.jlink_upload.path.linux64={runtime.hardware.path}/tools/linux64 +tools.jlink_upload.upload.params.verbose=-d +tools.jlink_upload.upload.params.quiet=n +tools.jlink_upload.upload.pattern="{path}/{cmd}" "{build.path}/{build.project_name}.bin" diff --git a/tools/linux/jlink_upload b/tools/linux/jlink_upload new file mode 100755 index 0000000..d07ffba --- /dev/null +++ b/tools/linux/jlink_upload @@ -0,0 +1,7 @@ +#!/bin/bash +echo loadbin "$1" , 0x8000000 > "$1".jlink +echo r >> "$1".jlink +echo q >> "$1".jlink + +/opt/SEGGER/JLink_V610e/JLinkExe -device STM32F103C8 -if SWD -speed auto -CommanderScript "$1".jlink +