Upload/Program with configurable generic command line tools (wip)

3 files changed, 14 insertions, 34 deletions

diff --git a/boards.txt b/boards.txt
index 32063cb..6903098 100644
--- a/boards.txt
+++ b/boards.txt
@@ -5,13 +5,10 @@ uno.upload.tool=avrdude
 uno.upload.protocol=arduino
 uno.upload.maximum_size=32256
 uno.upload.speed=115200
-uno.bootloader.low_fuses=0xff
-uno.bootloader.high_fuses=0xde
-uno.bootloader.extended_fuses=0x05
-uno.bootloader.path=optiboot
-uno.bootloader.file=optiboot_atmega328.hex
-uno.bootloader.unlock_bits=0x3F
-uno.bootloader.lock_bits=0x0F
+uno.bootloader.tool=avrdude
+uno.bootloader.erase.params=-e -Ulock:w:0x3F:m -Uefuse:w:0x05:m -Uhfuse:w:0xde:m -Ulfuse:w:0xff:m
+uno.bootloader.write.params=-Uflash:w:{bootloader.file}:i -Ulock:w:0x0F:m
+uno.bootloader.file={runtime.ide.path}/hardware/arduino/avr/optiboot/optiboot_atmega328.hex
 uno.build.mcu=atmega328p
 uno.build.f_cpu=16000000L
 uno.build.core=arduino
diff --git a/platform.txt b/platform.txt
index 59e2d16..9664c20 100644
--- a/platform.txt
+++ b/platform.txt
@@ -47,35 +47,18 @@ recipe.objcopy.hex.pattern={compiler.path}{compiler.elf2hex.cmd} {compiler.elf2h
 # AVR Uploader/Programmers tools
 # -------------------
 
-tools.avrdude.upload.cmd=avrdude
-tools.avrdude.upload.path={runtime.ide.path}/hardware/tools
-tools.avrdude.upload.config.path={upload.path}/avrdude.conf
+tools.avrdude.cmd=avrdude
+tools.avrdude.path={runtime.ide.path}/hardware/tools
+tools.avrdude.config.path={path}/avrdude.conf
+
 tools.avrdude.upload.params.verbose=-v -v -v -v
 tools.avrdude.upload.params.quiet=-q -q
-tools.avrdude.upload.pattern={upload.path}/{upload.cmd} -C{upload.config.path} {upload.verbose} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D -Uflash:w:{build.path}/{build.project_name}.hex:i
-
-# /home/megabug/git/ARM-merged/build/linux/work/hardware/tools/avrdude 
-# -C/home/megabug/git/ARM-merged/build/linux/work/hardware/tools/avrdude.conf 
-# -q -q 
-# -patmega328p 
-# -carduino 
-# -P/dev/ttyACM0 
-# -b115200 
-# -D 
-# -Uflash:w:/tmp/build366783256629686367.tmp/Blink.cpp.hex:i 
+tools.avrdude.upload.pattern={path}/{cmd} -C{config.path} {upload.verbose} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D -Uflash:w:{build.path}/{build.project_name}.hex:i
 
-tools.avrdude.program.cmd=avrdude
-tools.avrdude.program.path={runtime.ide.path}/hardware/tools
-tools.avrdude.program.config.path={program.path}/avrdude.conf
 tools.avrdude.program.params.verbose=-v -v -v -v
 tools.avrdude.program.params.quiet=-q -q
-tools.avrdude.program.pattern={program.path}/{program.cmd} -C{program.config.path} {program.verbose} -p{build.mcu} -c{protocol} {program.extra_params} -Uflash:w:{build.path}/{build.project_name}.hex:i
-
-# /home/megabug/git/ARM-merged/build/linux/work/hardware/tools/avrdude
-# -C/home/megabug/git/ARM-merged/build/linux/work/hardware/tools/avrdude.conf
-# -q -q
-# -patmega328p
-# -cusbasp
-# -Pusb
-# -Uflash:w:/tmp/build8190214930979711138.tmp/Blink.cpp.hex:i
+tools.avrdude.program.pattern={path}/{cmd} -C{config.path} {program.verbose} -p{build.mcu} -c{protocol} {program.extra_params} -Uflash:w:{build.path}/{build.project_name}.hex:i
 
+tools.avrdude.bootloader.params.verbose=-v -v -v -v
+tools.avrdude.bootloader.params.quiet=-q -q
+tools.avrdude.bootloader.pattern={path}/{cmd} -C{config.path} {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} {bootloader.params}
diff --git a/programmers.txt b/programmers.txt
index a055193..65d8cdb 100644
--- a/programmers.txt
+++ b/programmers.txt
@@ -29,7 +29,7 @@ parallel.protocol=dapa
 parallel.force=true
 # parallel.delay=200
 parallel.program.tool=avrdude
-parallel.program.extra_params=
+parallel.program.extra_params=-F
 
 arduinoisp.name=Arduino as ISP
 arduinoisp.communication=serial