Merge branch 'release/v3.5.0'

Author: ivankravets

boards/sdt52832b.json

@@ -0,0 +1,35 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52_DK",
+    "f_cpu": "64000000L",
+    "ldscript": "nrf52_xxaa.ld",
+    "mcu": "nrf52832"
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52832_xxAA",
+    "svd_path": "nrf52.svd"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "SDT52832B",
+  "upload": {
+    "maximum_ram_size": 65536,
+    "maximum_size": 524288,
+    "protocol": "mbed",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "stlink",
+      "blackmagic",
+      "cmsis-dap",
+      "mbed"
+    ]
+  },
+  "url": "https://os.mbed.com/platforms/SDT52832B/",
+  "vendor": "Sigma Delta Technologies"
+}

builder/frameworks/arduino

@@ -23,7 +23,7 @@
 env = DefaultEnvironment()
 platform = env.PioPlatform()
 board = env.BoardConfig()
-variant = board.get("build.variant")
+variant = board.get("build.variant", "")
 
 use_adafruit = board.get("build.bsp.name", "nrf5") == "adafruit"
 if use_adafruit:

builder/main.py

@@ -33,8 +33,3 @@ platform = nordicnrf52
 framework = arduino
 board = stct_nrf52_minidev
 build_flags = -DNRF52_S132
-
-[env:adafruit_feather_nrf52832]
-platform = nordicnrf52
-framework = arduino
-board = adafruit_feather_nrf52832

examples/arduino-blink/platformio.ini

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nordicnrf52.git"
   },
-  "version": "3.4.0",
+  "version": "3.5.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -45,7 +45,7 @@
     "framework-arduinonordicnrf5": {
       "type": "framework",
       "optional": true,
-      "version": "~1.501.0"
+      "version": "~1.600.0"
     },
     "tool-sreccat": {
       "version": "~1.164.0"

platform.json

@@ -23,16 +23,23 @@ def is_embedded(self):
         return True
 
     def configure_default_packages(self, variables, targets):
+        upload_protocol = ""
         board = variables.get("board")
-
         if board:
+            upload_protocol = variables.get(
+                "upload_protocol",
+                self.board_config(board).get("upload.protocol", ""))
+
             if self.board_config(board).get("build.bsp.name",
                                             "nrf5") == "adafruit":
                 self.frameworks['arduino'][
                     'package'] = "framework-arduinoadafruitnrf52"
 
         if set(["bootloader", "erase"]) & set(targets):
             self.packages["tool-nrfjprog"]["optional"] = False
+        elif (upload_protocol and upload_protocol != "nrfjprog"
+              and "tool-nrfjprog" in self.packages):
+            del self.packages["tool-nrfjprog"]
 
         # configure J-LINK tool
         jlink_conds = [