noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added STLink to upload_router.bat and changed STM32 to Flash board type so that a new menu of UploadMethod allows selection of upload via Serial or STLink

This commit is contained in:
Roger Clark 2015-02-03 09:55:13 +11:00
parent fe6ef337e8
commit d8f7103e1c
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
STM32F1XX/boards.txt
View File

@ -6,6 +6,8 @@ menu.debug_menu=Debug mode
menu.cpu_upload_menu=CPU & Upload mode
menu.HS_IO=High speed I/O commands
menu.upload_method=Upload method
nano.name= Maple mini generic
@ -285,32 +287,36 @@ maple_mini.build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
#maple_miniRAM.build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
##############################################################
maple_STM32.name=STM32 to Flash - No bootloader
genericSTM32.name=STM32 to Flash - No bootloader
maple_STM32.upload.tool=serial_upload
maple_STM32.upload.protocol=stm_serial
maple_STM32.upload.maximum_size=108000
maple_STM32.upload.use_1200bps_touch=false
maple_STM32.upload.file_type=bin
maple_STM32.upload.ram.maximum_size=17000
maple_STM32.upload.flash.maximum_size=108000
genericSTM32.menu.upload_method.serialMethod=Serial
genericSTM32.menu.upload_method.serialMethod.upload.protocol=maple_serial
genericSTM32.menu.upload_method.STLinkMethod=STLink
genericSTM32.menu.upload_method.STLinkMethod.upload.protocol=STLink
maple_STM32.upload.usbID=1EAF:0003
maple_STM32.upload.altID=1
maple_STM32.upload.auto_reset=true
genericSTM32.upload.tool=upload_router
genericSTM32.upload.maximum_size=108000
genericSTM32.upload.use_1200bps_touch=false
genericSTM32.upload.file_type=bin
genericSTM32.upload.ram.maximum_size=17000
genericSTM32.upload.flash.maximum_size=108000
maple_STM32.build.mcu=cortex-m3
maple_STM32.build.f_cpu=72000000L
maple_STM32.build.core=maple
maple_STM32.build.extra_flags=-DMCU_STM32F103CB -mthumb -DSTM32_MEDIUM_DENSITY -march=armv7-m -D__STM32F1XX__
maple_STM32.build.ldscript=ld/jtag.ld
maple_STM32.build.variant=maple_mini
maple_STM32.build.variant_system_lib=libmaple.a
maple_STM32.build.vect=VECT_TAB_FLASH
maple_STM32.build.density=STM32_MEDIUM_DENSITY
maple_STM32.build.error_led_port=GPIOB
maple_STM32.build.error_led_pin=1
maple_STM32.build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
genericSTM32.upload.usbID=1EAF:0003
genericSTM32.upload.altID=1
genericSTM32.upload.auto_reset=true
genericSTM32.build.mcu=cortex-m3
genericSTM32.build.f_cpu=72000000L
genericSTM32.build.core=maple
genericSTM32.build.extra_flags=-DMCU_STM32F103CB -mthumb -DSTM32_MEDIUM_DENSITY -march=armv7-m -D__STM32F1XX__
genericSTM32.build.ldscript=ld/jtag.ld
genericSTM32.build.variant=maple_mini
genericSTM32.build.variant_system_lib=libmaple.a
genericSTM32.build.vect=VECT_TAB_FLASH
genericSTM32.build.density=STM32_MEDIUM_DENSITY
genericSTM32.build.error_led_port=GPIOB
genericSTM32.build.error_led_pin=1
genericSTM32.build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
##############################################################

9
tools/win/upload_router.bat
View File

@ -17,7 +17,9 @@ set str1=%7
set str1=%str1:/=\%
set gcc=%str1: =%
if %6 == 1 (goto debug) else (if %5 == maple_serial (goto Serial) else (goto maple_loader))
if %6 == 1 (goto debug) else (if %5 == maple_serial (goto Serial) else (if %5 == maple_dfu (goto maple_loader) else (goto STLink)))
exit
:debug
debugging.bat %gcc% %elf%
@ -47,3 +49,8 @@ rem: "%ProgramFiles(x86)%\STMicroelectronics\Software\Flash Loader Demonstrator\
rem: -- 32 bit version
rem: "%ProgramFiles%\STMicroelectronics\Software\Flash Loader Demonstrator\STMFlashLoader.exe" -c --pn %commportnum% --br 230400 -i STM32_Med-density_64K -e --all -d --fn %str% --a 0x8000000 -r --a 0x8000000
exit
:STLink
stlink\ST-LINK_CLI.exe -c SWD -P %str% 0x8000000 -Rst -Run
exit