Merge branch 'release/v2.0.1'

platformio · May 15, 2017 · bfbee0a · bfbee0a
2 parents cfb0894 + d1e936d
commit bfbee0a
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 45 deletions.
diff --git a/boards/lpmsp430f5529.json b/boards/lpmsp430f5529.json
@@ -3,27 +3,27 @@
     "core": "msp430",
     "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430F5529LP",
     "f_cpu": "16000000L",
-    "mcu": "msp430f5529",
     "hwids": [
       [
         "0x2341",
         "0x0c9f"
       ]
     ],
+    "mcu": "msp430f5529",
     "variant": "MSP-EXP430F5529LP"
   },
   "debug": {
     "tools": {
       "mspdebug": {
+        "onboard": true,
         "server": {
-          "package": "tool-mspdebug",
-          "executable": "mspdebug",
           "arguments": [
-            "tilib",
+            "$UPLOAD_PROTOCOL",
             "gdb"
-          ]
-        },
-        "onboard": true
+          ],
+          "executable": "mspdebug",
+          "package": "tool-mspdebug"
+        }
       }
     }
   },

diff --git a/boards/lpmsp430fr4133.json b/boards/lpmsp430fr4133.json
@@ -15,15 +15,15 @@
   "debug": {
     "tools": {
       "mspdebug": {
+        "onboard": true,
         "server": {
-          "package": "tool-mspdebug",
-          "executable": "mspdebug",
           "arguments": [
-            "tilib",
+            "$UPLOAD_PROTOCOL",
             "gdb"
-          ]
-        },
-        "onboard": true
+          ],
+          "executable": "mspdebug",
+          "package": "tool-mspdebug"
+        }
       }
     }
   },

diff --git a/boards/lpmsp430fr5739.json b/boards/lpmsp430fr5739.json
@@ -15,15 +15,35 @@
   "debug": {
     "tools": {
       "mspdebug": {
-        "server": {
-          "package": "tool-mspdebug",
-          "executable": "mspdebug",
-          "arguments": [
-            "rf2500",
-            "gdb"
-          ]
-        },
-        "onboard": true
+        "onboard": true,
+        "server": [
+          {
+            "arguments": [
+              "tilib",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "windows",
+              "windows_amd64",
+              "windows_x86"
+            ]
+          },
+          {
+            "arguments": [
+              "$UPLOAD_PROTOCOL",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "darwin_x86_64",
+              "linux_i686",
+              "linux_x86_64"
+            ]
+          }
+        ]
       }
     }
   },

diff --git a/boards/lpmsp430fr5969.json b/boards/lpmsp430fr5969.json
@@ -15,15 +15,15 @@
   "debug": {
     "tools": {
       "mspdebug": {
+        "onboard": true,
         "server": {
-          "package": "tool-mspdebug",
-          "executable": "mspdebug",
           "arguments": [
-            "tilib",
+            "$UPLOAD_PROTOCOL",
             "gdb"
-          ]
-        },
-        "onboard": true
+          ],
+          "executable": "mspdebug",
+          "package": "tool-mspdebug"
+        }
       }
     }
   },

diff --git a/boards/lpmsp430fr6989.json b/boards/lpmsp430fr6989.json
@@ -15,15 +15,15 @@
   "debug": {
     "tools": {
       "mspdebug": {
+        "onboard": true,
         "server": {
-          "package": "tool-mspdebug",
-          "executable": "mspdebug",
           "arguments": [
-            "tilib",
+            "$UPLOAD_PROTOCOL",
             "gdb"
-          ]
-        },
-        "onboard": true
+          ],
+          "executable": "mspdebug",
+          "package": "tool-mspdebug"
+        }
       }
     }
   },

diff --git a/boards/lpmsp430g2553.json b/boards/lpmsp430g2553.json
@@ -3,27 +3,47 @@
     "core": "msp430",
     "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430G2553LP",
     "f_cpu": "16000000L",
-    "mcu": "msp430g2553",
     "hwids": [
       [
         "0x2341",
         "0x0c9f"
       ]
     ],
+    "mcu": "msp430g2553",
     "variant": "MSP-EXP430G2553LP"
   },
   "debug": {
     "tools": {
       "mspdebug": {
-        "server": {
-          "package": "tool-mspdebug",
-          "executable": "mspdebug",
-          "arguments": [
-            "rf2500",
-            "gdb"
-          ]
-        },
-        "onboard": true
+        "onboard": true,
+        "server": [
+          {
+            "arguments": [
+              "tilib",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "windows",
+              "windows_amd64",
+              "windows_x86"
+            ]
+          },
+          {
+            "arguments": [
+              "$UPLOAD_PROTOCOL",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "darwin_x86_64",
+              "linux_i686",
+              "linux_x86_64"
+            ]
+          }
+        ]
       }
     }
   },

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-timsp430.git"
   },
-  "version": "2.0.0",
+  "version": "2.0.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -47,6 +47,11 @@
       "type": "uploader",
       "optional": true,
       "version": "~1.2200.0"
+    },
+    "tool-msp430gdbproxy": {
+      "type": "debugger",
+      "optional": true,
+      "version": "~1.18.0"
     }
   }
 }