Merge branch 'release/v3.6.0'

ivankravets · ivankravets · commit 65999b9fd97d · 2019-08-27T13:15:17.000+03:00
diff --git a/boards/adafruit_feather_nrf52832.json b/boards/adafruit_feather_nrf52832.json
@@ -4,6 +4,25 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DNRF52832_XXAA -DNRF52",
     "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x8029"
+      ],
+      [
+        "0x239A",
+        "0x0029"
+      ],
+      [
+        "0x239A",
+        "0x002A"
+      ],
+      [
+        "0x239A",
+        "0x802A"
+      ]
+    ],
+    "usb_product": "Feather nRF52832 Express",
     "ldscript": "nrf52832_s132_v6.ld",
     "mcu": "nrf52832",
     "variant": "feather_nrf52832",
diff --git a/boards/adafruit_feather_nrf52840.json b/boards/adafruit_feather_nrf52840.json
@@ -4,6 +4,25 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
     "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x8029"
+      ],
+      [
+        "0x239A",
+        "0x0029"
+      ],
+      [
+        "0x239A",
+        "0x002A"
+      ],
+      [
+        "0x239A",
+        "0x802A"
+      ]
+    ],
+    "usb_product": "Feather nRF52840 Express",
     "ldscript": "nrf52840_s140_v6.ld",
     "mcu": "nrf52840",
     "variant": "feather_nrf52840_express",
diff --git a/boards/adafruit_metro_nrf52840.json b/boards/adafruit_metro_nrf52840.json
@@ -0,0 +1,70 @@
+{
+  "build": {
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DARDUINO_NRF52840_METRO -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x803F"
+      ],
+      [
+        "0x239A",
+        "0x003F"
+      ],
+      [
+        "0x239A",
+        "0x0040"
+      ],
+      [
+        "0x239A",
+        "0x8040"
+      ]
+    ],
+    "usb_product": "Metro nRF52840 Express",
+    "ldscript": "nrf52840_s140_v6.ld",
+    "mcu": "nrf52840",
+    "variant": "metro_nrf52840_express",
+    "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",
+    "onboard_tools": [
+      "jlink"
+    ],
+    "svd_path": "nrf52.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Metro nRF52840 Express",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "require_upload_port": true,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil"
+    ]
+  },
+  "url": "https://www.adafruit.com/product/4062",
+  "vendor": "Adafruit"
+}
diff --git a/boards/nrf52840_dk_adafruit.json b/boards/nrf52840_dk_adafruit.json
@@ -4,6 +4,13 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
     "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x8029"
+      ]
+    ],
+    "usb_product": "NRF52 DK",
     "ldscript": "nrf52840_s140_v6.ld",
     "mcu": "nrf52840",
     "variant": "pca10056",
diff --git a/builder/frameworks/arduino b/builder/frameworks/arduino
@@ -1 +1 @@
-Subproject commit 47248c6462b5891b515f1720af1bb309ae195637
+Subproject commit 1c92abfc3887aa3cbca89a51710cbf09bdb0e6ea
diff --git a/builder/main.py b/builder/main.py
@@ -17,8 +17,8 @@
 from os import makedirs
 from os.path import isdir, join
 
-from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
-                          DefaultEnvironment)
+from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
+                          Builder, Default, DefaultEnvironment)
 
 env = DefaultEnvironment()
 platform = env.PioPlatform()
@@ -114,7 +114,7 @@
         BUILDERS=dict(
             PackageDfu=Builder(
                 action=env.VerboseAction(" ".join([
-                    nrfutil_path,
+                    '"%s"' % nrfutil_path,
                     "dfu",
                     "genpkg",
                     "--dev-type",
@@ -152,6 +152,7 @@
 upload_protocol = env.subst("$UPLOAD_PROTOCOL")
 target_elf = None
 if "nobuild" in COMMAND_LINE_TARGETS:
+    target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
     target_firm = join("$BUILD_DIR", "${PROGNAME}.hex")
 else:
     target_elf = env.BuildProgram()
@@ -262,7 +263,7 @@
             "$UPLOAD_SPEED",
             "--singlebank",
         ],
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS -pkg $SOURCE"
+        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS -pkg $SOURCE'
     )
     upload_actions = [env.VerboseAction(env.AutodetectUploadPort, "Looking for upload port..."),
                       env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
@@ -304,14 +305,23 @@ def _jlink_cmd_script(env, source):
     upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
 
 elif upload_protocol in debug_tools:
+    openocd_args = [
+        "-d%d" % (2 if int(ARGUMENTS.get("PIOVERBOSE", 0)) else 1)
+    ]
+    openocd_args.extend(
+        debug_tools.get(upload_protocol).get("server").get("arguments", []))
+    openocd_args.extend([
+        "-c", "program {$SOURCE} %s verify reset; shutdown;" %
+        board.get("upload.offset_address", "")
+    ])
+    openocd_args = [
+        f.replace("$PACKAGE_DIR",
+                  platform.get_package_dir("tool-openocd") or "")
+        for f in openocd_args
+    ]
     env.Replace(
         UPLOADER="openocd",
-        UPLOADERFLAGS=["-s", platform.get_package_dir("tool-openocd") or ""] +
-        debug_tools.get(upload_protocol).get("server").get("arguments", []) + [
-            "-c",
-            "program {$SOURCE} verify reset %s; shutdown;" %
-            env.BoardConfig().get("upload.offset_address", "")
-        ],
+        UPLOADERFLAGS=openocd_args,
         UPLOADCMD="$UPLOADER $UPLOADERFLAGS")
     upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
 
diff --git a/examples/arduino-bluefruit-bleuart/platformio.ini b/examples/arduino-bluefruit-bleuart/platformio.ini
@@ -25,3 +25,9 @@ platform = nordicnrf52
 framework = arduino
 board = nrf52840_dk_adafruit
 monitor_speed = 115200
+
+[env:adafruit_metro_nrf52840]
+platform = nordicnrf52
+framework = arduino
+board = adafruit_metro_nrf52840
+monitor_speed = 115200
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nordicnrf52.git"
   },
-  "version": "3.5.0",
+  "version": "3.6.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -35,12 +35,12 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~5.51203.190509"
+      "version": "~5.51304.190826"
     },
     "framework-arduinoadafruitnrf52": {
       "type": "framework",
       "optional": true,
-      "version": "~1.1001.0"
+      "version": "~1.1101.0"
     },
     "framework-arduinonordicnrf5": {
       "type": "framework",
diff --git a/platform.py b/platform.py
@@ -109,13 +109,16 @@ def _add_default_debug_tools(self, board):
                 }
 
             else:
-                server_args = ["-f", "scripts/interface/%s.cfg" % link]
+                server_args = [
+                    "-s", "$PACKAGE_DIR/scripts",
+                    "-f", "interface/%s.cfg" % link
+                ]
                 if link == "stlink":
                     server_args.extend([
                         "-c",
                         "transport select hla_swd; set WORKAREASIZE 0x4000"
                     ])
-                server_args.extend(["-f", "scripts/target/nrf52.cfg"])
+                server_args.extend(["-f", "target/nrf52.cfg"])
                 debug['tools'][link] = {
                     "server": {
                         "package": "tool-openocd",
