Merge branch 'release/v4.5.0'

platformio · Oct 29, 2020 · 00029d4 · 00029d4
2 parents 02f10ae + 1bde563
commit 00029d4
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 26 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -8,7 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-16.04, windows-latest, macos-latest]
-        python-version: [2.7, 3.7]
         example:
           - "examples/arduino-blink"
           - "examples/arduino-ble-led"
@@ -25,24 +24,20 @@ jobs:
           - "examples/zephyr-blink"
           - "examples/zephyr-net-echo-client"
           - "examples/zephyr-subsys-nvs"
-        exclude:
-          - {python-version: 2.7, example: "examples/zephyr-ble-beacon"}
-          - {python-version: 2.7, example: "examples/zephyr-blink"}
-          - {python-version: 2.7, example: "examples/zephyr-net-echo-client"}
-          - {python-version: 2.7, example: "examples/zephyr-subsys-nvs"}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python 3
         uses: actions/setup-python@v1
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.7"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -U https://github.com/platformio/platformio/archive/develop.zip
+          pip3 install adafruit-nrfutil
           platformio platform install file://.
       - name: Build examples
         run: |

diff --git a/boards/adafruit_clue_nrf52840.json b/boards/adafruit_clue_nrf52840.json
@@ -62,7 +62,8 @@
       "nrfjprog",
       "nrfutil",
       "stlink",
-      "cmsis-dap"
+      "cmsis-dap",
+      "blackmagic"
     ],
     "use_1200bps_touch": true,
     "require_upload_port": true,

diff --git a/boards/adafruit_cplaynrf52840.json b/boards/adafruit_cplaynrf52840.json
@@ -61,7 +61,9 @@
       "jlink",
       "nrfjprog",
       "nrfutil",
-      "stlink"
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
     ],
     "use_1200bps_touch": true,
     "require_upload_port": true,

diff --git a/boards/adafruit_feather_nrf52832.json b/boards/adafruit_feather_nrf52832.json
@@ -63,7 +63,9 @@
       "jlink",
       "nrfjprog",
       "nrfutil",
-      "stlink"
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
     ]
   },
   "url": "https://www.adafruit.com/product/3406",

diff --git a/boards/adafruit_feather_nrf52840.json b/boards/adafruit_feather_nrf52840.json
@@ -63,7 +63,8 @@
       "nrfjprog",
       "nrfutil",
       "stlink",
-      "cmsis-dap"
+      "cmsis-dap",
+      "blackmagic"
     ],
     "use_1200bps_touch": true,
     "require_upload_port": true,

diff --git a/boards/adafruit_feather_nrf52840_sense.json b/boards/adafruit_feather_nrf52840_sense.json
@@ -61,7 +61,9 @@
       "jlink",
       "nrfjprog",
       "nrfutil",
-      "stlink"
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
     ],
     "use_1200bps_touch": true,
     "require_upload_port": true,

diff --git a/boards/adafruit_itsybitsy_nrf52840.json b/boards/adafruit_itsybitsy_nrf52840.json
@@ -61,7 +61,9 @@
       "jlink",
       "nrfjprog",
       "nrfutil",
-      "stlink"
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
     ],
     "use_1200bps_touch": true,
     "require_upload_port": true,

diff --git a/boards/adafruit_metro_nrf52840.json b/boards/adafruit_metro_nrf52840.json
@@ -61,7 +61,9 @@
       "jlink",
       "nrfjprog",
       "nrfutil",
-      "stlink"
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
     ],
     "use_1200bps_touch": true,
     "require_upload_port": true,

diff --git a/boards/bluey.json b/boards/bluey.json
@@ -29,6 +29,7 @@
       "jlink",
       "nrfjprog",
       "stlink",
+      "cmsis-dap",
       "blackmagic"
     ]
   },

diff --git a/boards/hackaBLE.json b/boards/hackaBLE.json
@@ -29,6 +29,7 @@
       "jlink",
       "nrfjprog",
       "stlink",
+      "cmsis-dap",
       "blackmagic"
     ]
   },

diff --git a/boards/nano33ble.json b/boards/nano33ble.json
@@ -41,11 +41,12 @@
       "nrfjprog",
       "nrfutil",
       "cmsis-dap",
-      "sam-ba"
+      "sam-ba",
+      "blackmagic"
     ],
     "use_1200bps_touch": true,
     "require_upload_port": true,
-    "wait_for_upload_port": true 
+    "wait_for_upload_port": true
   },
   "url": "https://store.arduino.cc/arduino-nano-33-ble",
   "vendor": "Arduino"

diff --git a/boards/nrf52840_dk_adafruit.json b/boards/nrf52840_dk_adafruit.json
@@ -52,7 +52,9 @@
     "protocols": [
       "jlink",
       "nrfjprog",
-      "stlink"
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
     ]
   },
   "url": "https://os.mbed.com/platforms/Nordic-nRF52840-DK/",

diff --git a/boards/particle_argon.json b/boards/particle_argon.json
@@ -24,7 +24,9 @@
     "protocols": [
       "jlink",
       "nrfjprog",
-      "nrfutil"
+      "nrfutil",
+      "cmsis-dap",
+      "blackmagic"
     ]
   },
   "url": "https://docs.particle.io/argon",

diff --git a/boards/particle_boron.json b/boards/particle_boron.json
@@ -24,7 +24,9 @@
     "protocols": [
       "jlink",
       "nrfjprog",
-      "nrfutil"
+      "nrfutil",
+      "cmsis-dap",
+      "blackmagic"
     ]
   },
   "url": "https://docs.particle.io/boron",

diff --git a/boards/particle_xenon.json b/boards/particle_xenon.json
@@ -51,7 +51,9 @@
       "jlink",
       "nrfjprog",
       "nrfutil",
-      "stlink"
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
     ]
   },
   "url": "https://docs.particle.io/xenon",

diff --git a/boards/stct_nrf52_minidev.json b/boards/stct_nrf52_minidev.json
@@ -29,6 +29,7 @@
       "jlink",
       "nrfjprog",
       "stlink",
+      "cmsis-dap",
       "blackmagic"
     ]
   },

diff --git a/boards/ublox_evk_nina_b1.json b/boards/ublox_evk_nina_b1.json
@@ -35,6 +35,7 @@
       "nrfjprog",
       "stlink",
       "blackmagic",
+      "cmsis-dap",
       "mbed"
     ]
   },

diff --git a/builder/frameworks/arduino b/builder/frameworks/arduino
diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nordicnrf52.git"
   },
-  "version": "4.4.1",
+  "version": "4.5.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinonordicnrf5",
@@ -49,7 +49,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.1900.0"
+      "version": "~1.2100.0"
     },
     "framework-arduinonordicnrf5": {
       "type": "framework",
@@ -61,7 +61,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.1.3"
+      "version": "~1.3.0"
     },
     "framework-zephyr": {
       "type": "framework",
@@ -190,7 +190,7 @@
       "type": "uploader",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.10866.0"
+      "version": "~1.10901.0"
     },
     "tool-cmake": {
       "optional": true,