Skip to content

Commit 8130671

Browse files
tekka007tbowmo
authored andcommitted
Update board defs to 1.0.5 (#10)
1 parent e1f853c commit 8130671

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

boards.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ mysensors_gw_native.build.variant=mysensors_gw
3838
mysensors_gw_native.build.variant_system_lib=
3939
mysensors_gw_native.build.vid=0x1209
4040
mysensors_gw_native.build.pid=0x6949
41-
mysensors_gw_native.build.arch=samd
41+
mysensors_gw_native.build.arch=SAMD
4242
mysensors_gw_native.bootloader.tool=openocd
4343
mysensors_gw_native.bootloader.file=mysensors_gw/samd21_sam_ba.bin

platform.txt

+6-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
2121

2222
name=Mysensors SAMD (32-bits ARM Cortex-M0+) Boards
23-
version=1.0.4
23+
version=1.0.5
2424

2525
# Compile variables
2626
# -----------------
@@ -64,7 +64,7 @@ compiler.S.extra_flags=
6464
compiler.ar.extra_flags=
6565
compiler.elf2hex.extra_flags=
6666

67-
compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0.path}/CMSIS/Device/ATMEL/"
67+
compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.1.0.path}/CMSIS/Device/ATMEL/"
6868
compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
6969

7070
# USB Flags
@@ -126,8 +126,7 @@ tools.avrdude.upload.params.quiet=-q -q
126126
tools.avrdude.upload.params.noverify=-V
127127
tools.avrdude.upload.pattern="{cmd}" "-C{config.path}" {upload.verbose} -p{build.emu.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
128128

129-
#temporary disabled remote upload
130-
tools.avrdude_remote.upload.pattern=/usr/bin/XXX-run-avrdude /tmp/sketch.hex
129+
tools.avrdude_remote.upload.pattern="openocd --version 2>&1 | grep 2016 && if opkg update; then opkg upgrade openocd; exit 1; else echo 'Please connect your board to the Internet in order to upgrade tools' >&2; exit 1; fi || /usr/bin/run-avrdude /tmp/sketch.hex"
131130

132131
#
133132
# BOSSA
@@ -146,7 +145,7 @@ tools.bossac_remote.upload.pattern=/usr/bin/run-bossac {upload.verbose} --port=t
146145
# OpenOCD sketch upload
147146
#
148147

149-
tools.openocd.path={runtime.tools.openocd-0.9.0-arduino.path}
148+
tools.openocd.path={runtime.tools.openocd-0.9.0-arduino5-static.path}
150149
tools.openocd.cmd=bin/openocd
151150
tools.openocd.cmd.windows=bin/openocd.exe
152151

@@ -172,7 +171,7 @@ tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/
172171
# FIXME: this programmer is a workaround for default options being overwritten by uploadUsingPreferences
173172
#
174173

175-
tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino.path}
174+
tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino5-static.path}
176175
tools.openocd-withbootsize.cmd=bin/openocd
177176
tools.openocd-withbootsize.cmd.windows=bin/openocd.exe
178177

@@ -191,4 +190,4 @@ tools.openocd-withbootsize.erase.pattern=
191190

192191
tools.openocd-withbootsize.bootloader.params.verbose=-d2
193192
tools.openocd-withbootsize.bootloader.params.quiet=-d0
194-
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
193+
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"

0 commit comments

Comments
 (0)