fix path for NUCLEO variants

add arduino framework boards
fix tabs to spaces
2017-05-08 10:06:08 +03:00 · 2017-05-08 09:44:58 +03:00 · 2017-05-07 21:30:59 +03:00 · 2017-05-07 21:19:24 +03:00 · 2017-05-05 14:22:18 +03:00 · 2017-05-05 11:38:47 +03:00
119 changed files with 2228 additions and 537 deletions
--- a/README.md
+++ b/README.md
@ -5,11 +5,11 @@
 The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.

 * [Home](http://platformio.org/platforms/ststm32) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/en/stable/platforms/ststm32.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Documentation](http://docs.platformio.org/page/platforms/ststm32.html) (advanced usage, packages, boards, frameworks, etc.)

 # Usage

-1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html)
+1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
 2. Install ST STM32 development platform:
 ```bash
 # install the latest stable version
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- a/boards/black_F407VE.json
+++ b/boards/black_F407VE.json
@ -0,0 +1,19 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "168000000L",
+	"extra_flags": "-DSTM32F4 -DSTM32F407VE -DSTM32F40_41xxx", 
+    "mcu": "stm32f407vet6"
+  },
+  "frameworks": [
+    "mbed",
+    "arduino"
+  ],
+  "name": "Black F407VE",
+  "upload": {
+    "maximum_ram_size": 196608,
+    "maximum_size": 524288
+  },
+  "url": "",
+  "vendor": ""
+}
--- a/boards/black_F407ZE.json
+++ b/boards/black_F407ZE.json
@ -0,0 +1,18 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "168000000L",
+	"extra_flags": "-DSTM32F407ZE", 
+    "mcu": "stm32f407zet6"
+  },
+  "frameworks": [    
+    "arduino"
+  ],
+  "name": "Black F407ZE",
+  "upload": {
+    "maximum_ram_size": 196608,
+    "maximum_size": 1048576
+  },
+  "url": "",
+  "vendor": ""
+}
--- a/boards/black_F407ZG.json
+++ b/boards/black_F407ZG.json
@ -0,0 +1,19 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "168000000L",
+	"extra_flags": "-DSTM32F407ZG", 
+    "mcu": "stm32f407zgt6"
+  },
+  "frameworks": [
+    "mbed",
+    "arduino"
+  ],
+  "name": "Black F407ZG",
+  "upload": {
+    "maximum_ram_size": 196608,
+    "maximum_size": 1048576
+  },
+  "url": "",
+  "vendor": ""
+}
--- 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": {
--- 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"
+}
--- 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"
 }
--- 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"
 }
--- a/boards/disco_f303vc.json
+++ b/boards/disco_f303vc.json
@ -1,25 +1,37 @@
 {
  "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F3 -DSTM32F303xC", 
-    "f_cpu": "72000000L", 
-    "ldscript": "stm32f30xx.ld", 
-    "mcu": "stm32f303vct6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F3 -DSTM32F303xC",
+    "f_cpu": "72000000L",
+    "ldscript": "stm32f30xx.ld",
+    "mcu": "stm32f303vct6",
    "variant": "stm32f303xc"
-  }, 
+  },
  "frameworks": [
-    "mbed", 
-    "cmsis", 
-    "spl", 
+    "mbed",
+    "cmsis",
+    "spl",
    "libopencm3"
-  ], 
-  "name": "ST STM32F3DISCOVERY", 
+  ],
+  "name": "ST STM32F3DISCOVERY",
  "upload": {
-    "maximum_ram_size": 49152, 
-    "maximum_size": 262144, 
+    "maximum_ram_size": 49152,
+    "maximum_size": 262144,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f3discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044",
  "vendor": "ST"
 }
--- a/boards/disco_f334c8.json
+++ b/boards/disco_f334c8.json
@ -1,18 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
    "mcu": "stm32f334c8t6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST 32F3348DISCOVERY", 
+  ],
+  "name": "ST 32F3348DISCOVERY",
  "upload": {
-    "maximum_ram_size": 12288, 
-    "maximum_size": 65536, 
+    "maximum_ram_size": 12288,
+    "maximum_size": 65536,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/en/catalog/tools/PF260318", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f334discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/en/catalog/tools/PF260318",
  "vendor": "ST"
 }
--- a/boards/disco_f401vc.json
+++ b/boards/disco_f401vc.json
@ -1,18 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "84000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "84000000L",
    "mcu": "stm32f401vct6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST 32F401CDISCOVERY", 
+  ],
+  "name": "ST 32F401CDISCOVERY",
  "upload": {
-    "maximum_ram_size": 65536, 
-    "maximum_size": 262144, 
+    "maximum_ram_size": 65536,
+    "maximum_size": 262144,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f4discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098",
  "vendor": "ST"
 }
--- a/boards/disco_f407vg.json
+++ b/boards/disco_f407vg.json
@ -1,25 +1,38 @@
 {
  "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F4 -DSTM32F407xx -DSTM32F40_41xxx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "stm32f405x6.ld", 
-    "mcu": "stm32f407vgt6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F407xx -DSTM32F40_41xxx",
+    "f_cpu": "168000000L",
+    "ldscript": "stm32f405x6.ld",
+    "mcu": "stm32f407vgt6",
    "variant": "stm32f407xx"
-  }, 
+  },
  "frameworks": [
-    "mbed", 
-    "cmsis", 
-    "spl", 
-    "libopencm3"
-  ], 
-  "name": "ST STM32F4DISCOVERY", 
+    "mbed",
+    "cmsis",
+    "spl",
+    "libopencm3",
+    "arduino"
+  ],
+  "name": "ST STM32F4DISCOVERY",
  "upload": {
-    "maximum_ram_size": 131072, 
-    "maximum_size": 1048576, 
+    "maximum_ram_size": 131072,
+    "maximum_size": 1048576,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f4discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419",
  "vendor": "ST"
 }
--- a/boards/disco_f429zi.json
+++ b/boards/disco_f429zi.json
@ -1,18 +1,31 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "180000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "180000000L",
    "mcu": "stm32f429zit6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST 32F429IDISCOVERY", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST 32F429IDISCOVERY",
  "upload": {
-    "maximum_ram_size": 262144, 
-    "maximum_size": 2097152, 
+    "maximum_ram_size": 262144,
+    "maximum_size": 2097152,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f429discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090",
  "vendor": "ST"
 }
--- a/boards/disco_f469ni.json
+++ b/boards/disco_f469ni.json
@ -1,18 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "180000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "180000000L",
    "mcu": "stm32f469nih6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST 32F469IDISCOVERY", 
+  ],
+  "name": "ST 32F469IDISCOVERY",
  "upload": {
-    "maximum_ram_size": 393216, 
-    "maximum_size": 1048576, 
+    "maximum_ram_size": 393216,
+    "maximum_size": 1048576,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF262395", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f469discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF262395",
  "vendor": "ST"
 }
--- a/boards/disco_f746ng.json
+++ b/boards/disco_f746ng.json
@ -13,6 +13,18 @@
    "maximum_size": 1048576,
    "protocol": "stlink"
  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f7discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
  "url": "http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f746gdiscovery.html",
  "vendor": "ST"
 }
--- a/boards/disco_f769ni.json
+++ b/boards/disco_f769ni.json
@ -13,6 +13,18 @@
    "maximum_size": 1048576,
    "protocol": "2097152"
  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f7discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
  "url": "http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f769idiscovery.html",
  "vendor": "ST"
 }
--- a/boards/disco_l053c8.json
+++ b/boards/disco_l053c8.json
@ -1,18 +1,31 @@
 {
  "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "32000000L",
    "mcu": "stm32l053c8t6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST 32L0538DISCOVERY", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST 32L0538DISCOVERY",
  "upload": {
-    "maximum_ram_size": 8192, 
-    "maximum_size": 65536, 
+    "maximum_ram_size": 8192,
+    "maximum_size": 65536,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/en/catalog/tools/PF260319", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32l0discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/en/catalog/tools/PF260319",
  "vendor": "ST"
 }
--- a/boards/disco_l152rb.json
+++ b/boards/disco_l152rb.json
@ -1,24 +1,36 @@
 {
  "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m3", 
-    "extra_flags": "-DSTM32L1 -DSTM32L152xB -DSTM32L1XX_MD", 
-    "f_cpu": "32000000L", 
-    "ldscript": "stm32l15xx6.ld", 
-    "mcu": "stm32l152rbt6", 
+    "core": "stm32",
+    "cpu": "cortex-m3",
+    "extra_flags": "-DSTM32L1 -DSTM32L152xB -DSTM32L1XX_MD",
+    "f_cpu": "32000000L",
+    "ldscript": "stm32l15xx6.ld",
+    "mcu": "stm32l152rbt6",
    "variant": "stm32l152xb"
-  }, 
+  },
  "frameworks": [
-    "cmsis", 
-    "spl", 
+    "cmsis",
+    "spl",
    "libopencm3"
-  ], 
-  "name": "ST STM32LDISCOVERY", 
+  ],
+  "name": "ST STM32LDISCOVERY",
  "upload": {
-    "maximum_ram_size": 16384, 
-    "maximum_size": 131072, 
+    "maximum_ram_size": 16384,
+    "maximum_size": 131072,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l1.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515",
  "vendor": "ST"
 }
--- a/boards/disco_l476vg.json
+++ b/boards/disco_l476vg.json
@ -1,18 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
    "mcu": "stm32l476vgt6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST 32L476GDISCOVERY", 
+  ],
+  "name": "ST 32L476GDISCOVERY",
  "upload": {
-    "maximum_ram_size": 131072, 
-    "maximum_size": 1048576, 
+    "maximum_ram_size": 131072,
+    "maximum_size": 1048576,
    "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF261635", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32l4discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF261635",
  "vendor": "ST"
 }
--- a/boards/elmo_f411re.json
+++ b/boards/elmo_f411re.json
@ -0,0 +1,28 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
+    "mcu": "stm32f411ret6"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "Espotel LoRa Module",
+  "upload": {
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/Espotel-ELMO/",
+  "vendor": "Espotel"
+}
--- a/boards/genericSTM32F103C8.json
+++ b/boards/genericSTM32F103C8.json
@ -12,6 +12,42 @@
    "mcu": "stm32f103c8",
    "variant": "generic_stm32f103c"
  },
+  "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": ["arduino"],
  "name": "STM32F103C8 (20k RAM. 64k Flash)",
  "upload": {
--- a/boards/genericSTM32F103CB.json
+++ b/boards/genericSTM32F103CB.json
@ -12,6 +12,42 @@
    "mcu": "stm32f103cb",
    "variant": "generic_stm32f103c"
  },
+  "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": ["arduino"],
  "name": "STM32F103CB (20k RAM. 128k Flash)",
  "upload": {
--- a/boards/genericSTM32F103R8.json
+++ b/boards/genericSTM32F103R8.json
@ -12,6 +12,42 @@
    "mcu": "stm32f103r8",
    "variant": "generic_stm32f103r8"
  },
+  "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": ["arduino"],
  "name": "STM32F103R8 (20k RAM. 64 Flash)",
  "upload": {
--- a/boards/genericSTM32F103RB.json
+++ b/boards/genericSTM32F103RB.json
@ -12,6 +12,42 @@
    "mcu": "stm32f103rb",
    "variant": "generic_stm32f103r8"
  },
+  "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": ["arduino"],
  "name": "STM32F103RB (20k RAM. 128k Flash)",
  "upload": {
--- a/boards/genericSTM32F103RC.json
+++ b/boards/genericSTM32F103RC.json
@ -12,6 +12,42 @@
    "mcu": "stm32f103rc",
    "variant": "generic_stm32f103r"
  },
+  "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": ["arduino"],
  "name": "STM32F103RC (48k RAM. 256k Flash)",
  "upload": {
--- a/boards/genericSTM32F103RE.json
+++ b/boards/genericSTM32F103RE.json
@ -12,6 +12,42 @@
    "mcu": "stm32f103re",
    "variant": "generic_stm32f103r"
  },
+  "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": ["arduino"],
  "name": "STM32F103RE (64k RAM. 512k Flash)",
  "upload": {
--- a/boards/maple.json
+++ b/boards/maple.json
@ -9,21 +9,18 @@
        ["0x1EAF", "0x0004"]
    ],
    "ldscript": "flash.ld",
-    "mcu": "stm32f103rb_maple",
+    "mcu": "stm32f103rb",
    "variant": "maple"
  },
  "frameworks": ["arduino"],
-  "name": "Olimexino STM32 (Maple)",
+  "name": "Maple",
  "upload": {
-    "disable_flushing": false,
-    "maximum_ram_size": 17000,
-    "maximum_size": 108000,
+    "maximum_ram_size": 17408,
+    "maximum_size": 110592,
    "protocol": "dfu",
    "boot_version": 1,
-    "require_upload_port": true,
-    "use_1200bps_touch": false,
-    "wait_for_upload_port": false
+    "require_upload_port": true
  },
-  "url": "https://www.olimex.com/Products/Duino/STM32/OLIMEXINO-STM32/",
-  "vendor": "Olimex"
+  "url": "http://www.leaflabs.com/maple/",
+  "vendor": "LeafLabs"
 }
--- a/boards/maple_mini_b20.json
+++ b/boards/maple_mini_b20.json
@ -0,0 +1,26 @@
+{
+  "build": {
+    "core": "maple",
+    "cpu": "cortex-m3",
+    "extra_flags": "-DARDUINO_MAPLE_MINI -DMCU_STM32F103CB",
+    "f_cpu": "72000000L",
+    "hwids": [
+        ["0x1EAF", "0x0003"],
+        ["0x1EAF", "0x0004"]
+    ],
+    "ldscript": "flash.ld",
+    "mcu": "stm32f103cb",
+    "variant": "maple_mini"
+  },
+  "frameworks": ["arduino"],
+  "name": "Maple Mini Bootloader 2.0",
+  "upload": {
+    "maximum_ram_size": 20480,
+    "maximum_size": 122880,
+    "protocol": "dfu",
+    "boot_version": 2,
+    "require_upload_port": true
+  },
+  "url": "http://www.leaflabs.com/maple/",
+  "vendor": "LeafLabs"
+}
--- a/boards/maple_mini_origin.json
+++ b/boards/maple_mini_origin.json
@ -0,0 +1,26 @@
+{
+  "build": {
+    "core": "maple",
+    "cpu": "cortex-m3",
+    "extra_flags": "-DARDUINO_MAPLE_MINI -DMCU_STM32F103CB",
+    "f_cpu": "72000000L",
+    "hwids": [
+        ["0x1EAF", "0x0003"],
+        ["0x1EAF", "0x0004"]
+    ],
+    "ldscript": "flash.ld",
+    "mcu": "stm32f103cb",
+    "variant": "maple_mini"
+  },
+  "frameworks": ["arduino"],
+  "name": "Maple Mini Original",
+  "upload": {
+    "maximum_ram_size": 17408,
+    "maximum_size": 110592,
+    "protocol": "dfu",
+    "boot_version": 1,
+    "require_upload_port": true
+  },
+  "url": "http://www.leaflabs.com/maple/",
+  "vendor": "LeafLabs"
+}
--- a/boards/mote_l152rc.json
+++ b/boards/mote_l152rc.json
@ -0,0 +1,28 @@
+{
+  "build": {
+    "cpu": "cortex-m3",
+    "f_cpu": "32000000L",
+    "mcu": "stm32l152rc"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "NAMote72",
+  "upload": {
+    "maximum_ram_size": 32768,
+    "maximum_size": 262144
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l1.cfg"]
+        }
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/NAMote-72/",
+  "vendor": "Semtech"
+}
--- a/boards/mts_dragonfly_f411re.json
+++ b/boards/mts_dragonfly_f411re.json
@ -0,0 +1,28 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
+    "mcu": "stm32f411ret6"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "MTS Dragonfly",
+  "upload": {
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/MTS-Dragonfly/",
+  "vendor": "MultiTech"
+}
--- a/boards/mts_mdot_f405rg.json
+++ b/boards/mts_mdot_f405rg.json
@ -12,6 +12,17 @@
    "maximum_ram_size": 131072,
    "maximum_size": 524288
  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
  "url": "https://developer.mbed.org/platforms/MTS-mDot-F411/",
  "vendor": "MultiTech"
 }
--- a/boards/mts_mdot_f411re.json
+++ b/boards/mts_mdot_f411re.json
@ -1,17 +1,28 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "100000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
    "mcu": "stm32f411ret6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "MultiTech mDot F411", 
+  ],
+  "name": "MultiTech mDot F411",
  "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
    "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/MTS-mDot-F411/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/MTS-mDot-F411/",
  "vendor": "MultiTech"
 }
--- a/boards/nucleo_f030r8.json
+++ b/boards/nucleo_f030r8.json
@ -1,17 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
    "mcu": "stm32f030r8t6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST Nucleo F030R8", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST Nucleo F030R8",
  "upload": {
-    "maximum_ram_size": 8192, 
+    "maximum_ram_size": 8192,
    "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F030R8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F030R8/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f031k6.json
+++ b/boards/nucleo_f031k6.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
    "mcu": "stm32f031k6t6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F031K6", 
+  ],
+  "name": "ST Nucleo F031K6",
  "upload": {
-    "maximum_ram_size": 4096, 
+    "maximum_ram_size": 4096,
    "maximum_size": 32768
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F031K6/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F031K6/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f042k6.json
+++ b/boards/nucleo_f042k6.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
    "mcu": "stm32f042k6t6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F042K6", 
+  ],
+  "name": "ST Nucleo F042K6",
  "upload": {
-    "maximum_ram_size": 6144, 
+    "maximum_ram_size": 6144,
    "maximum_size": 32768
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F042K6/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F042K6/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f070rb.json
+++ b/boards/nucleo_f070rb.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
    "mcu": "stm32f070rbt6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F070RB", 
+  ],
+  "name": "ST Nucleo F070RB",
  "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
    "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F070RB/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F070RB/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f072rb.json
+++ b/boards/nucleo_f072rb.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
    "mcu": "stm32f072rbt6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F072RB", 
+  ],
+  "name": "ST Nucleo F072RB",
  "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
    "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F072RB/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F072RB/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f091rc.json
+++ b/boards/nucleo_f091rc.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
    "mcu": "stm32f091rct6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F091RC", 
+  ],
+  "name": "ST Nucleo F091RC",
  "upload": {
-    "maximum_ram_size": 32768, 
+    "maximum_ram_size": 32768,
    "maximum_size": 262144
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F091RC/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F091RC/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f103rb.json
+++ b/boards/nucleo_f103rb.json
@ -1,21 +1,34 @@
 {
  "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m3", 
-    "f_cpu": "72000000L", 
-    "ldscript": "stm32f103xb.ld", 
-    "mcu": "stm32f103rbt6", 
+    "core": "stm32",
+    "cpu": "cortex-m3",
+    "f_cpu": "72000000L",
+    "ldscript": "stm32f103xb.ld",
+    "mcu": "stm32f103rbt6",
    "variant": "stm32f1"
-  }, 
+  },
  "frameworks": [
-    "mbed", 
-    "libopencm3"
-  ], 
-  "name": "ST Nucleo F103RB", 
+    "mbed",
+    "libopencm3",
+    "arduino"
+  ],
+  "name": "ST Nucleo F103RB",
  "upload": {
-    "maximum_ram_size": 20480, 
+    "maximum_ram_size": 20480,
    "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F103RB/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f103rb.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F103RB/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f207zg.json
+++ b/boards/nucleo_f207zg.json
@ -13,6 +13,22 @@
    "maximum_ram_size": 131072,
    "maximum_size": 1048576
  },
+  "debug": {
+    "tools": {
+      "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/stm32f2x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F207ZG/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f302r8.json
+++ b/boards/nucleo_f302r8.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
    "mcu": "stm32f302r8t6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F302R8", 
+  ],
+  "name": "ST Nucleo F302R8",
  "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
    "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F302R8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F302R8/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f303k8.json
+++ b/boards/nucleo_f303k8.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
    "mcu": "stm32f303k8t6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F303K8", 
+  ],
+  "name": "ST Nucleo F303K8",
  "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
    "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F303K8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F303K8/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f303re.json
+++ b/boards/nucleo_f303re.json
@ -1,17 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
    "mcu": "stm32f303ret6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST Nucleo F303RE", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST Nucleo F303RE",
  "upload": {
-    "maximum_ram_size": 65536, 
+    "maximum_ram_size": 65536,
    "maximum_size": 524288
-  }, 
-  "url": "http://developer.mbed.org/platforms/ST-Nucleo-F303RE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://developer.mbed.org/platforms/ST-Nucleo-F303RE/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f303ze.json
+++ b/boards/nucleo_f303ze.json
@ -0,0 +1,29 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
+    "mcu": "stm32f303zet6"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "ST Nucleo F303ZE",
+  "upload": {
+    "maximum_ram_size": 65536,
+    "maximum_size": 524288
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F303ZE/",
+  "vendor": "ST"
+}
--- a/boards/nucleo_f334r8.json
+++ b/boards/nucleo_f334r8.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
    "mcu": "stm32f334r8t6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F334R8", 
+  ],
+  "name": "ST Nucleo F334R8",
  "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
    "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F334R8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F334R8/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f401re.json
+++ b/boards/nucleo_f401re.json
@ -1,23 +1,36 @@
 {
  "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F4 -DSTM32F401xE -DSTM32F40_41xxx", 
-    "f_cpu": "84000000L", 
-    "ldscript": "stm32f401xe.ld", 
-    "mcu": "stm32f401ret6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F401xE -DSTM32F40_41xxx",
+    "f_cpu": "84000000L",
+    "ldscript": "stm32f401xe.ld",
+    "mcu": "stm32f401ret6",
    "variant": "stm32f401xe"
-  }, 
+  },
  "frameworks": [
-    "mbed", 
-    "cmsis", 
-    "spl"
-  ], 
-  "name": "ST Nucleo F401RE", 
+    "mbed",
+    "cmsis",
+    "spl",
+    "arduino"
+  ],
+  "name": "ST Nucleo F401RE",
  "upload": {
-    "maximum_ram_size": 98304, 
+    "maximum_ram_size": 98304,
    "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F401RE/", 
+  },
+  "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-Nucleo-F401RE/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f410rb.json
+++ b/boards/nucleo_f410rb.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "100000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
    "mcu": "stm32f410rbt6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F410RB", 
+  ],
+  "name": "ST Nucleo F410RB",
  "upload": {
-    "maximum_ram_size": 32768, 
+    "maximum_ram_size": 32768,
    "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F410RB/", 
+  },
+  "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-Nucleo-F410RB/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f411re.json
+++ b/boards/nucleo_f411re.json
@ -1,17 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "100000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
    "mcu": "stm32f411ret6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST Nucleo F411RE", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST Nucleo F411RE",
  "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
    "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F411RE/", 
+  },
+  "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-Nucleo-F411RE/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f429zi.json
+++ b/boards/nucleo_f429zi.json
@ -12,6 +12,18 @@
    "maximum_ram_size": 262144,
    "maximum_size": 2097152
  },
+  "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-Nucleo-F429ZI/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f446re.json
+++ b/boards/nucleo_f446re.json
@ -1,17 +1,29 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "180000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "180000000L",
    "mcu": "stm32f446ret6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo F446RE", 
+  ],
+  "name": "ST Nucleo F446RE",
  "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
    "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F446RE/", 
+  },
+  "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-Nucleo-F446RE/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f446ze.json
+++ b/boards/nucleo_f446ze.json
@ -12,6 +12,18 @@
    "maximum_ram_size": 131072,
    "maximum_size": 524288
  },
+  "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-Nucleo-F446ZE/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f746zg.json
+++ b/boards/nucleo_f746zg.json
@ -12,6 +12,22 @@
    "maximum_ram_size": 327680,
    "maximum_size": 1048576
  },
+  "debug": {
+    "tools": {
+      "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/stm32f7x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/",
  "vendor": "ST"
 }
--- a/boards/nucleo_f767zi.json
+++ b/boards/nucleo_f767zi.json
@ -12,6 +12,22 @@
    "maximum_ram_size": 524288,
    "maximum_size": 2097152
  },
+  "debug": {
+    "tools": {
+      "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/stm32f7x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F767ZI/",
  "vendor": "ST"
 }
--- a/boards/nucleo_l011k4.json
+++ b/boards/nucleo_l011k4.json
@ -12,6 +12,22 @@
    "maximum_ram_size": 2048,
    "maximum_size": 16384
  },
+  "debug": {
+    "tools": {
+      "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/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L011K4/",
  "vendor": "ST"
 }
--- a/boards/nucleo_l031k6.json
+++ b/boards/nucleo_l031k6.json
@ -1,17 +1,33 @@
 {
  "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "32000000L",
    "mcu": "stm32l031k6t6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo L031K6", 
+  ],
+  "name": "ST Nucleo L031K6",
  "upload": {
-    "maximum_ram_size": 8192, 
+    "maximum_ram_size": 8192,
    "maximum_size": 32768
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L031K6/", 
+  },
+  "debug": {
+    "tools": {
+      "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/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L031K6/",
  "vendor": "ST"
 }
--- a/boards/nucleo_l053r8.json
+++ b/boards/nucleo_l053r8.json
@ -1,17 +1,34 @@
 {
  "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
    "mcu": "stm32l053r8t6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST Nucleo L053R8", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST Nucleo L053R8",
  "upload": {
-    "maximum_ram_size": 8192, 
+    "maximum_ram_size": 8192,
    "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L053R8/", 
+  },
+  "debug": {
+    "tools": {
+      "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/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L053R8/",
  "vendor": "ST"
 }
--- a/boards/nucleo_l073rz.json
+++ b/boards/nucleo_l073rz.json
@ -1,17 +1,33 @@
 {
  "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "32000000L",
    "mcu": "stm32l073rz"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo L073RZ", 
+  ],
+  "name": "ST Nucleo L073RZ",
  "upload": {
-    "maximum_ram_size": 20480, 
+    "maximum_ram_size": 20480,
    "maximum_size": 196608
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L073RZ/", 
+  },
+  "debug": {
+    "tools": {
+      "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/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L073RZ/",
  "vendor": "ST"
 }
--- a/boards/nucleo_l152re.json
+++ b/boards/nucleo_l152re.json
@ -1,17 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m3", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m3",
+    "f_cpu": "32000000L",
    "mcu": "stm32l152ret6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST Nucleo L152RE", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST Nucleo L152RE",
  "upload": {
-    "maximum_ram_size": 81920, 
+    "maximum_ram_size": 81920,
    "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L152RE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l1.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L152RE/",
  "vendor": "ST"
 }
--- a/boards/nucleo_l432kc.json
+++ b/boards/nucleo_l432kc.json
@ -1,17 +1,33 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
    "mcu": "stm32l432kcu6"
-  }, 
+  },
  "frameworks": [
    "mbed"
-  ], 
-  "name": "ST Nucleo L432KC", 
+  ],
+  "name": "ST Nucleo L432KC",
  "upload": {
-    "maximum_ram_size": 65536, 
+    "maximum_ram_size": 65536,
    "maximum_size": 262144
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L432KC/", 
+  },
+  "debug": {
+    "tools": {
+      "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/stm32l4x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L432KC/",
  "vendor": "ST"
 }
--- a/boards/nucleo_l476rg.json
+++ b/boards/nucleo_l476rg.json
@ -1,17 +1,30 @@
 {
  "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
    "mcu": "stm32l476rgt6"
-  }, 
+  },
  "frameworks": [
-    "mbed"
-  ], 
-  "name": "ST Nucleo L476RG", 
+    "mbed",
+    "arduino"
+  ],
+  "name": "ST Nucleo L476RG",
  "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
    "maximum_size": 1048576
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L476RG/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l476rg.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L476RG/",
  "vendor": "ST"
 }
--- a/boards/seeedArchMax.json
+++ b/boards/seeedArchMax.json
@ -12,6 +12,18 @@
    "maximum_ram_size": 196608,
    "maximum_size": 524288
  },
+  "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/Seeed-Arch-Max/",
  "vendor": "SeeedStudio"
 }
--- a/boards/ublox_evk_odin_w2.json
+++ b/boards/ublox_evk_odin_w2.json
@ -0,0 +1,28 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "f_cpu": "168000000L",
+    "mcu": "stm32f439ziy6"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "u-blox EVK-ODIN-W2",
+  "upload": {
+    "maximum_ram_size": 262144,
+    "maximum_size": 2097152
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ublox-EVK-ODIN-W2/",
+  "vendor": "u-blox"
+}
--- a/boards/xdot_l151cc.json
+++ b/boards/xdot_l151cc.json
@ -0,0 +1,17 @@
+{
+  "build": {
+    "cpu": "cortex-m3",
+    "f_cpu": "32000000L",
+    "mcu": "stm32l151ccu6"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "MultiTech xDot",
+  "upload": {
+    "maximum_ram_size": 32768,
+    "maximum_size": 262144
+  },
+  "url": "https://developer.mbed.org/platforms/MTS-xDot-L151CC/",
+  "vendor": "MultiTech"
+}
--- a/builder/frameworks/arduino.py
+++ b/builder/frameworks/arduino.py
@ -24,108 +24,319 @@ http://www.stm32duino.com

 from os.path import isdir, join

-from SCons.Script import DefaultEnvironment
+from SCons.Script import COMMAND_LINE_TARGETS, DefaultEnvironment
+
+import pdb

 env = DefaultEnvironment()
-platform = env.PioPlatform()
-board = env.BoardConfig()

-if board.id == "bluepill_f103c8":
-    board = env.BoardConfig("genericSTM32F103C8")
-    env['LDSCRIPT_PATH'] = board.get("build.ldscript")
-    env.ProcessFlags(board.get("build.extra_flags"))
+#print env.get("CPPDEFINES")

+#resolve variant folder from board name
+def getVariantFromBoard(boardi):
+    var_folder="";

-FRAMEWORK_DIR = join(platform.get_package_dir(
-    "framework-arduinoststm32"), "STM32F1")
-FRAMEWORK_VERSION = platform.get_package_version("framework-arduinoststm32")
-assert isdir(FRAMEWORK_DIR)
+    boardMappings = {
+        "bluepill_f103c8":"BLUEPILL",
+        "genericSTM32F103CB":"BLUEPILL",
+        "genericSTM32F103C8":"BLUEPILL",
+        "maple_mini_b20":"MAPLE_MINI",
+        "black_F407VE":"BLACK_F407VE",
+        "black_F407ZE":"BLACK_F407ZE",
+        "black_F407ZG":"BLACK_F407ZG"
+    }

-env.Append(
-    CCFLAGS=[
-        "--param", "max-inline-insns-single=500",
-        "-march=armv7-m"
-    ],
+    #check board from mappings
+    if boardi in boardMappings:
+        var_folder=boardMappings[boardi].upper()

-    CPPDEFINES=[
-        "ARDUINO=10611",
-        "BOARD_%s" % board.get("build.variant"),
-        "ERROR_LED_PORT=GPIOB",
-        "ERROR_LED_PIN=1",
-        "DEBUG_LEVEL=DEBUG_NONE",
-        "__STM32F1__",
-        "ARDUINO_ARCH_STM32F1"
-    ],
+    #convert discovery boards
+    if boardi[:5].upper()=="DISCO":
+        a=boardi.split("_")
+        var_folder="DISCOVERY_"+a[1].upper()

-    CPPPATH=[
-        join(FRAMEWORK_DIR, "cores", board.get("build.core")),
-        join(FRAMEWORK_DIR, "system", "libmaple"),
-        join(FRAMEWORK_DIR, "system", "libmaple", "include"),
-        join(FRAMEWORK_DIR, "system", "libmaple", "usb", "stm32f1"),
-        join(FRAMEWORK_DIR, "system", "libmaple", "usb", "usb_lib")
-    ],
+    #convert nucleo boards
+    if boardi[:6].upper()=="NUCLEO":
+        a=boardi.split("_")
+        var_folder="NUCLEO_"+a[1].upper()

-    LIBPATH=[
-        join(FRAMEWORK_DIR, "variants",
-             board.get("build.variant"), "ld")
-    ],
+    if var_folder=="":
+        print "ERROR: could not get variant folder from board: "+boardi
+        
+    assert(var_folder!="")   
+    return var_folder;

-    LIBS=["c"]
-)
+#HAL MX based Arduino build
+def stm32generic():
+    print "stm32generic()"
+    env = DefaultEnvironment()
+    platform = env.PioPlatform()
+    board = env.BoardConfig()

-for item in ("-nostartfiles", "-nostdlib"):
-    if item in env['LINKFLAGS']:
-        env['LINKFLAGS'].remove(item)
+    FRAMEWORK_DIR = join(platform.get_package_dir(
+        "framework-arduinoSTM32GENERIC"), "STM32")
+    FRAMEWORK_VERSION = platform.get_package_version("framework-arduinoSTM32GENERIC")
+    assert isdir(FRAMEWORK_DIR)

-ld = board.get("build.ldscript")
+    #resolve some defines based on board's json file
+    mcuseries=board.get('build.mcu')[:7].upper();  #i.e. STM32F4
+    mcudefine=board.get('build.mcu')[:11].upper(); #i.e. STM32F407VG
+    boardi=env.get("BOARD");

-if env.subst("$UPLOAD_PROTOCOL") == "dfu":
-    if "stm32f103c" in board.get("build.mcu", ""):
-        ld = "bootloader_20.ld"
-    elif "stm32f103r" in board.get("build.mcu", ""):
-        ld = "bootloader.ld"
-    if "stm32f103rb_maple" in board.get("build.mcu", ""):
-        env.Append(CPPDEFINES=["VECT_TAB_ADDR=0x8005000", "SERIAL_USB"])
-    else:
-        env.Append(CPPDEFINES=[
-            "VECT_TAB_ADDR=0x8002000", "SERIAL_USB", "GENERIC_BOOTLOADER"])
-        env.Replace(LDSCRIPT_PATH=ld)
-else:
-    env.Append(CPPDEFINES=["VECT_TAB_ADDR=0x8000000"])
+    #map ststm32 board name to stm32generic variant folder for compiling etc.
+    var_folder=getVariantFromBoard(boardi)
+    print boardi+" --> " + var_folder;

-#
-# Lookup for specific core's libraries
-#
+    #print "var_folder="+var_folder;

-BOARD_CORELIBDIRNAME = board.get("build.core", "")
-env.Append(
-    LIBSOURCE_DIRS=[
-        join(FRAMEWORK_DIR, "libraries", "__cores__", BOARD_CORELIBDIRNAME),
-        join(FRAMEWORK_DIR, "libraries")
-    ]
-)
+    #enable FPU for F4 in building and linking
+    #this could be moved into genera
+    if mcuseries=="STM32F4":
+        #print "board is F4"
+        env.Append(
+        CCFLAGS=[
+            "-mfpu=fpv4-sp-d16",
+            "-mfloat-abi=hard"
+            ],
+        LINKFLAGS=[
+            "-mfloat-abi=hard",
+            "-mfpu=fpv4-sp-d16",
+            "-Wl,--entry=Reset_Handler",
+            "--specs=nano.specs"
+        ],
+    )

-#
-# Target: Build Core Library
-#
-
-libs = []
-
-if "build.variant" in board:
+    #
+    #flags and defines copied from platform.txt
+    #also could be possible to read from actual file and parse them here
+    #
    env.Append(
+        CXXFLAGS=[
+            "-fno-exceptions",
+            "-fno-rtti",
+            "-std=gnu++11",
+            "-fno-threadsafe-statics",
+            "-w",
+            ("-x","c++"),
+            "-CC",
+        ],
+        CFLAGS=[
+            "-std=gnu11",
+            "-MMD"
+        ],
+        CCFLAGS=[
+            "--param", "max-inline-insns-single=500",
+            "-ffunction-sections",
+            "-fdata-sections",
+            "-mthumb",
+            "--specs=nano.specs",
+            "-nostdlib"
+
+        ],
+        CPPDEFINES=[
+            ("ARDUINO", 10810),
+            mcuseries,
+            mcudefine,
+            "ARDUINO_ARCH_STM32",
+            ("HSE_VALUE", 8000000),
+            ("printf","iprintf")
+        ],
+
        CPPPATH=[
+            join(FRAMEWORK_DIR, "cores", "arduino","stm32"),
+            join(FRAMEWORK_DIR, "cores", "arduino"),
+            join(FRAMEWORK_DIR, "cores", "arduino","usb"),
+            join(FRAMEWORK_DIR, "system", "CMSIS"),
+            join(FRAMEWORK_DIR, "system", mcuseries, "CMSIS_Inc"),
+            join(FRAMEWORK_DIR, "system", mcuseries, "CMSIS_Src"),
+            join(FRAMEWORK_DIR, "system", mcuseries, "HAL_Inc"),
+            join(FRAMEWORK_DIR, "system", mcuseries, "HAL_Src"),
+            join(FRAMEWORK_DIR, "system", mcuseries, "stm32_chip"),
+
+            join(FRAMEWORK_DIR, "variants", var_folder),
+        ],
+
+        #for ldscript.ld
+        LIBPATH=[
            join(FRAMEWORK_DIR, "variants",
-                 board.get("build.variant"))
+                 var_folder)
        ]
    )
+   
+    env['LDSCRIPT_PATH'] = "ldscript.ld";
+
+    #
+    # upload handling copied from stm32duino, probably not relevant for this package
+    # copied here for reference, may be better to remove in the future
+    #
+    if env.subst("$UPLOAD_PROTOCOL") == "dfu":
+        if board.id in ("maple", "maple_mini_origin"):
+            env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8005000), "SERIAL_USB"])
+        else:
+            env.Append(CPPDEFINES=[
+                ("VECT_TAB_ADDR", 0x8002000), "SERIAL_USB", "GENERIC_BOOTLOADER"])
+
+            if "stm32f103r" in board.get("build.mcu", ""):
+                env.Replace(LDSCRIPT_PATH="bootloader.ld")
+            elif board.get("upload.boot_version", 0) == 2:
+                env.Replace(LDSCRIPT_PATH="bootloader_20.ld")
+    else:
+        env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8000000)])
+
+    #
+    # Lookup for specific core's libraries
+    #
+    env.Append(
+        LIBSOURCE_DIRS=[
+            join(FRAMEWORK_DIR, "libraries")
+      ]
+    )
+
+    #
+    # remove unrelevant flags for linking, they originate from build.py which sets defaults
+    # for all frameworks: mbed, etc.
+    #
+    libs = []
+
+    for item in ("-nostartfiles","-nostdlib"):
+        if item in env['LINKFLAGS']:
+            env['LINKFLAGS'].remove(item)
+
+    for item in ("stdc++","nosys"):
+        if item in env['LIBS']:
+            env['LIBS'].remove(item)
+
+    #
+    # Target: Build Core Library
+    #
+    libs.append(env.BuildSources(
+        join("$BUILD_DIR", "core"),
+        join(FRAMEWORK_DIR, "cores", "arduino"))
+        )
+
+    libs.append(env.BuildSources(
+        join("$BUILD_DIR", "variants", var_folder),
+        join(FRAMEWORK_DIR, "variants", var_folder)) )
+
+    #env.Prepend(LIBS=libs)
+
+
+def stm32duino():
+    env = DefaultEnvironment()
+    platform = env.PioPlatform()
+    board = env.BoardConfig()
+    print "stm32duino()";
+    if board.id == "bluepill_f103c8":
+        board = env.BoardConfig("genericSTM32F103C8")
+        env['LDSCRIPT_PATH'] = board.get("build.ldscript")
+        env.ProcessFlags(board.get("build.extra_flags"))
+
+
+    FRAMEWORK_DIR = join(platform.get_package_dir(
+        "framework-arduinoststm32"), "STM32F1")
+    FRAMEWORK_VERSION = platform.get_package_version("framework-arduinoststm32")
+    assert isdir(FRAMEWORK_DIR)
+
+    env.Append(
+        CCFLAGS=[
+            "--param", "max-inline-insns-single=500",
+            "-march=armv7-m"
+        ],
+
+        CPPDEFINES=[
+            ("ARDUINO", 10610),
+            "BOARD_%s" % board.get("build.variant"),
+            ("ERROR_LED_PORT", "GPIOB"),
+            ("ERROR_LED_PIN", 1),
+            ("DEBUG_LEVEL", "DEBUG_NONE"),
+            "__STM32F1__",
+            "ARDUINO_ARCH_STM32F1"
+        ],
+
+        CPPPATH=[
+            join(FRAMEWORK_DIR, "cores", board.get("build.core")),
+            join(FRAMEWORK_DIR, "system", "libmaple"),
+            join(FRAMEWORK_DIR, "system", "libmaple", "include"),
+            join(FRAMEWORK_DIR, "system", "libmaple", "usb", "stm32f1"),
+            join(FRAMEWORK_DIR, "system", "libmaple", "usb", "usb_lib")
+        ],
+
+        LIBPATH=[
+            join(FRAMEWORK_DIR, "variants",
+                 board.get("build.variant"), "ld")
+        ],
+
+        LIBS=["c"]
+    )
+
+    for item in ("-nostartfiles", "-nostdlib"):
+        if item in env['LINKFLAGS']:
+            env['LINKFLAGS'].remove(item)
+
+
+    if env.subst("$UPLOAD_PROTOCOL") == "dfu":
+        if board.id in ("maple", "maple_mini_origin"):
+            env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8005000), "SERIAL_USB"])
+        else:
+            env.Append(CPPDEFINES=[
+                ("VECT_TAB_ADDR", 0x8002000), "SERIAL_USB", "GENERIC_BOOTLOADER"])
+
+            if "stm32f103r" in board.get("build.mcu", ""):
+                env.Replace(LDSCRIPT_PATH="bootloader.ld")
+            elif board.get("upload.boot_version", 0) == 2:
+                env.Replace(LDSCRIPT_PATH="bootloader_20.ld")
+    else:
+        env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8000000)])
+
+
+    if "__debug" in COMMAND_LINE_TARGETS:
+        env.Append(CPPDEFINES=[
+            "SERIAL_USB", "GENERIC_BOOTLOADER",
+            ("CONFIG_MAPLE_MINI_NO_DISABLE_DEBUG", "1")
+        ])
+
+    #
+    # Lookup for specific core's libraries
+    #
+
+    BOARD_CORELIBDIRNAME = board.get("build.core", "")
+    env.Append(
+        LIBSOURCE_DIRS=[
+            join(FRAMEWORK_DIR, "libraries", "__cores__", BOARD_CORELIBDIRNAME),
+            join(FRAMEWORK_DIR, "libraries")
+        ]
+    )
+
+    #
+    # Target: Build Core Library
+    #
+
+    libs = []
+
+    if "build.variant" in board:
+        env.Append(
+            CPPPATH=[
+                join(FRAMEWORK_DIR, "variants",
+                     board.get("build.variant"))
+            ]
+        )
+        libs.append(env.BuildLibrary(
+            join("$BUILD_DIR", "FrameworkArduinoVariant"),
+            join(FRAMEWORK_DIR, "variants", board.get("build.variant"))
+        ))
+
    libs.append(env.BuildLibrary(
-        join("$BUILD_DIR", "FrameworkArduinoVariant"),
-        join(FRAMEWORK_DIR, "variants", board.get("build.variant"))
+        join("$BUILD_DIR", "FrameworkArduino"),
+        join(FRAMEWORK_DIR, "cores", board.get("build.core"))
    ))

-libs.append(env.BuildLibrary(
-    join("$BUILD_DIR", "FrameworkArduino"),
-    join(FRAMEWORK_DIR, "cores", board.get("build.core"))
-))
+    env.Prepend(LIBS=libs)
+
+if "USE_STM32GENERIC" in env.get("CPPDEFINES"):
+    print "USE STM32GENERIC"
+    stm32generic()
+else:
+    stm32duino()
+
+

-env.Prepend(LIBS=libs)
--- a/builder/frameworks/libopencm3
+++ b/builder/frameworks/libopencm3
@ -1 +1 @@
-Subproject commit 609cd63986b52d2cd5ae601b39ba4108068ea1a6
+Subproject commit d6568477b97cc90dcbf8cb57f1a967712937747a
--- a/builder/frameworks/mbed
+++ b/builder/frameworks/mbed
@ -1 +1 @@
-Subproject commit ac4e05206eccca8ad227c351826b7eaea27bd1d6
+Subproject commit 99c2b3604e4c91bb3af647e1ee678c0f334c7ee1
--- a/builder/main.py
+++ b/builder/main.py
@ -25,6 +25,7 @@ env.Replace(
    AS="arm-none-eabi-as",
    CC="arm-none-eabi-gcc",
    CXX="arm-none-eabi-g++",
+    GDB="arm-none-eabi-gdb",
    OBJCOPY="arm-none-eabi-objcopy",
    RANLIB="arm-none-eabi-ranlib",
    SIZETOOL="arm-none-eabi-size",
@ -49,7 +50,7 @@ env.Replace(
    ],

    CPPDEFINES=[
-        "F_CPU=$BOARD_F_CPU"
+        ("F_CPU", "$BOARD_F_CPU")
    ],

    LINKFLAGS=[
--- a/examples/arduino-blink/.travis.yml
+++ b/examples/arduino-blink/.travis.yml
@ -1,6 +1,6 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@ -8,10 +8,10 @@
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
--- a/examples/arduino-blink/README.rst
+++ b/examples/arduino-blink/README.rst
@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================

-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-ststm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/arduino-blink/lib/readme.txt
+++ b/examples/arduino-blink/lib/readme.txt
@ -34,5 +34,5 @@ include paths and build them.

 See additional options for PlatformIO Library Dependency Finder `lib_*`:

-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install

--- a/examples/arduino-blink/platformio.ini
+++ b/examples/arduino-blink/platformio.ini
@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html

 [env:maple]
 platform = ststm32
--- a/examples/arduino-external-libs/.travis.yml
+++ b/examples/arduino-external-libs/.travis.yml
@ -1,6 +1,6 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@ -8,10 +8,10 @@
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
--- a/examples/arduino-external-libs/README.rst
+++ b/examples/arduino-external-libs/README.rst
@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================

-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-ststm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/arduino-external-libs/lib/readme.txt
+++ b/examples/arduino-external-libs/lib/readme.txt
@ -34,5 +34,5 @@ include paths and build them.

 See additional options for PlatformIO Library Dependency Finder `lib_*`:

-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install

--- a/examples/arduino-external-libs/platformio.ini
+++ b/examples/arduino-external-libs/platformio.ini
@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html

 [env:maple]
 platform = ststm32
--- a/examples/arduino-internal-libs/.travis.yml
+++ b/examples/arduino-internal-libs/.travis.yml
@ -1,6 +1,6 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@ -8,10 +8,10 @@
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
--- a/examples/arduino-internal-libs/README.rst
+++ b/examples/arduino-internal-libs/README.rst
@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================

-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-ststm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/arduino-internal-libs/lib/readme.txt
+++ b/examples/arduino-internal-libs/lib/readme.txt
@ -34,5 +34,5 @@ include paths and build them.

 See additional options for PlatformIO Library Dependency Finder `lib_*`:

-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install

--- a/examples/arduino-internal-libs/platformio.ini
+++ b/examples/arduino-internal-libs/platformio.ini
@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html

 [env:maple]
 platform = ststm32
--- a/examples/cmsis-blink/.travis.yml
+++ b/examples/cmsis-blink/.travis.yml
@ -1,6 +1,6 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@ -8,10 +8,10 @@
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
--- a/examples/cmsis-blink/README.rst
+++ b/examples/cmsis-blink/README.rst
@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================

-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-ststm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/cmsis-blink/lib/readme.txt
+++ b/examples/cmsis-blink/lib/readme.txt
@ -34,5 +34,5 @@ include paths and build them.

 See additional options for PlatformIO Library Dependency Finder `lib_*`:

-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install

--- a/examples/cmsis-blink/platformio.ini
+++ b/examples/cmsis-blink/platformio.ini
@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html

 [env:disco_f407vg]
 platform = ststm32
--- a/examples/libopencm3-blink/.travis.yml
+++ b/examples/libopencm3-blink/.travis.yml
@ -1,6 +1,6 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@ -8,10 +8,10 @@
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
--- a/examples/libopencm3-blink/README.rst
+++ b/examples/libopencm3-blink/README.rst
@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================

-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-ststm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/libopencm3-blink/lib/readme.txt
+++ b/examples/libopencm3-blink/lib/readme.txt
@ -34,5 +34,5 @@ include paths and build them.

 See additional options for PlatformIO Library Dependency Finder `lib_*`:

-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install

--- a/examples/libopencm3-blink/platformio.ini
+++ b/examples/libopencm3-blink/platformio.ini
@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html

 [env:disco_f407vg]
 platform = ststm32
--- a/examples/mbed-blink/.travis.yml
+++ b/examples/mbed-blink/.travis.yml
@ -1,6 +1,6 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@ -8,10 +8,10 @@
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
--- a/examples/mbed-blink/README.rst
+++ b/examples/mbed-blink/README.rst
@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================

-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-ststm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/mbed-blink/lib/readme.txt
+++ b/examples/mbed-blink/lib/readme.txt
@ -34,5 +34,5 @@ include paths and build them.

 See additional options for PlatformIO Library Dependency Finder `lib_*`:

-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install

--- a/examples/mbed-blink/platformio.ini
+++ b/examples/mbed-blink/platformio.ini
@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html

 [env:disco_f407vg]
 platform = ststm32
@ -22,10 +22,10 @@ platform = ststm32
 framework = mbed
 board = disco_f100rb

-; [env:nucleo_f030r8]
-; platform = ststm32
-; framework = mbed
-; board = nucleo_f030r8
+[env:nucleo_f030r8]
+platform = ststm32
+framework = mbed
+board = nucleo_f030r8

 [env:nucleo_f103rb]
 platform = ststm32
@ -76,3 +76,18 @@ board = disco_l053c8
 platform = ststm32
 framework = mbed
 board = mts_mdot_f411re
+
+[env:elmo_f411re]
+platform = ststm32
+framework = mbed
+board = elmo_f411re
+
+[env:mote_l152rc]
+platform = ststm32
+framework = mbed
+board = mote_l152rc
+
+[env:mts_dragonfly_f411re]
+platform = ststm32
+framework = mbed
+board = mts_dragonfly_f411re
--- a/examples/mbed-dsp/.travis.yml
+++ b/examples/mbed-dsp/.travis.yml
@ -1,6 +1,6 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
@ -8,10 +8,10 @@
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
--- a/examples/mbed-dsp/README.rst
+++ b/examples/mbed-dsp/README.rst
@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================

-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-ststm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
--- a/examples/mbed-dsp/lib/readme.txt
+++ b/examples/mbed-dsp/lib/readme.txt
@ -34,5 +34,5 @@ include paths and build them.

 See additional options for PlatformIO Library Dependency Finder `lib_*`:

-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install

--- a/examples/mbed-dsp/platformio.ini
+++ b/examples/mbed-dsp/platformio.ini
@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html

 [env:disco_f407vg]
 platform = ststm32
@ -22,10 +22,10 @@ platform = ststm32
 framework = mbed
 board = disco_f100rb

-; [env:nucleo_f030r8]
-; platform = ststm32
-; framework = mbed
-; board = nucleo_f030r8
+[env:nucleo_f030r8]
+platform = ststm32
+framework = mbed
+board = nucleo_f030r8

 [env:nucleo_f103rb]
 platform = ststm32
@ -76,3 +76,18 @@ board = disco_l053c8
 platform = ststm32
 framework = mbed
 board = mts_mdot_f411re
+
+[env:elmo_f411re]
+platform = ststm32
+framework = mbed
+board = elmo_f411re
+
+[env:mote_l152rc]
+platform = ststm32
+framework = mbed
+board = mote_l152rc
+
+[env:mts_dragonfly_f411re]
+platform = ststm32
+framework = mbed
+board = mts_dragonfly_f411re
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael L	e70c347d61	fix path for NUCLEO variants	2017-05-08 10:06:08 +03:00
Michael L	95723340b7	add arduino framework boards	2017-05-08 09:44:58 +03:00
Michael L	43ff1a5a9a	fix tabs to spaces	2017-05-07 21:30:59 +03:00
Michael L	fbfb5fdfbf	add arduino 'framework-arduinoSTM32GENERIC' package for existing framework	2017-05-07 21:19:24 +03:00
Michael L	3bcd0d4a73	updates and cleanups	2017-05-05 14:22:18 +03:00
Michael L	be4fb7990c	Merge remote-tracking branch 'upstream/master' into develop	2017-05-05 11:38:47 +03:00
Michael L	769c046e63	rewrite builder and remove -nostdlib -nostartup from link flags	2017-05-05 11:25:14 +03:00
Ivan Kravets	19bf2f7343	Merge branch 'release/v2.0.0'	2017-05-04 17:29:51 +03:00
Ivan Kravets	2764fdf668	Bump version to 2.0.0	2017-05-04 17:29:37 +03:00
Michael L	b2b6ad65e9	initial support for STM32GENERIC with script modification	2017-05-04 16:37:07 +03:00
Michael L	dbaf886cd0	initial support for STM32GENERIC framework. Add Black F407 variants	2017-05-04 16:34:09 +03:00
Ivan Kravets	0f8030d1d1	Fix package type	2017-05-04 00:53:07 +03:00
Ivan Kravets	05928d2aab	Do not override reset config for OCD	2017-04-30 16:36:21 +03:00
Ivan Kravets	4e4475c9de	Update ST-Link to 1.3.1 // Issue #43	2017-04-29 20:26:34 +03:00
Ivan Kravets	ce05d292f2	Update debug configuration	2017-04-28 01:26:55 +03:00
Ivan Kravets	aab149d81d	Set srst_nogate for external ST-Link v2-1 debuggers	2017-04-15 17:05:36 +03:00
Ivan Kravets	f356e660f7	Add ST-Link-v2-1 debug tool for STM32F103	2017-04-15 13:17:24 +03:00
Ivan Kravets	21e0fcd802	New board STM32F0308DISCOVERY	2017-04-15 13:06:43 +03:00
Ivan Kravets	4a0eb471f0	Fix issue with flash erasing	2017-04-13 20:50:18 +03:00
Ivan Kravets	c28dbe7bfa	Use temporary breakpoints for debug	2017-04-13 19:59:53 +03:00
Ivan Kravets	b31bc3b413	Add specific macro when debug arduino-based project	2017-04-08 00:19:08 +03:00
Ivan Kravets	d65679de4a	Update debug tools	2017-04-07 23:56:56 +03:00
Ivan Kravets	65040d792a	Fix paths for OpenOCD 0.10.0	2017-04-06 18:25:26 +03:00
Ivan Kravets	6e5a1405e5	Better monitor reset before debug	2017-04-03 00:03:35 +03:00
Ivan Kravets	88eebe18be	Add new debug tool named Black Magic Probe	2017-04-01 21:56:55 +03:00
Ivan Kravets	a7a35dafbd	Automatically insert breakpoint for main	2017-04-01 18:01:39 +03:00
Ivan Kravets	0f7b27f13f	Initial debug configuration	2017-04-01 15:39:18 +03:00
Ivan Kravets	4b272e11cc	Merge branch 'release/v1.8.1'	2017-03-13 01:01:31 +02:00
Ivan Kravets	98205b72f0	Merge branch 'release/v1.8.1' into develop	2017-03-13 01:01:31 +02:00
Ivan Kravets	071bedd152	Bump version to 1.8.1	2017-03-13 01:01:24 +02:00
Ivan Kravets	ab1f965f47	Fix libopencm3 build script	2017-03-13 01:00:44 +02:00
Ivan Kravets	f85a882a1b	Merge branch 'release/v1.8.0'	2017-03-12 23:20:57 +02:00
Ivan Kravets	d1d767d555	Merge branch 'release/v1.8.0' into develop	2017-03-12 23:20:57 +02:00
Ivan Kravets	dc1c2d19dd	Bump version to 1.8.0	2017-03-12 23:20:47 +02:00
Valeriy Koval	9be0e9269f	Use latest builder and package for mbed framework	2017-03-12 19:33:29 +02:00
Ivan Kravets	4d3491c5c7	Update links to docs	2017-02-22 16:44:23 +02:00
Ivan Kravets	444579dfe6	Update links to docs	2017-02-22 16:31:05 +02:00
Ivan Kravets	0dcc606481	Update installation link to PIO Core	2017-02-22 16:08:28 +02:00
Ivan Kravets	51a2fd09e2	Merge branch 'release/v1.7.0'	2017-01-18 21:09:16 +02:00
Ivan Kravets	4ae19c8ad9	Merge branch 'release/v1.7.0' into develop	2017-01-18 21:09:16 +02:00
Ivan Kravets	246b46df06	Bump version to 1.7.0	2017-01-18 21:08:51 +02:00
Ivan Kravets	32758f1fe9	Add example with mbed-events library	2017-01-18 20:48:14 +02:00
Ivan Kravets	72dbb2c995	Merge branch 'release/v1.6.0'	2016-12-18 20:30:45 +02:00
Ivan Kravets	73f8272799	Merge branch 'release/v1.6.0' into develop	2016-12-18 20:30:45 +02:00
Ivan Kravets	d0b2a38773	Bump version to 1.6.0	2016-12-18 20:30:33 +02:00
Ivan Kravets	49c83731cc	Add support for new boards: Espotel LoRa Module, NAMote72, MTS Dragonfly, ST Nucleo F303ZE, u-blox EVK-ODIN-W2, MultiTech xDot	2016-12-18 20:20:07 +02:00
Ivan Kravets	eb55fd03f8	Update ARM mbed framework to 5.3.0/v131	2016-12-18 18:32:26 +02:00
Ivan Kravets	3a7e883ee2	Merge branch 'release/v1.5.0'	2016-12-07 21:54:04 +02:00
Ivan Kravets	15a9c20a28	Merge branch 'release/v1.5.0' into develop	2016-12-07 21:54:04 +02:00
Ivan Kravets	9bcc86a3c3	Bump version to 1.5.0	2016-12-07 21:53:58 +02:00
Ivan Kravets	a0a4bc058e	Revert back tests for nucleo_f030r8	2016-12-06 20:56:52 +02:00
Ivan Kravets	ed4151ea3d	Downgrade ARM mbed frameworks to 5.1.4/v126	2016-12-06 20:56:00 +02:00
Ivan Kravets	15bb9e7db2	Refactor CPPDEFINES to tuple style	2016-11-30 15:54:55 +02:00
Ivan Kravets	da60f9dec0	PlatformIO Core decides which version of SCons to use	2016-11-28 21:03:51 +02:00
Ivan Kravets	58858dacba	Add support for Maple Mini Original and Maple Mini Bootloader 2.0 // Resolve #22	2016-11-19 18:35:50 +02:00
Ivan Kravets	883b603b11	Merge branch 'release/v1.4.0' into develop	2016-11-18 16:48:57 +02:00