Merge branch 'release/v6.0.0'

boards/bbcmicrobit_v2.json

@@ -0,0 +1,46 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "nrf52833_xxaa.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_BBC_MICROBIT_V2 -DNRF52833_XXAA",
+    "f_cpu": "64000000L",
+    "mcu": "nrf52833",
+    "variant": "BBCmicrobitV2"
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "onboard_tools": [
+      "cmsis-dap"
+    ],
+    "svd_path": "nrf52.svd",
+    "openocd_extra_args": [
+      "-c",
+      "transport select swd;"
+    ],
+    "jlink_device": "nRF52833_xxAA"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "BBC micro:bit V2",
+  "upload": {
+    "maximum_ram_size": 65536,
+    "maximum_size": 524288,
+    "protocol": "cmsis-dap",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "stlink",
+      "blackmagic",
+      "cmsis-dap",
+      "mbed"
+    ]
+  },
+  "url": "https://microbit.org/new-microbit/",
+  "vendor": "BBC"
+}

boards/dwm1001_dev.json

@@ -0,0 +1,46 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "nrf52_xxaa.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_DWM1001_DEV",
+    "f_cpu": "64000000L",
+    "mcu": "nrf52832",
+    "variant": "DWM1001-DEV"
+
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "default_tools": [
+      "jlink"
+    ],
+    "jlink_device": "nRF52832_xxAA",
+    "onboard_tools": [
+      "jlink"
+    ],
+    "svd_path": "nrf52.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "decaWave DWM1001 Module Development Board",
+  "upload": {
+    "maximum_ram_size": 65536,
+    "maximum_size": 524288,
+    "protocol": "jlink",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "stlink",
+      "blackmagic",
+      "cmsis-dap",
+      "mbed"
+    ]
+  },
+  "url": "https://www.decawave.com/product/dwm1001-development-board/",
+  "vendor": "decaWave"
+}

boards/raytac_mdbt50q_rx.json

@@ -0,0 +1,74 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x8029"
+      ],
+      [
+        "0x239A",
+        "0x0029"
+      ],
+      [
+        "0x239A",
+        "0x002A"
+      ],
+      [
+        "0x239A",
+        "0x802A"
+      ]
+    ],
+    "usb_product": "Raytac MDBT50Q - RX",
+    "mcu": "nrf52840",
+    "variant": "raytac_mdbt50q_rx",
+    "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"
+  ],
+  "name": "Raytac MDBT50Q-RX Dongle",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "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.raytac.com/product/ins.php?index_id=89",
+  "vendor": "Raytac"
+}

boards/reel_board.json

@@ -0,0 +1,45 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "64000000L",
+    "mcu": "nrf52840",
+    "hwids": [
+      [
+        "0x0D28",
+        "0x0204"
+      ]
+    ],
+    "zephyr": {
+      "variant": "reel_board"
+    }
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": [
+      "cmsis-dap"
+    ],
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": [
+    "zephyr"
+  ],
+  "name": "PHYTEC reel board",
+  "upload": {
+    "maximum_ram_size": 262144,
+    "maximum_size": 1048576,
+    "protocol": "cmsis-dap",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "blackmagic",
+      "cmsis-dap",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://www.phytec.eu/reelboard",
+  "vendor": "PHYTEC"
+}

boards/reel_board_v2.json

@@ -0,0 +1,45 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "64000000L",
+    "mcu": "nrf52840",
+    "hwids": [
+      [
+        "0x0D28",
+        "0x0204"
+      ]
+    ],
+    "zephyr": {
+      "variant": "reel_board_v2"
+    }
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": [
+      "cmsis-dap"
+    ],
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": [
+    "zephyr"
+  ],
+  "name": "PHYTEC reel board v2",
+  "upload": {
+    "maximum_ram_size": 262144,
+    "maximum_size": 1048576,
+    "protocol": "cmsis-dap",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "blackmagic",
+      "cmsis-dap",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://www.phytec.eu/reelboard",
+  "vendor": "PHYTEC"
+}

examples/arduino-blink/platformio.ini

@@ -7,6 +7,16 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
+[env:bbcmicrobit_v2]
+platform = nordicnrf52
+framework = arduino
+board = bbcmicrobit_v2
+
+[env:dwm1001_dev]
+platform = nordicnrf52
+framework = arduino
+board = dwm1001_dev
+
 [env:nrf52_dk]
 platform = nordicnrf52
 framework = arduino

examples/mbed-legacy-examples/mbed-ble-thermometer/platformio.ini

@@ -13,7 +13,7 @@ framework = mbed
 board = nrf52_dk
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0
 
 [env:delta_dfbm_nq620]
 platform = nordicnrf52

examples/mbed-legacy-examples/mbed-nfc/platformio.ini

@@ -13,4 +13,4 @@ framework = mbed
 board = nrf52_dk
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0

examples/mbed-legacy-examples/mbed-rtos/platformio.ini

@@ -13,7 +13,7 @@ framework = mbed
 board = nrf52840_dk
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0
 
 [env:delta_dfbm_nq620]
 platform = nordicnrf52

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nordicnrf52.git"
   },
-  "version": "5.0.1",
+  "version": "6.0.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinonordicnrf5",
@@ -43,7 +43,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~6.60200.0"
+      "version": "~6.60600.0"
     },
     "framework-arduinoadafruitnrf52": {
       "type": "framework",
@@ -55,7 +55,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.600.0"
+      "version": "~1.700.0"
     },
     "framework-arduino-nrf52-mbedos": {
       "type": "framework",

platform.py

@@ -45,7 +45,7 @@ def configure_default_packages(self, variables, targets):
                 if os.path.isfile(deprecated_boards_file):
                     with open(deprecated_boards_file) as fp:
                         if board in json.load(fp):
-                            self.packages["framework-mbed"]["version"] = "~6.51504.0"
+                            self.packages["framework-mbed"]["version"] = "~6.51506.0"
                 self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.90201.0"
 
             if "zephyr" in frameworks:
@@ -155,6 +155,7 @@ def _add_default_debug_tools(self, board):
                         "arguments": server_args
                     }
                 }
+                server_args.extend(debug.get("openocd_extra_args", []))
 
             debug['tools'][link]['onboard'] = link in debug.get("onboard_tools", [])
             debug['tools'][link]['default'] = link in debug.get("default_tools", [])