Merge branch 'release/v2.2.1'

platformio · May 2, 2018 · b0e2fb6 · b0e2fb6
2 parents 3817c81 + 2f3411a
commit b0e2fb6
Show file tree

Hide file tree

Showing 9 changed files with 41,275 additions and 10 deletions.
diff --git a/boards/delta_dfbm_nq620.json b/boards/delta_dfbm_nq620.json
@@ -15,7 +15,8 @@
  "jlink_device": "nRF52832_xxAA",
  "onboard_tools": [
  "cmsis-dap"
- ]
+ ],
+ "svd_path": "nrf52.svd"
  },
  "frameworks": [
  "arduino",

diff --git a/boards/nrf52840_dk.json b/boards/nrf52840_dk.json
@@ -12,14 +12,15 @@
  "bluetooth"
  ],
  "debug": {
- "jlink_device": "nRF52840_xxAA",
  "default_tools": [
  "jlink"
  ],
+ "jlink_device": "nRF52840_xxAA",
  "onboard_tools": [
  "cmsis-dap",
  "jlink"
- ]
+ ],
+ "svd_path": "nrf52.svd"
  },
  "frameworks": [
  "arduino",

diff --git a/boards/nrf52_dk.json b/boards/nrf52_dk.json
@@ -12,14 +12,15 @@
  "bluetooth"
  ],
  "debug": {
- "jlink_device": "nRF52832_xxAA",
  "default_tools": [
  "jlink"
  ],
+ "jlink_device": "nRF52832_xxAA",
  "onboard_tools": [
  "cmsis-dap",
  "jlink"
- ]
+ ],
+ "svd_path": "nrf52.svd"
  },
  "frameworks": [
  "arduino",

diff --git a/boards/redbear_blenano2.json b/boards/redbear_blenano2.json
@@ -15,7 +15,8 @@
  "jlink_device": "nRF52832_xxAA",
  "onboard_tools": [
  "cmsis-dap"
- ]
+ ],
+ "svd_path": "nrf52.svd"
  },
  "frameworks": [
  "arduino"

diff --git a/boards/redbear_blend2.json b/boards/redbear_blend2.json
@@ -15,7 +15,8 @@
  "jlink_device": "nRF52832_xxAA",
  "onboard_tools": [
  "cmsis-dap"
- ]
+ ],
+ "svd_path": "nrf52.svd"
  },
  "frameworks": [
  "arduino"

diff --git a/boards/stct_nrf52_minidev.json b/boards/stct_nrf52_minidev.json
@@ -12,7 +12,8 @@
  "bluetooth"
  ],
  "debug": {
- "jlink_device": "nRF52832_xxAA"
+ "jlink_device": "nRF52832_xxAA",
+ "svd_path": "nrf52.svd"
  },
  "frameworks": [
  "arduino"

diff --git a/boards/ublox_evk_nina_b1.json b/boards/ublox_evk_nina_b1.json
@@ -16,7 +16,8 @@
  "jlink_device": "nRF52832_xxAA",
  "onboard_tools": [
  "jlink"
- ]
+ ],
+ "svd_path": "nrf52.svd"
  },
  "frameworks": [
  "arduino",