Skip to content

Commit

Permalink
Merge branch 'release/v6.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Jun 29, 2021
2 parents 54c8a13 + 0a521be commit 08922c8
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 10 deletions.
2 changes: 1 addition & 1 deletion boards/sodaq_autonomo.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"core": "sodaq",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21J18A__ -DARDUINO_SODAQ_AUTONOMO",
"extra_flags": "-DVERY_LOW_POWER -D__SAMD21J18A__ -DARDUINO_SODAQ_AUTONOMO",
"f_cpu": "48000000L",
"hwids": [
[
Expand Down
2 changes: 1 addition & 1 deletion boards/sodaq_explorer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"core": "sodaq",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21J18A__ -DARDUINO_SODAQ_EXPLORER",
"extra_flags": "-DVERY_LOW_POWER -D__SAMD21J18A__ -DARDUINO_SODAQ_EXPLORER",
"f_cpu": "48000000L",
"hwids": [
[
Expand Down
2 changes: 1 addition & 1 deletion boards/sodaq_one.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"core": "sodaq",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21G18A__ -DARDUINO_SODAQ_ONE",
"extra_flags": "-DVERY_LOW_POWER -D__SAMD21G18A__ -DARDUINO_SODAQ_ONE",
"f_cpu": "48000000L",
"hwids": [
[
Expand Down
2 changes: 1 addition & 1 deletion boards/sodaq_sara.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"core": "sodaq",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21J18A__ -DARDUINO_SODAQ_SARA",
"extra_flags": "-DVERY_LOW_POWER -D__SAMD21J18A__ -DARDUINO_SODAQ_SARA",
"f_cpu": "48000000L",
"hwids": [
[
Expand Down
2 changes: 1 addition & 1 deletion boards/sodaq_sff.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"core": "sodaq",
"cpu": "cortex-m0plus",
"extra_flags": "-D__SAMD21G18A__ -DARDUINO_SODAQ_SFF",
"extra_flags": "-DVERY_LOW_POWER -D__SAMD21G18A__ -DARDUINO_SODAQ_SFF",
"f_cpu": "48000000L",
"hwids": [
[
Expand Down
59 changes: 59 additions & 0 deletions boards/sparkfun_samd51_micromod.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"build": {
"arduino": {
"ldscript": "flash_with_bootloader.ld"
},
"core": "sparkfun",
"cpu": "cortex-m4",
"extra_flags": [
"-DARDUINO_SAMD51_MICROMOD",
"-D__SAMD51J20A__",
"-D__SAMD51__",
"-D__FPU_PRESENT",
"-DARM_MATH_CM4"
],
"f_cpu": "120000000L",
"hwids": [
[
"0x1B4F",
"0x0020"
],
[
"0x1B4F",
"0xF020"
]
],
"mcu": "samd51j20a",
"system": "samd",
"usb_product": "SparkFun SAMD51 MicroMod",
"variant": "SparkFun_SAMD51_MicroMod"
},
"debug": {
"jlink_device": "ATSAMD51J20",
"openocd_chipname": "at91samd51j20",
"openocd_target": "atsame5x",
"svd_path": "ATSAMD51J20A.svd"
},
"frameworks": [
"arduino"
],
"name": "SparkFun SAMD51 MicroMod",
"upload": {
"disable_flushing": true,
"maximum_ram_size": 196608,
"maximum_size": 507904,
"native_usb": true,
"offset_address": "0x4000",
"protocol": "sam-ba",
"protocols": [
"sam-ba",
"jlink",
"atmel-ice"
],
"require_upload_port": true,
"use_1200bps_touch": true,
"wait_for_upload_port": true
},
"url": "https://www.sparkfun.com/products/16791",
"vendor": "SparkFun"
}
8 changes: 4 additions & 4 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-atmelsam.git"
},
"version": "6.1.0",
"version": "6.2.0",
"frameworks": {
"arduino": {
"package": "framework-arduino-sam",
Expand Down Expand Up @@ -79,7 +79,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.5.0"
"version": "~1.6.3"
},
"framework-arduino-samd-reprap": {
"type": "framework",
Expand All @@ -91,13 +91,13 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.6.20"
"version": "~1.8.6"
},
"framework-arduino-samd-sparkfun": {
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.7.5"
"version": "~1.8.3"
},
"framework-arduino-samd-tuino0": {
"type": "framework",
Expand Down
2 changes: 1 addition & 1 deletion platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def configure_default_packages(self, variables, targets):
self.packages[framework_package]["optional"] = False
self.packages["framework-cmsis"]["optional"] = False
self.packages["framework-cmsis-atmel"]["optional"] = False
if build_core in ("sodaq", "tuino0", "reprap"):
if build_core in ("tuino0", "reprap"):
self.packages["framework-cmsis-atmel"]["version"] = "~1.1.0"
if build_core == "adafruit":
self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.90301.0"
Expand Down

0 comments on commit 08922c8

Please sign in to comment.