diff --git a/boards.txt b/boards.txt index 048ca551d..76797dea7 100644 --- a/boards.txt +++ b/boards.txt @@ -871,4 +871,66 @@ giga.debug.server.openocd.scripts.1={programmer.transport_script} giga.debug.server.openocd.scripts.2=target/stm32h7x_dual_bank.cfg giga.debug.cortex-debug.custom.request=attach giga.menu.target_core.cm7.debug.svd_file={runtime.platform.path}/svd/STM32H747_CM7.svd -giga.menu.target_core.cm4.debug.svd_file={runtime.platform.path}/svd/STM32H747_CM4.svd \ No newline at end of file +giga.menu.target_core.cm4.debug.svd_file={runtime.platform.path}/svd/STM32H747_CM4.svd + +############################################################## + +stella.name=Arduino Stella +stella.build.core=arduino +stella.build.crossprefix=arm-none-eabi- +stella.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/ + +stella.build.variant=ARDUINO_NANO33BLE +stella.build.mcu=cortex-m4 +stella.build.extra_flags= +stella.build.architecture=cortex-m4 +stella.build.fpu=-mfpu=fpv4-sp-d16 +stella.build.float-abi=-mfloat-abi=softfp +stella.build.board=ARDUINO_NANO33BLE +stella.build.ldscript=linker_script.ld +stella.compiler.mbed.arch.define=-DARDUINO_ARCH_NRF52840 +stella.compiler.mbed.defines={build.variant.path}/defines.txt +stella.compiler.mbed.ldflags={build.variant.path}/ldflags.txt +stella.compiler.mbed.cflags={build.variant.path}/cflags.txt +stella.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt +stella.compiler.mbed.includes={build.variant.path}/includes.txt +stella.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys +stella.compiler.mbed="{build.variant.path}/libs/libmbed.a" "{build.variant.path}/libs/libcc_310_core.a" "{build.variant.path}/libs/libcc_310_ext.a" "{build.variant.path}/libs/libcc_310_trng.a" +stella.vid.0=0x2341 +stella.pid.0=0x005a +stella.vid.1=0x2341 +stella.pid.1=0x805a +stella.vid.2=0x2341 +stella.pid.2=0x015a +stella.vid.3=0x2341 +stella.pid.3=0x025a +stella.upload_port.0.vid=0x2341 +stella.upload_port.0.pid=0x005a +stella.upload_port.1.vid=0x2341 +stella.upload_port.1.pid=0x805a +stella.upload_port.2.vid=0x2341 +stella.upload_port.2.pid=0x015a +stella.upload_port.3.vid=0x2341 +stella.upload_port.3.pid=0x025a + +stella.upload.tool=bossac +stella.upload.tool.default=bossac +stella.upload.protocol= +stella.upload.transport= +stella.upload.use_1200bps_touch=true +stella.upload.wait_for_upload_port=true +stella.upload.native_usb=true +stella.upload.maximum_size=983040 +stella.upload.maximum_data_size=262144 + +stella.bootloader.tool=openocd +stella.bootloader.tool.default=openocd +stella.bootloader.extra_action.preflash=echo INFO:removed_mass-erase +stella.bootloader.config=-f target/nrf52.cfg +stella.bootloader.programmer=-f interface/cmsis-dap.cfg +stella.bootloader.file=nano33ble/bootloader.hex + +stella.debug.server.openocd.scripts.0=interface/{programmer.protocol}.cfg +stella.debug.server.openocd.scripts.1={programmer.transport_script} +stella.debug.server.openocd.scripts.2=target/nrf52.cfg +stella.debug.svd_file={runtime.platform.path}/svd/nrf52840.svd diff --git a/extras/mbed_edge-tag.template.json b/extras/mbed_edge-tag.template.json new file mode 100644 index 000000000..edbf719e8 --- /dev/null +++ b/extras/mbed_edge-tag.template.json @@ -0,0 +1,53 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS Edge Boards", + "architecture": "mbed_edge", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%EDGE_FILENAME%%", + "archiveFileName": "%%EDGE_FILENAME%%", + "checksum": "SHA-256:%%EDGE_CHECKSUM%%", + "size": "%%EDGE_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Arduino Edge Control" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "bossac", + "version": "1.9.1-arduino2" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + }, + { + "packager": "arduino", + "name": "rp2040tools", + "version": "1.0.6" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/extras/mbed_giga-tag.template.json b/extras/mbed_giga-tag.template.json new file mode 100644 index 000000000..a63c6576f --- /dev/null +++ b/extras/mbed_giga-tag.template.json @@ -0,0 +1,48 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS Giga Boards", + "architecture": "mbed_giga", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%GIGA_FILENAME%%", + "archiveFileName": "%%GIGA_FILENAME%%", + "checksum": "SHA-256:%%GIGA_CHECKSUM%%", + "size": "%%GIGA_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Arduino Giga" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "imgtool", + "version": "1.8.0-arduino.2" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + } + ] + } + ] + } + ] +} diff --git a/extras/mbed_nano-tag.template.json b/extras/mbed_nano-tag.template.json new file mode 100644 index 000000000..944622f48 --- /dev/null +++ b/extras/mbed_nano-tag.template.json @@ -0,0 +1,59 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS Nano Boards", + "architecture": "mbed_nano", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%NANO_FILENAME%%", + "archiveFileName": "%%NANO_FILENAME%%", + "checksum": "SHA-256:%%NANO_CHECKSUM%%", + "size": "%%NANO_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Arduino Nano 33 BLE" + }, + { + "name": "Arduino Nano 33 BLE Sense" + }, + { + "name": "Arduino Nano RP2040 Connect" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "bossac", + "version": "1.9.1-arduino2" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + }, + { + "packager": "arduino", + "name": "rp2040tools", + "version": "1.0.6" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/extras/mbed_nicla-tag.template.json b/extras/mbed_nicla-tag.template.json new file mode 100644 index 000000000..4cffeb9c5 --- /dev/null +++ b/extras/mbed_nicla-tag.template.json @@ -0,0 +1,59 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS Nicla Boards", + "architecture": "mbed_nicla", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%NICLA_FILENAME%%", + "archiveFileName": "%%NICLA_FILENAME%%", + "checksum": "SHA-256:%%NICLA_CHECKSUM%%", + "size": "%%NICLA_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Nicla Sense ME" + }, + { + "name": "Nicla Voice" + }, + { + "name": "Nicla Vision" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "bossac", + "version": "1.9.1-arduino2" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + }, + { + "packager": "arduino", + "name": "rp2040tools", + "version": "1.0.6" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/extras/mbed_opta-tag.template.json b/extras/mbed_opta-tag.template.json new file mode 100644 index 000000000..d76b89e49 --- /dev/null +++ b/extras/mbed_opta-tag.template.json @@ -0,0 +1,48 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS Opta Boards", + "architecture": "mbed_opta", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%OPTA_FILENAME%%", + "archiveFileName": "%%OPTA_FILENAME%%", + "checksum": "SHA-256:%%OPTA_CHECKSUM%%", + "size": "%%OPTA_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Arduino Finder Opta" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "imgtool", + "version": "1.8.0-arduino.2" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/extras/mbed_portenta-tag.template.json b/extras/mbed_portenta-tag.template.json new file mode 100644 index 000000000..e73501f94 --- /dev/null +++ b/extras/mbed_portenta-tag.template.json @@ -0,0 +1,56 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS Portenta Boards", + "architecture": "mbed_portenta", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%PORTENTA_FILENAME%%", + "archiveFileName": "%%PORTENTA_FILENAME%%", + "checksum": "SHA-256:%%PORTENTA_CHECKSUM%%", + "size": "%%PORTENTA_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Arduino Portenta H7" + }, + { + "name": "Arduino Portenta X8" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "adb", + "version": "32.0.0" + }, + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "imgtool", + "version": "1.8.0-arduino.2" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/extras/mbed_rp2040-tag.template.json b/extras/mbed_rp2040-tag.template.json new file mode 100644 index 000000000..424ffe18c --- /dev/null +++ b/extras/mbed_rp2040-tag.template.json @@ -0,0 +1,53 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS RP2040 Boards", + "architecture": "mbed_rp2040", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%RP2040_FILENAME%%", + "archiveFileName": "%%RP2040_FILENAME%%", + "checksum": "SHA-256:%%RP2040_CHECKSUM%%", + "size": "%%RP2040_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Raspberry Pi Pico" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "bossac", + "version": "1.9.1-arduino2" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + }, + { + "packager": "arduino", + "name": "rp2040tools", + "version": "1.0.6" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/extras/mbed_stella-tag.template.json b/extras/mbed_stella-tag.template.json new file mode 100644 index 000000000..d54eef818 --- /dev/null +++ b/extras/mbed_stella-tag.template.json @@ -0,0 +1,53 @@ +{ + "packages": [ + { + "platforms": [ + { + "name": "Arduino Mbed OS Stella Boards", + "architecture": "mbed_stella", + "version": "%%VERSION%%", + "category": "Arduino", + "url": "http://downloads.arduino.cc/cores/staging/%%STELLA_FILENAME%%", + "archiveFileName": "%%STELLA_FILENAME%%", + "checksum": "SHA-256:%%STELLA_CHECKSUM%%", + "size": "%%STELLA_SIZE%%", + "help": { + "online": "https://github.com/arduino/ArduinoCore-mbed/issues" + }, + "boards": [ + { + "name": "Arduino Stella" + } + ], + "toolsDependencies": [ + { + "packager": "arduino", + "name": "arm-none-eabi-gcc", + "version": "7-2017q4" + }, + { + "packager": "arduino", + "name": "bossac", + "version": "1.9.1-arduino2" + }, + { + "packager": "arduino", + "name": "dfu-util", + "version": "0.10.0-arduino1" + }, + { + "packager": "arduino", + "name": "openocd", + "version": "0.11.0-arduino2" + }, + { + "packager": "arduino", + "name": "rp2040tools", + "version": "1.0.6" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/extras/package_index.json.NewTag.template b/extras/package_index.json.NewTag.template deleted file mode 100644 index df360e171..000000000 --- a/extras/package_index.json.NewTag.template +++ /dev/null @@ -1,408 +0,0 @@ -{ - "packages": [ - { - "name": "arduino", - "maintainer": "Arduino", - "websiteURL": "http://www.arduino.cc/", - "email": "packages@arduino.cc", - "help": { - "online": "http://www.arduino.cc/en/Reference/HomePage" - }, - "platforms": [ - { - "name": "[DEPRECATED - Please install standalone packages] Arduino Mbed OS Boards", - "architecture": "mbed", - "version": "%%VERSION%%", - "deprecated": true, - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%FILENAME%%", - "archiveFileName": "%%FILENAME%%", - "checksum": "SHA-256:%%CHECKSUM%%", - "size": "%%SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Arduino Nano 33 BLE" - }, - { - "name": "Arduino Nano 33 BLE Sense" - }, - { - "name": "Arduino Nano RP2040 Connect" - }, - { - "name": "Arduino Portenta H7" - }, - { - "name": "Arduino Edge Control" - }, - { - "name": "Raspberry Pi Pico" - }, - { - "name": "Nicla Sense ME" - }, - { - "name": "Arduino Nicla Vision" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "name": "bossac", - "version": "1.9.1-arduino2" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.0.6", - "name": "rp2040tools" - }, - { - "packager": "arduino", - "version": "1.8.0-arduino.2", - "name": "imgtool" - } - ] - }, - { - "name": "Arduino Mbed OS Edge Boards", - "architecture": "mbed_edge", - "version": "%%VERSION%%", - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%EDGE_FILENAME%%", - "archiveFileName": "%%EDGE_FILENAME%%", - "checksum": "SHA-256:%%EDGE_CHECKSUM%%", - "size": "%%EDGE_SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Arduino Edge Control" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "name": "bossac", - "version": "1.9.1-arduino2" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.0.6", - "name": "rp2040tools" - } - ] - }, - { - "name": "Arduino Mbed OS Nano Boards", - "architecture": "mbed_nano", - "version": "%%VERSION%%", - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%NANO_FILENAME%%", - "archiveFileName": "%%NANO_FILENAME%%", - "checksum": "SHA-256:%%NANO_CHECKSUM%%", - "size": "%%NANO_SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Arduino Nano 33 BLE" - }, - { - "name": "Arduino Nano 33 BLE Sense" - }, - { - "name": "Arduino Nano RP2040 Connect" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "name": "bossac", - "version": "1.9.1-arduino2" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.0.6", - "name": "rp2040tools" - } - ] - }, - { - "name": "Arduino Mbed OS Portenta Boards", - "architecture": "mbed_portenta", - "version": "%%VERSION%%", - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%PORTENTA_FILENAME%%", - "archiveFileName": "%%PORTENTA_FILENAME%%", - "checksum": "SHA-256:%%PORTENTA_CHECKSUM%%", - "size": "%%PORTENTA_SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Arduino Portenta H7" - }, - { - "name": "Arduino Portenta X8" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.8.0-arduino.2", - "name": "imgtool" - }, - { - "packager": "arduino", - "version": "32.0.0", - "name": "adb" - } - ] - }, - { - "name": "Arduino Mbed OS RP2040 Boards", - "architecture": "mbed_rp2040", - "version": "%%VERSION%%", - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%RP2040_FILENAME%%", - "archiveFileName": "%%RP2040_FILENAME%%", - "checksum": "SHA-256:%%RP2040_CHECKSUM%%", - "size": "%%RP2040_SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Raspberry Pi Pico" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "name": "bossac", - "version": "1.9.1-arduino2" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.0.6", - "name": "rp2040tools" - } - ] - }, - { - "name": "Arduino Mbed OS Nicla Boards", - "architecture": "mbed_nicla", - "version": "%%VERSION%%", - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%NICLA_FILENAME%%", - "archiveFileName": "%%NICLA_FILENAME%%", - "checksum": "SHA-256:%%NICLA_CHECKSUM%%", - "size": "%%NICLA_SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Nicla Sense ME" - }, - { - "name": "Nicla Voice" - }, - { - "name": "Nicla Vision" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "name": "bossac", - "version": "1.9.1-arduino2" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.0.6", - "name": "rp2040tools" - } - ] - }, - { - "name": "Arduino Mbed OS Opta Boards", - "architecture": "mbed_opta", - "version": "%%VERSION%%", - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%OPTA_FILENAME%%", - "archiveFileName": "%%OPTA_FILENAME%%", - "checksum": "SHA-256:%%OPTA_CHECKSUM%%", - "size": "%%OPTA_SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Arduino Finder Opta" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.8.0-arduino.2", - "name": "imgtool" - } - ] - }, - { - "name": "Arduino Mbed OS Giga Boards", - "architecture": "mbed_giga", - "version": "%%VERSION%%", - "category": "Arduino", - "url": "http://downloads.arduino.cc/cores/staging/%%GIGA_FILENAME%%", - "archiveFileName": "%%GIGA_FILENAME%%", - "checksum": "SHA-256:%%GIGA_CHECKSUM%%", - "size": "%%GIGA_SIZE%%", - "help": { - "online": "https://github.com/arduino/ArduinoCore-mbed/issues" - }, - "boards": [ - { - "name": "Arduino Giga" - } - ], - "toolsDependencies": [ - { - "packager": "arduino", - "name": "openocd", - "version": "0.11.0-arduino2" - }, - { - "packager": "arduino", - "name": "arm-none-eabi-gcc", - "version": "7-2017q4" - }, - { - "packager": "arduino", - "version": "0.10.0-arduino1", - "name": "dfu-util" - }, - { - "packager": "arduino", - "version": "1.8.0-arduino.2", - "name": "imgtool" - } - ] - } - ], - "tools": [] - } - ] -} diff --git a/libraries/STM32H747_System/examples/QSPIFormat/QSPIFormat.ino b/libraries/STM32H747_System/examples/QSPIFormat/QSPIFormat.ino index a30762511..7aba71d8c 100644 --- a/libraries/STM32H747_System/examples/QSPIFormat/QSPIFormat.ino +++ b/libraries/STM32H747_System/examples/QSPIFormat/QSPIFormat.ino @@ -171,20 +171,20 @@ extern const unsigned char wifi_firmware_image_data[]; void flashWiFiFirmwareAndCertificates() { FILE* fp = fopen("/wlan/4343WA1.BIN", "wb"); - uint32_t chunck_size = 1024; + uint32_t chunk_size = 1024; uint32_t byte_count = 0; Serial.println("Flashing WiFi firmware"); printProgress(byte_count, file_size, 10, true); while (byte_count < file_size) { - if(byte_count + chunck_size > file_size) - chunck_size = file_size - byte_count; - int ret = fwrite(&wifi_firmware_image_data[byte_count], chunck_size, 1, fp); + if(byte_count + chunk_size > file_size) + chunk_size = file_size - byte_count; + int ret = fwrite(&wifi_firmware_image_data[byte_count], chunk_size, 1, fp); if (ret != 1) { Serial.println("Error writing firmware data"); break; } - byte_count += chunck_size; + byte_count += chunk_size; printProgress(byte_count, file_size, 10, false); } fclose(fp); @@ -192,39 +192,39 @@ void flashWiFiFirmwareAndCertificates() { fp = fopen("/wlan/cacert.pem", "wb"); Serial.println("Flashing certificates"); - chunck_size = 128; + chunk_size = 128; byte_count = 0; printProgress(byte_count, cacert_pem_len, 10, true); while (byte_count < cacert_pem_len) { - if(byte_count + chunck_size > cacert_pem_len) - chunck_size = cacert_pem_len - byte_count; - int ret = fwrite(&cacert_pem[byte_count], chunck_size, 1 ,fp); + if(byte_count + chunk_size > cacert_pem_len) + chunk_size = cacert_pem_len - byte_count; + int ret = fwrite(&cacert_pem[byte_count], chunk_size, 1 ,fp); if (ret != 1) { Serial.println("Error writing certificates"); break; } - byte_count += chunck_size; + byte_count += chunk_size; printProgress(byte_count, cacert_pem_len, 10, false); } fclose(fp); } void flashWiFiFirmwareMapped() { - uint32_t chunck_size = 1024; + uint32_t chunk_size = 1024; uint32_t byte_count = 0; const uint32_t offset = 15 * 1024 * 1024 + 1024 * 512; Serial.println("Flashing memory mapped WiFi firmware"); printProgress(byte_count, file_size, 10, true); while (byte_count < file_size) { - if (byte_count + chunck_size > file_size) - chunck_size = file_size - byte_count; - int ret = root->program(wifi_firmware_image_data, offset + byte_count, chunck_size); + if (byte_count + chunk_size > file_size) + chunk_size = file_size - byte_count; + int ret = root->program(wifi_firmware_image_data, offset + byte_count, chunk_size); if (ret != 0) { Serial.println("Error writing memory mapped firmware"); break; } - byte_count += chunck_size; + byte_count += chunk_size; printProgress(byte_count, file_size, 10, false); } } diff --git a/package.sh b/package.sh index 3d89d8155..ded181efc 100755 --- a/package.sh +++ b/package.sh @@ -73,10 +73,19 @@ BASE_FOLDER=`basename $PWD` #Package! (remove .git, patches folders) cd .. tar --exclude='*.git*' --exclude='*patches*' -cjhf ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 $BASE_FOLDER -if [ x$FLAVOUR == x ]; then -mv ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 ArduinoCore-mbed-$VERSION.tar.bz2 -echo FILENAME=ArduinoCore-mbed-$VERSION.tar.bz2 > /tmp/env -else -echo FILENAME=ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 > /tmp/env -fi + +# Create JSON file for the package +FILENAME=ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 +CHKSUM=`sha256sum $FILENAME | awk '{ print $1 }'` +SIZE=`wc -c $FILENAME | awk '{ print $1 }'` +FLAVOUR_TAG=${FLAVOUR^^}_ +FLAVOUR_NAME=${FLAVOUR,,} +VERSION_NAME=${VERSION//./-} + +cat ArduinoCore-mbed/extras/mbed_$FLAVOUR_NAME-tag.template.json | +sed "s/%%VERSION%%/${VERSION}/" | +sed "s/%%${FLAVOUR_TAG}FILENAME%%/${FILENAME}/" | +sed "s/%%${FLAVOUR_TAG}CHECKSUM%%/${CHKSUM}/" | +sed "s/%%${FLAVOUR_TAG}SIZE%%/${SIZE}/" > mbed_$FLAVOUR_NAME-$VERSION_NAME.json + cd - diff --git a/package_full.sh b/package_full.sh index 6e1405428..476f1c425 100755 --- a/package_full.sh +++ b/package_full.sh @@ -3,8 +3,6 @@ export VERSION="4.3.1" FLAVOURS=`ls *.variables` -cp extras/package_index.json.NewTag.template /tmp/json - for flavour in $FLAVOURS; do # Hack, clean everything from known positions and restart @@ -17,32 +15,4 @@ git clone git@github.com:arduino/ArduinoCore-API.git ../api/ ln -s ../../../api/api cores/arduino/api ./package.sh $flavour -echo "Creating json" - -source /tmp/env -CHKSUM=`sha256sum ../$FILENAME | awk '{ print $1 }'` -SIZE=`wc -c ../$FILENAME | awk '{ print $1 }'` -source ${flavour} - -FLAVOUR=${FLAVOUR^^} - -if [ x$FLAVOUR != x ]; then -FLAVOUR=${FLAVOUR}_ -fi - -echo FILENAME=$FILENAME -echo CHKSUM=$CHKSUM -echo SIZE=$SIZE -echo VERSION=$VERSION -echo FLAVOUR=$FLAVOUR - -cat /tmp/json | -sed "s/%%VERSION%%/${VERSION}/" | -sed "s/%%${FLAVOUR}FILENAME%%/${FILENAME}/" | -sed "s/%%${FLAVOUR}CHECKSUM%%/${CHKSUM}/" | -sed "s/%%${FLAVOUR}SIZE%%/${SIZE}/" > /tmp/json2 -mv /tmp/json2 /tmp/json - done - -cp /tmp/json package_${CORE_NAME}_${VERSION}_index.json diff --git a/stella.variables b/stella.variables new file mode 100644 index 000000000..12b0b3df9 --- /dev/null +++ b/stella.variables @@ -0,0 +1,5 @@ +export FLAVOUR="stella" +export VARIANTS=("ARDUINO_NANO33BLE") +export FQBNS=("stella") +export LIBRARIES=("PDM SPI Wire MRI USBHID USBMIDI USBMSD ThreadDebug Scheduler SFU Nano33BLE_System SocketWrapper MLC") +export BOOTLOADERS=("nano33ble")