First attemp to generalize upload for mutiplatform IDE

1 files changed, 39 insertions, 5 deletions

diff --git a/platform.txt b/platform.txt
index fa3fdc3..59e2d16 100644
--- a/platform.txt
+++ b/platform.txt
@@ -26,22 +26,56 @@ compiler.upload.flags=
 # --------------------
 
 ## Compile c files
-recipe.c.o.pattern={compiler.path}{compiler.c.cmd} {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -D{software}={ide.version} {includes} {source_file} -o {object_file}
+recipe.c.o.pattern={compiler.path}{compiler.c.cmd} {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -D{software}={runtime.ide.version} {includes} {source_file} -o {object_file}
 
 ## Compile c++ files
-recipe.cpp.o.pattern={compiler.path}{compiler.cpp.cmd} {compiler.cpp.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -D{software}={ide.version} {includes} {source_file} -o {object_file}
+recipe.cpp.o.pattern={compiler.path}{compiler.cpp.cmd} {compiler.cpp.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -D{software}={runtime.ide.version} {includes} {source_file} -o {object_file}
 
 ## Create archives
 recipe.ar.pattern={compiler.path}{compiler.ar.cmd} {compiler.ar.flags} {build.path}/{archive_file} {object_file}
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern={compiler.path}{compiler.c.elf.cmd} {compiler.c.elf.flags} -mmcu={build.mcu} -o {build.path}/{project_name}.elf {object_files} {build.path}/{archive_file} -L{build.path} -lm
+recipe.c.combine.pattern={compiler.path}{compiler.c.elf.cmd} {compiler.c.elf.flags} -mmcu={build.mcu} -o {build.path}/{build.project_name}.elf {object_files} {build.path}/{archive_file} -L{build.path} -lm
 
 ## Create eeprom
-recipe.objcopy.eep.pattern={compiler.path}{compiler.objcopy.cmd} {compiler.objcopy.eep.flags} {build.path}/{project_name}.elf {build.path}/{project_name}.eep
+recipe.objcopy.eep.pattern={compiler.path}{compiler.objcopy.cmd} {compiler.objcopy.eep.flags} {build.path}/{build.project_name}.elf {build.path}/{build.project_name}.eep
 
 ## Create hex
-recipe.objcopy.hex.pattern={compiler.path}{compiler.elf2hex.cmd} {compiler.elf2hex.flags} {build.path}/{project_name}.elf {build.path}/{project_name}.hex
+recipe.objcopy.hex.pattern={compiler.path}{compiler.elf2hex.cmd} {compiler.elf2hex.flags} {build.path}/{build.project_name}.elf {build.path}/{build.project_name}.hex
 
 
+# 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.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.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