Merge branch 'release/v4.2.0'

platformio · Mar 25, 2020 · 84ec245 · 84ec245
2 parents d09fb5a + d37e06e
commit 84ec245
Show file tree

Hide file tree

Showing 23 changed files with 890 additions and 223 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ python:
 
 env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-blink
+  - PLATFORMIO_PROJECT_DIR=examples/arduino-briki-internal-libs
   - PLATFORMIO_PROJECT_DIR=examples/arduino-external-libs
   - PLATFORMIO_PROJECT_DIR=examples/arduino-internal-libs
   - PLATFORMIO_PROJECT_DIR=examples/arduino-web-thing-led

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,6 +3,7 @@ environment:
 
   matrix:
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-blink"
+    - PLATFORMIO_PROJECT_DIR: "examples/arduino-briki-internal-libs"
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-external-libs"
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-internal-libs"
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-web-thing-led"

diff --git a/boards/adafruit_crickit_m0.json b/boards/adafruit_crickit_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_CRICKIT_M0 -DADAFRUIT_CRICKIT_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_CRICKIT_M0 -DADAFRUIT_CRICKIT_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__ -DCRYSTALLESS",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_trellis_m4.json b/boards/adafruit_trellis_m4.json
@@ -14,7 +14,8 @@
       "-D__FPU_PRESENT",
       "-DARM_MATH_CM4",
       "-DENABLE_CACHE",
-      "-DVARIANT_QSPI_BAUD_DEFAULT=50000000"
+      "-DVARIANT_QSPI_BAUD_DEFAULT=50000000",
+      "-DCRYSTALLESS"
     ],
     "f_cpu": "120000000L",
     "hwids": [

diff --git a/boards/briki_abc_samd21.json b/boards/briki_abc_samd21.json
@@ -0,0 +1,60 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "flash_with_bootloader.ld"
+    },
+    "core": "mbcwb",
+    "cpu": "cortex-m0plus",
+    "board": "briki_abc_samd21",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DBRIKI_ABC -DBRIKI_MBC_WB_SAMD -w",
+    "f_cpu": "48000000L",
+    "hwids": [
+      [
+        "0x3112",
+        "0x0001"
+      ],
+      [
+        "0x3112",
+        "0x0002"
+      ]
+    ],
+    "system": "samd",
+    "mcu": "samd21g18a",
+    "usb_product": "Briki",
+    "variant": "briki_mbcwb_samd21"
+  },
+  "bootloader": {
+    "tool": "openocd",
+    "file": "briki_mbc-wb/samd21_sam_ba.hex"
+  },
+  "debug": {
+    "jlink_device": "ATSAMD21G18",
+    "openocd_chipname": "at91samd21g18",
+    "openocd_target": "at91samdXX",
+    "svd_path": "ATSAMD21G18A.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Briki ABC (MBC-WB) - Samd21",
+  "upload": {
+    "disable_flushing": true,
+    "maximum_ram_size": 32768,
+    "maximum_size": 262144,
+    "protocol": "mbctool",
+    "protocols": [
+      "sam-ba",
+      "stk500v2",
+      "blackmagic",
+      "jlink",
+      "atmel-ice",
+      "mbctool"
+    ],
+    "require_upload_port": true,
+    "speed": 57600,
+    "wait_for_upload_port": true,
+    "native_usb": true
+  },
+  "url": "http://briki.org",
+  "vendor": "meteca"
+}
diff --git a/boards/briki_mbcwb_samd21.json b/boards/briki_mbcwb_samd21.json
@@ -0,0 +1,60 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "flash_with_bootloader.ld"
+    },
+    "core": "mbcwb",
+    "cpu": "cortex-m0plus",
+    "board": "briki_mbcwb_samd21",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DBRIKI_MBC_WB -DBRIKI_MBC_WB_SAMD -w",
+    "f_cpu": "48000000L",
+    "hwids": [
+      [
+        "0x3112",
+        "0x0001"
+      ],
+      [
+        "0x3112",
+        "0x0002"
+      ]
+    ],
+    "system": "samd",
+    "mcu": "samd21g18a",
+    "usb_product": "Briki",
+    "variant": "briki_mbcwb_samd21"
+  },
+  "bootloader": {
+    "tool": "openocd",
+    "file": "briki_mbc-wb/samd21_sam_ba.hex"
+  },
+  "debug": {
+    "jlink_device": "ATSAMD21G18",
+    "openocd_chipname": "at91samd21g18",
+    "openocd_target": "at91samdXX",
+    "svd_path": "ATSAMD21G18A.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Briki MBC-WB - Samd21",
+  "upload": {
+    "disable_flushing": true,
+    "maximum_ram_size": 32768,
+    "maximum_size": 262144,
+    "protocol": "mbctool",
+    "protocols": [
+      "sam-ba",
+      "stk500v2",
+      "blackmagic",
+      "jlink",
+      "atmel-ice",
+      "mbctool"
+    ],
+    "require_upload_port": true,
+    "speed": 57600,
+    "wait_for_upload_port": true,
+    "native_usb": true
+  },
+  "url": "http://briki.org",
+  "vendor": "meteca"
+}
diff --git a/boards/current_ranger.json b/boards/current_ranger.json
@@ -5,7 +5,7 @@
     },
     "core": "moteino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DVERY_LOW_POWER",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DVERY_LOW_POWER -DCRYSTALLESS",
     "f_cpu": "48000000L",
     "hwids": [
       [
@@ -19,7 +19,7 @@
     ],
     "mcu": "samd21g18a",
     "usb_product": "LowPowerLab CurrentRanger",
-    "variant": "current_ranger"
+    "variant": "currentranger_m0"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/moteino_zero.json b/boards/moteino_zero.json
@@ -19,7 +19,7 @@
     ],
     "mcu": "samd21g18a",
     "usb_product": "LowPowerLab Moteino M0",
-    "variant": "moteino_zero"
+    "variant": "moteino_m0"
   },
   "debug": {
     "jlink_device": "ATSAMD21G18",