Merge branch 'release/v2.0.0'

platformio · May 4, 2017 · 19bf2f7 · 19bf2f7
2 parents 4b272e1 + 2764fdf
commit 19bf2f7
Show file tree

Hide file tree

Showing 64 changed files with 1,307 additions and 358 deletions.
diff --git a/boards/armstrap_eagle1024.json b/boards/armstrap_eagle1024.json
@@ -1,22 +1,34 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F40_41xxx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "armstrap_eagle_1024.ld", 
-    "mcu": "stm32f417vgt6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F40_41xxx",
+    "f_cpu": "168000000L",
+    "ldscript": "armstrap_eagle_1024.ld",
+    "mcu": "stm32f417vgt6",
     "variant": "stm32f4"
-  }, 
+  },
   "frameworks": [
-    "cmsis", 
+    "cmsis",
     "spl"
-  ], 
-  "name": "Armstrap Eagle 1024", 
+  ],
+  "name": "Armstrap Eagle 1024",
   "upload": {
-    "maximum_ram_size": 196608, 
+    "maximum_ram_size": 196608,
     "maximum_size": 1048576
-  }, 
-  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html",
   "vendor": "Armstrap"
 }
diff --git a/boards/armstrap_eagle2048.json b/boards/armstrap_eagle2048.json
@@ -1,22 +1,34 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F427_437xx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "armstrap_eagle_2048.ld", 
-    "mcu": "stm32f427vit6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F427_437xx",
+    "f_cpu": "168000000L",
+    "ldscript": "armstrap_eagle_2048.ld",
+    "mcu": "stm32f427vit6",
     "variant": "stm32f4"
-  }, 
+  },
   "frameworks": [
-    "cmsis", 
+    "cmsis",
     "spl"
-  ], 
-  "name": "Armstrap Eagle 2048", 
+  ],
+  "name": "Armstrap Eagle 2048",
   "upload": {
-    "maximum_ram_size": 262144, 
+    "maximum_ram_size": 262144,
     "maximum_size": 2091752
-  }, 
-  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html",
   "vendor": "Armstrap"
 }
diff --git a/boards/armstrap_eagle512.json b/boards/armstrap_eagle512.json
@@ -1,22 +1,34 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F40_41xxx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "armstrap_eagle_512.ld", 
-    "mcu": "stm32f407vet6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F40_41xxx",
+    "f_cpu": "168000000L",
+    "ldscript": "armstrap_eagle_512.ld",
+    "mcu": "stm32f407vet6",
     "variant": "stm32f4"
-  }, 
+  },
   "frameworks": [
-    "cmsis", 
+    "cmsis",
     "spl"
-  ], 
-  "name": "Armstrap Eagle 512", 
+  ],
+  "name": "Armstrap Eagle 512",
   "upload": {
-    "maximum_ram_size": 196608, 
+    "maximum_ram_size": 196608,
     "maximum_size": 524288
-  }, 
-  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html",
   "vendor": "Armstrap"
 }
diff --git a/boards/b96b_f446ve.json b/boards/b96b_f446ve.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "168000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "168000000L",
     "mcu": "stm32f446vet6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "96Boards B96B-F446VE", 
+  ],
+  "name": "96Boards B96B-F446VE",
   "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-B96B-F446VE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-B96B-F446VE/",
   "vendor": "96Boards"
 }
diff --git a/boards/bluepill_f103c8.json b/boards/bluepill_f103c8.json
@@ -7,9 +7,45 @@
     "mcu": "stm32f103c8t6",
     "variant": "stm32f1"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": [
-    "mbed",
-    "arduino"
+    "arduino",
+    "mbed"
   ],
   "name": "BluePill F103C8",
   "upload": {

diff --git a/boards/disco_f030r8.json b/boards/disco_f030r8.json
@@ -0,0 +1,30 @@
+{
+  "build": {
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
+    "mcu": "stm32f030r8t6"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "ST STM32F0308DISCOVERY",
+  "upload": {
+    "maximum_ram_size": 8192,
+    "maximum_size": 65536,
+    "protocol": "stlink"
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f0discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/en/evaluation-tools/32f0308discovery.html",
+  "vendor": "ST"
+}
diff --git a/boards/disco_f051r8.json b/boards/disco_f051r8.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f051r8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST STM32F0DISCOVERY", 
+  ],
+  "name": "ST STM32F0DISCOVERY",
   "upload": {
-    "maximum_ram_size": 8192, 
-    "maximum_size": 65536, 
+    "maximum_ram_size": 8192,
+    "maximum_size": 65536,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f0discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215",
   "vendor": "ST"
 }
diff --git a/boards/disco_f100rb.json b/boards/disco_f100rb.json
@@ -1,18 +1,34 @@
 {
   "build": {
-    "cpu": "cortex-m3", 
-    "f_cpu": "24000000L", 
+    "cpu": "cortex-m3",
+    "f_cpu": "24000000L",
     "mcu": "stm32f100rbt6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST STM32VLDISCOVERY", 
+  ],
+  "name": "ST STM32VLDISCOVERY",
   "upload": {
-    "maximum_ram_size": 8192, 
-    "maximum_size": 131072, 
+    "maximum_ram_size": 8192,
+    "maximum_size": 131072,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863",
   "vendor": "ST"
 }