Merge debugger features into master branch (#306)

* Add Arduino debugger start session. (#285) * Add Arduino debugger start session. * Fix based on code review. * Support debugger for az3166 (#302) * fix some debug issues: 1. findFile resolve multiple openocd.exe 2. openocd has two possible script folders : ../scripts and ../share/openocd/scripts 3. if output is undefined, the elf path is not right. * revert unexpected change * fix a issue when source file is change but elf is not compiled again. * fix errors on mac * fix tslint error * Debug feature bug fix. (#303) * 1. make the load for serialport native lazy 2. stop the debugger when early check fails 3. resolve the openocd/gdb from other package if current package doesn't contain them * refine the output folder name. * 1. use static getter method to implement lazy load * fix tslint error * refact debug code (#305) * 1. make the load for serialport native lazy 2. stop the debugger when early check fails 3. resolve the openocd/gdb from other package if current package doesn't contain them * refine the output folder name. * 1. use static getter method to implement lazy load * fix tslint error * 1. refact debug code for separate interface and target, interfaces are listed due to usb pid/vid, target is linked to target board, swd is the only transport currently supported. * fix tslint error. * refine the current board code from this._boardManager in debugmanager. * Update usbmapping.json typo * fix the issue of package name and multiple pid match * 1.add arduino zero board 2. change debug manager to configurator * 1. for boards which support debug, check whether the expected debugger is connected. * change tab size for package.json
microsoft · May 18, 2017 · 6d7ed7d · 6d7ed7d
1 parent e3b9c5e
commit 6d7ed7d
Show file tree

Hide file tree

Showing 19 changed files with 1,073 additions and 188 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,9 +6,13 @@ root = true
 # Tab indentation
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 # The indent size used in the `package.json` file cannot be changed
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
 [{.travis.yml,npm-shrinkwrap.json,package.json}]
 indent_size = 2
+
+[vendor/**.js]
+indent_style = space
+indent_size = 2
diff --git a/misc/debuggerUsbMapping.json b/misc/debuggerUsbMapping.json
@@ -0,0 +1,66 @@
+[
+    {
+        "vid": "0483",
+        "pid": "3744",
+        "name": "ST Link V1.0",
+        "short_name": "stlink-1.0",
+        "config_file": "stlink-v1.cfg"
+    },
+    {
+        "vid": "0483",
+        "pid": "3748",
+        "name": "ST Link V2.0",
+        "short_name": "stlink-2.0",
+        "config_file": "stlink-v2.cfg"
+    },
+    {
+        "vid": "0483",
+        "pid": "374b",
+        "name": "ST Link V2.1",
+        "short_name": "stlink-2.1",
+        "config_file": "stlink-v2-1.cfg"
+    },
+    {
+        "pid": [
+            "0101",
+            "0102",
+            "0103",
+            "0104",
+            "0105",
+            "0106",
+            "0107",
+            "0108",
+            "0109",
+            "0110",
+            "0111",
+            "0112",
+            "0113",
+            "0114",
+            "0115",
+            "0116",
+            "0117",
+            "0118"
+        ],
+        "vid": "1366",
+        "name": "JLink",
+        "short_name": "jlink",
+        "config_file": "jlink.cfg"
+    },
+    {
+        "vid": "03eb",
+        "pid": "2111",
+        "name": "CMSIS-DAP",
+        "short_name": "cmsis-dap",
+        "config_file": "cmsis-dap.cfg"
+    },
+    {
+        "vid": "03eb",
+        "pid": [
+            "2111",
+            "2157"
+        ],
+        "name": "CMSIS-DAP",
+        "short_name": "cmsis-dap",
+        "config_file": "cmsis-dap.cfg"
+    }
+]
diff --git a/misc/openOCDMapping.json b/misc/openOCDMapping.json
@@ -0,0 +1,18 @@
+[
+    {
+        "board": "arduino:samd:mzero_pro_bl_dbg",
+        "interface": "interface/cmsis-dap.cfg",
+        "target": "target/at91samdXX.cfg"
+    },
+    {
+        "board": "arduino:samd:mzero_bl",
+        "interface": "interface/cmsis-dap.cfg",
+        "target": "target/at91samdXX.cfg"
+    },
+    {
+        "board": "AZ3166:stm32f4:MXCHIP_AZ3166",
+        "interface": "interface/stlink-v2-1.cfg",
+        "target": "target/stm32f4x.cfg"
+    }
+]
+
diff --git a/misc/usbmapping.json b/misc/usbmapping.json
@@ -1,76 +1,147 @@
-[{
+[
+  {
     "index_file": "package_index.json",
-    "boards": [{
+    "boards": [
+      {
         "vid": "2341",
         "pid": "804e",
         "name": "Arduino/Genuino MKR1000",
         "package": "arduino",
         "architecture": "samd",
-        "id": "mkr1000"
-    }, {
+        "id": "mkr1000",
+        "target": "at91samdXX.cfg"
+      },
+      {
         "vid": "8087",
         "pid": "0a9e",
         "name": "Intel Edison",
         "package": "arduino",
         "architecture": "samd",
         "id": "edison"
-    }, {
+      },
+      {
+        "vid": "03eb",
+        "pid": "2111",
+        "name": "Arduino M0 Pro (Programming USB Port)",
+        "package": "arduino",
+        "architecture": "samd",
+        "id": "mzero_pro_bl_dbg",
+        "target": "at91samdXX.cfg",
+        "interface": "cmsis-dap.cfg"
+      },
+      {
+        "vid": "03eb",
+        "pid": "2157",
+        "name": "Arduino/Genuino Zero (Programming Port)",
+        "package": "arduino",
+        "architecture": "samd",
+        "id": "arduino_zero_edbg",
+        "target": "at91samdXX.cfg",
+        "interface": "cmsis-dap.cfg"
+      },
+      {
+        "vid": "2341",
+        "pid": ["804d", "004d", "824d"],
+        "name": "Arduino/Genuino Zero (Native USB Port)",
+        "package": "arduino",
+        "architecture": "samd",
+        "id": "arduino_zero_edbg",
+        "target": "at91samdXX.cfg",
+        "interface": "cmsis-dap.cfg"
+      },
+      {
         "vid": "2a03",
         "pid": "804f",
         "name": "Arduino M0 Pro (Native USB Port)",
         "package": "arduino",
         "architecture": "samd",
-        "id": "mzero_pro_bl"
-    }, {
+        "id": "mzero_pro_bl",
+        "target": "at91samdXX.cfg"
+      },
+      {
         "vid": "2341",
         "pid": "8041",
         "name": "Arduino Yún",
         "package": "arduino",
         "architecture": "avr",
         "id": "yun"
-    }, {
+      },
+      {
         "vid": "2341",
         "pid": "003e",
         "name": "Arduino Due",
         "package": "arduino",
         "architecture": "sam",
         "id": "arduino_due_x"
-    }]
-}, {
+      }
+    ]
+  },
+  {
+    "index_file": "https://www.adafruit.com/package_adafruit_index.json",
+    "boards": [
+      {
+        "vid": "239a",
+        "pid": [
+          "0010",
+          "8010",
+          "0008"
+        ],
+        "name": "Adafruit WICED Feather",
+        "package": "adafruit",
+        "architecture": "wiced",
+        "id": "feather",
+        "target": "stm32f2x.cfg"
+      }
+    ]
+  },
+  {
     "index_file": "http://arduino.esp8266.com/stable/package_esp8266com_index.json",
-    "boards": [{
+    "boards": [
+      {
         "vid": "10c4",
         "pid": "ea60",
         "name": "Adafruit HUZZAH ESP8266",
         "package": "esp8266",
         "architecture": "esp8266",
         "id": "huzzah"
-    }, {
+      },
+      {
         "vid": "0403",
         "pid": "6015",
         "name": "SparkFun ESP8266 Thing Dev",
         "package": "esp8266",
         "architecture": "esp8266",
         "id": "thingdev"
-    }]
-}, {
+      }
+    ]
+  },
+  {
     "index_file": "https://adafruit.github.io/arduino-board-index/package_adafruit_index.json",
-    "boards": [{
+    "boards": [
+      {
         "vid": "239a",
         "pid": "800b",
         "name": "Adafruit Feather M0",
         "package": "adafruit",
         "architecture": "samd",
-        "id": "adafruit_feather_m0"
-    }]
-}, {
+        "id": "adafruit_feather_m0",
+        "target": "at91samdXX.cfg"
+      }
+    ]
+  },
+  {
     "index_file": "https://raw.githubusercontent.com/VSChina/azureiotdevkit_tools/master/package_azureboard_index.json",
-    "boards": [{
+    "boards": [
+      {
         "vid": "0483",
         "pid": "374b",
         "name": "MXCHIP AZ3166",
         "package": "AZ3166",
         "architecture": "stm32f4",
-        "id": "MXCHIP_AZ3166"
-    }]
-}]
+        "id": "MXCHIP_AZ3166",
+        "interface": "stlink-v2-1.cfg",
+        "target": "stm32f4x.cfg"
+      }
+    ]
+  }
+]