Merge branch 'release/v9.0.0'

valeros · valeros · commit 7e44f4369f50 · 2021-10-31T23:03:31.000+02:00
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, windows-2016, macos-latest]
+        os: [ubuntu-18.04, windows-2016, macos-latest]
         example:
           - "examples/arduino-blink"
           - "examples/arduino-ble-led"
diff --git a/boards/adafruit_clue_nrf52840.json b/boards/adafruit_clue_nrf52840.json
@@ -10,19 +10,15 @@
     "hwids": [
       [
         "0x239A",
-        "0x8072"
-      ],
-      [
-        "0x239A",
-        "0x0072"
+        "0x8071"
       ],
       [
         "0x239A",
         "0x0071"
       ],
       [
         "0x239A",
-        "0x8071"
+        "0x8072"
       ]
     ],
     "usb_product": "CLUE nRF52840",
diff --git a/boards/adafruit_cplaynrf52840.json b/boards/adafruit_cplaynrf52840.json
@@ -16,10 +16,6 @@
         "0x239A",
         "0x0045"
       ],
-      [
-        "0x239A",
-        "0x0046"
-      ],
       [
         "0x239A",
         "0x8046"
diff --git a/boards/adafruit_ledglasses_nrf52840.json b/boards/adafruit_ledglasses_nrf52840.json
@@ -0,0 +1,75 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_LED_GLASSES -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x810D"
+      ],
+      [
+        "0x239A",
+        "0x0029"
+      ],
+      [
+        "0x239A",
+        "0x010D"
+      ],
+      [
+        "0x239A",
+        "0x810E"
+      ]
+    ],
+    "usb_product": "Adafruit LED Glasses",
+    "mcu": "nrf52840",
+    "variant": "ledglasses_nrf52840",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "zephyr"
+  ],
+  "name": "Adafruit LED Glasses Driver nRF52840",
+  "upload": {
+    "maximum_ram_size": 237568,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil",
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
+    ],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.adafruit.com/product/5217",
+  "vendor": "Adafruit"
+}
diff --git a/boards/nicla_sense_me.json b/boards/nicla_sense_me.json
@@ -0,0 +1,58 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "linker_script.ld"
+    },
+    "core": "arduino",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NICLA -DARDUINO_ARCH_NRF52832",
+    "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0060"
+      ]
+    ],
+    "mcu": "nrf52832",
+    "variant": "NICLA"
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "default_tools": [
+      "cmsis-dap"
+    ],
+    "jlink_device": "nRF52832_xxAA",
+    "onboard_tools": [
+      "cmsis-dap"
+    ],
+    "svd_path": "nrf52.svd",
+    "openocd_target": "nrf52.cfg",
+    "openocd_extra_args": [
+      "-c",
+      "transport select swd;"
+    ]
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Arduino Nicla Sense ME",
+  "upload": {
+    "maximum_ram_size": 64288,
+    "maximum_size": 527616,
+    "protocol": "cmsis-dap",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil",
+      "cmsis-dap",
+      "sam-ba",
+      "blackmagic"
+    ],
+    "use_1200bps_touch": false,
+    "require_upload_port": true
+  },
+  "url": "https://docs.arduino.cc/hardware/nicla-sense-me",
+  "vendor": "Arduino"
+}
diff --git a/builder/frameworks/arduino b/builder/frameworks/arduino
@@ -1 +1 @@
-Subproject commit c9d58ac7759ff68f7d49ffdb6188433843bd5d15
+Subproject commit ea23841f141d09b89d0dc1828f65cee658753515
diff --git a/builder/main.py b/builder/main.py
@@ -109,7 +109,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         ),
         MergeHex=Builder(
             action=env.VerboseAction(" ".join([
-                join(platform.get_package_dir("tool-sreccat") or "",
+                '"%s"' % join(platform.get_package_dir("tool-sreccat") or "",
                      "srec_cat"),
                 "$SOFTDEVICEHEX",
                 "-intel",
@@ -130,7 +130,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         BUILDERS=dict(
             PackageDfu=Builder(
                 action=env.VerboseAction(" ".join([
-                    "$PYTHONEXE",
+                    '"$PYTHONEXE"',
                     '"%s"' % join(platform.get_package_dir(
                         "tool-adafruit-nrfutil") or "", "adafruit-nrfutil.py"),
                     "dfu",
@@ -149,8 +149,8 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
                 action=env.VerboseAction(
                     " ".join(
                         [
-                            "$PYTHONEXE",
-                            join(
+                            '"$PYTHONEXE"',
+                            '"%s"' % join(
                                 platform.get_package_dir(
                                     "framework-arduinoadafruitnrf52"
                                 )
diff --git a/examples/arduino-bluefruit-bleuart/platformio.ini b/examples/arduino-bluefruit-bleuart/platformio.ini
@@ -43,3 +43,8 @@ framework = arduino
 board = particle_xenon
 monitor_speed = 115200
 
+[env:adafruit_ledglasses_nrf52840]
+platform = nordicnrf52
+framework = arduino
+board = adafruit_ledglasses_nrf52840
+monitor_speed = 115200
diff --git a/examples/zephyr-net-echo-client/zephyr/boards/atsamr21_xpro.conf b/examples/zephyr-net-echo-client/zephyr/boards/atsamr21_xpro.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Gerson Fernando Budke
+# Copyright (c) 2020-2021, Gerson Fernando Budke
 # Copyright (c) 2019, Benjamin Valentin
 #
 # SPDX-License-Identifier: Apache-2.0
@@ -15,11 +15,11 @@ CONFIG_NET_PKT_TX_COUNT=6
 CONFIG_NET_BUF_RX_COUNT=6
 CONFIG_NET_BUF_TX_COUNT=6
 CONFIG_NET_MAX_CONTEXTS=4
-CONFIG_NET_MAX_CONN=2
-CONFIG_NET_MAX_ROUTES=2
-CONFIG_NET_MAX_NEXTHOPS=2
+CONFIG_NET_MAX_CONN=1
+CONFIG_NET_MAX_ROUTES=1
+CONFIG_NET_MAX_NEXTHOPS=1
 
 CONFIG_SHELL_STACK_SIZE=768
-CONFIG_SHELL_CMD_BUFF_SIZE=80
+CONFIG_SHELL_CMD_BUFF_SIZE=64
 CONFIG_SHELL_ARGC_MAX=6
 CONFIG_SHELL_HISTORY_BUFFER=64
diff --git a/examples/zephyr-net-echo-client/zephyr/overlay-ot.conf b/examples/zephyr-net-echo-client/zephyr/overlay-ot.conf
@@ -24,7 +24,7 @@ CONFIG_OPENTHREAD_L2_DEBUG=y
 CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
 
 CONFIG_OPENTHREAD_CHANNEL=26
-CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
+CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
 
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"
diff --git a/examples/zephyr-net-echo-client/zephyr/prj.conf b/examples/zephyr-net-echo-client/zephyr/prj.conf
@@ -46,3 +46,4 @@ CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"
 CONFIG_NET_CONFIG_NEED_IPV4=y
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1"
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nordicnrf52.git"
   },
-  "version": "8.3.0",
+  "version": "9.0.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinonordicnrf5",
@@ -56,7 +56,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.10000.0"
+      "version": "~1.10100.0"
     },
     "framework-arduinonordicnrf5": {
       "type": "framework",
@@ -68,7 +68,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.4.0"
+      "version": "~2.5.0"
     },
     "framework-cmsis": {
       "type": "framework",
@@ -80,7 +80,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.20600.0"
+      "version": "~2.20700.0"
     },
     "tool-adafruit-nrfutil": {
       "owner": "platformio",
@@ -95,7 +95,7 @@
       "type": "uploader",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.1000.0"
+      "version": "~2.1100.0"
     },
     "tool-nrfjprog": {
       "type": "uploader",
@@ -118,7 +118,7 @@
     "tool-cmake": {
       "optional": true,
       "owner": "platformio",
-      "version": "~3.16.0"
+      "version": "~3.21.0"
     },
     "tool-dtc": {
       "optional": true,
diff --git a/platform.py b/platform.py
@@ -59,7 +59,7 @@ def configure_default_packages(self, variables, targets):
                 if "windows" not in get_systype():
                     self.packages["tool-gperf"]["optional"] = False
 
-            if board == "nano33ble":
+            if board in ("nano33ble", "nicla_sense_me"):
                 self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0"
                 self.frameworks["arduino"]["package"] = "framework-arduino-mbed"
                 self.frameworks["arduino"][

Original file line number	Diff line number	Diff line change
`@@ -10,19 +10,15 @@`
`10`	`10`	`"hwids": [`
`11`	`11`	`[`
`12`	`12`	`"0x239A",`
`13`		`- "0x8072"`
`14`		`- ],`
`15`		`- [`
`16`		`- "0x239A",`
`17`		`- "0x0072"`
	`13`	`+ "0x8071"`
`18`	`14`	`],`
`19`	`15`	`[`
`20`	`16`	`"0x239A",`
`21`	`17`	`"0x0071"`
`22`	`18`	`],`
`23`	`19`	`[`
`24`	`20`	`"0x239A",`
`25`		`- "0x8071"`
	`21`	`+ "0x8072"`
`26`	`22`	`]`
`27`	`23`	`],`
`28`	`24`	`"usb_product": "CLUE nRF52840",`