Merge branch 'release/v2.5.0'

platformio · Aug 22, 2017 · 0dded21 · 0dded21
2 parents 924e729 + ac98507
commit 0dded21
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 3 deletions.
diff --git a/boards/sodaq_explorer.json b/boards/sodaq_explorer.json
@@ -20,6 +20,44 @@
     "usb_product": "SODAQ ExpLoRer",
     "variant": "sodaq_explorer"
   },
+  "debug": {
+    "tools": {
+      "jlink": {
+        "server": [
+          {
+            "arguments": [
+              "-singlerun",
+              "-if", "SWD",
+              "-select", "USB",
+              "-device", "ATSAMD21J18",
+              "-port", "2331"
+            ],
+            "executable": "JLinkGDBServerCL.exe",
+            "system": [
+              "windows",
+              "windows_amd64",
+              "windows_x86"
+            ]
+          },
+          {
+            "arguments": [
+              "-singlerun",
+              "-if", "SWD",
+              "-select", "USB",
+              "-device", "ATSAMD21J18",
+              "-port", "2331"
+            ],
+            "executable": "JLinkGDBServer",
+            "system": [
+              "darwin_x86_64",
+              "linux_i686",
+              "linux_x86_64"
+            ]
+          }
+        ]
+      }
+    }
+  },
   "frameworks": [
     "arduino"
   ],

diff --git a/boards/sodaq_one.json b/boards/sodaq_one.json
@@ -20,6 +20,44 @@
     "usb_product": "SODAQ ONE",
     "variant": "sodaq_one"
   },
+  "debug": {
+    "tools": {
+      "jlink": {
+        "server": [
+          {
+            "arguments": [
+              "-singlerun",
+              "-if", "SWD",
+              "-select", "USB",
+              "-device", "ATSAMD21G18",
+              "-port", "2331"
+            ],
+            "executable": "JLinkGDBServerCL.exe",
+            "system": [
+              "windows",
+              "windows_amd64",
+              "windows_x86"
+            ]
+          },
+          {
+            "arguments": [
+              "-singlerun",
+              "-if", "SWD",
+              "-select", "USB",
+              "-device", "ATSAMD21G18",
+              "-port", "2331"
+            ],
+            "executable": "JLinkGDBServer",
+            "system": [
+              "darwin_x86_64",
+              "linux_i686",
+              "linux_x86_64"
+            ]
+          }
+        ]
+      }
+    }
+  },
   "frameworks": [
     "arduino"
   ],

diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelsam.git"
   },
-  "version": "2.4.0",
+  "version": "2.5.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",
@@ -45,7 +45,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~4.146.0"
+      "version": "~4.149.0"
     },
     "framework-simba": {
       "type": "framework",