Skip to content

Commit

Permalink
Merge branch 'release/v1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Nov 18, 2016
2 parents 5f30b0b + 883eb69 commit 751a172
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 8 deletions.
37 changes: 37 additions & 0 deletions boards/sodaq_autonomo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"build": {
"core": "arduino_zero",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_AUTONOMO",
"f_cpu": "48000000L",
"hwids": [
[
"0x2341",
"0x804d"
],
[
"0x2341",
"0x004d"
]
],
"ldscript": "flash_with_bootloader.ld",
"mcu": "samd21j18a",
"usb_product": "SODAQ Autonomo",
"variant": "sodaq_autonomo"
},
"frameworks": [
"arduino"
],
"name": "SODAQ Autonomo",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 32768,
"maximum_size": 262144,
"protocol": "sam-ba",
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
},
"url": "http://support.sodaq.com/sodaq-one/autonomо/getting-started-autonomo/",
"vendor": "SODAQ"
}
37 changes: 37 additions & 0 deletions boards/sodaq_explorer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"build": {
"core": "arduino_zero",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_EXPLORER",
"f_cpu": "48000000L",
"hwids": [
[
"0x2341",
"0x804d"
],
[
"0x2341",
"0x004d"
]
],
"ldscript": "flash_with_bootloader.ld",
"mcu": "samd21j18a",
"usb_product": "SODAQ ExpLoRer",
"variant": "sodaq_explorer"
},
"frameworks": [
"arduino"
],
"name": "SODAQ ExpLoRer",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 32768,
"maximum_size": 262144,
"protocol": "sam-ba",
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
},
"url": "http://support.sodaq.com/sodaq-one/explorer/",
"vendor": "SODAQ"
}
37 changes: 37 additions & 0 deletions boards/sodaq_one.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"build": {
"core": "arduino_zero",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21G18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_ONE",
"f_cpu": "48000000L",
"hwids": [
[
"0x2341",
"0x804d"
],
[
"0x2341",
"0x004d"
]
],
"ldscript": "flash_with_bootloader.ld",
"mcu": "samd21g18a",
"usb_product": "SODAQ ONE",
"variant": "sodaq_one"
},
"frameworks": [
"arduino"
],
"name": "SODAQ ONE",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 32768,
"maximum_size": 262144,
"protocol": "sam-ba",
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
},
"url": "http://support.sodaq.com/sodaq-one/",
"vendor": "SODAQ"
}
37 changes: 37 additions & 0 deletions boards/sodaq_wdt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"build": {
"core": "arduino_zero",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_WDT",
"f_cpu": "48000000L",
"hwids": [
[
"0x2341",
"0x804d"
],
[
"0x2341",
"0x004d"
]
],
"ldscript": "flash_with_bootloader.ld",
"mcu": "samd21j18a",
"usb_product": "SODAQ WDT",
"variant": "sodaq_wdt"
},
"frameworks": [
"arduino"
],
"name": "SODAQ WDT",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 32768,
"maximum_size": 262144,
"protocol": "sam-ba",
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
},
"url": "http://support.sodaq.com/",
"vendor": "SODAQ"
}
2 changes: 1 addition & 1 deletion builder/frameworks/mbed
Submodule mbed updated 1 files
+2 −1 mbed.py
8 changes: 4 additions & 4 deletions builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)

AlwaysBuild(env.Alias("nobuild", target_firm))
target_buildprog = env.Alias("buildprog", target_firm)
target_buildprog = env.Alias("buildprog", target_firm, target_firm)

#
# Target: Print binary size
Expand All @@ -278,14 +278,14 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
#

if upload_protocol == "openocd":
target_upload = env.Alias("upload", target_firm,
env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE"))
target_upload = env.Alias(
"upload", target_firm,
env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE"))
else:
target_upload = env.Alias(
"upload", target_firm,
[env.VerboseAction(BeforeUpload, "Looking for upload port..."),
env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")])

AlwaysBuild(target_upload)

#
Expand Down
6 changes: 3 additions & 3 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-atmelsam.git"
},
"version": "1.1.0",
"version": "1.2.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
Expand Down Expand Up @@ -47,7 +47,7 @@
"framework-mbed": {
"type": "framework",
"optional": true,
"version": "~3.126.0"
"version": "~3.127.0"
},
"framework-simba": {
"type": "framework",
Expand All @@ -57,7 +57,7 @@
"tool-avrdude": {
"type": "uploader",
"optional": true,
"version": "~1.60001.0"
"version": "~1.60300.0"
},
"tool-bossac": {
"type": "uploader",
Expand Down

0 comments on commit 751a172

Please sign in to comment.