Add new Olimex debug tools: ARM-USB-OCD and ARM-USB-TINY

boards/esp-wrover-kit.json

@@ -22,9 +22,13 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp32-wrover.cfg",
+    "default_tools": [
-    "onboard_tools": ["ft2232h"],
+      "ft2232h"
-    "default_tools": ["ft2232h"]
+    ],
+    "onboard_tools": [
+      "ft2232h"
+    ],
+    "openocd_board": "esp32-wrover.cfg"
   },
   "frameworks": [
     "arduino",
@@ -35,16 +39,18 @@
     "flash_size": "4MB",
     "maximum_ram_size": 4194304,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "ft2232h",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://espressif.com/en/products/hardware/esp-wrover-kit/overview",
   "vendor": "Espressif"

boards/esp32-evb.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://www.olimex.com/Products/IoT/ESP32-EVB/open-source-hardware",
   "vendor": "OLIMEX"

boards/esp32-gateway.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://www.olimex.com/Products/IoT/ESP32-GATEWAY/open-source-hardware",
   "vendor": "OLIMEX"

boards/esp320.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://www.sweetpeas.se/controller-modules/10-esp210.html",
   "vendor": "Electronic SweetPeas"

boards/esp32dev.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://en.wikipedia.org/wiki/ESP32",
   "vendor": "Espressif"

boards/esp32doit-devkit-v1.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://www.doit.am/",
   "vendor": "DOIT"

boards/esp32thing.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://www.sparkfun.com/products/13907",
   "vendor": "SparkFun Electronics"

boards/esp32vn-iot-uno.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://esp32.vn/",
   "vendor": "ESP32vn"

boards/espea32.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://blog.aprbrother.com/product/espea",
   "vendor": "April Brother"

boards/espectro32.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 2000000,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 2000000
   },
   "url": "https://shop.makestro.com/product/espectro32",
   "vendor": "DycodeX"

boards/espino32.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://thaieasyelec.com/products/development-boards/espino-wifi-development-board-detail.html",
   "vendor": "ThaiEasyElec"

boards/featheresp32.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://www.adafruit.com/product/3405",
   "vendor": "Adafruit"

boards/firebeetle32.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://dfrobotblog.wordpress.com",
   "vendor": "DFRobot"

boards/heltec_wifi_kit_32.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://www.heltec.cn",
   "vendor": "Heltec Automation"

boards/heltec_wifi_lora_32.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://www.heltec.cn",
   "vendor": "Heltec Automation"

boards/hornbill32dev.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://hackaday.io/project/18997-hornbill",
   "vendor": "Hornbill"

boards/hornbill32minima.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://hackaday.io/project/18997-hornbill",
   "vendor": "Hornbill"

boards/intorobot.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://docs.intorobot.com/zh/hardware/fig/hardware/",
   "vendor": "IntoRobot"

boards/lolin32.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://wemos.cc",
   "vendor": "WEMOS"

boards/m5stack-core-esp32.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://www.m5stack.com",
   "vendor": "M5Stack"

boards/mhetesp32devkit.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://forum.mhetlive.com",
   "vendor": "MH-ET Live"

boards/mhetesp32minikit.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://forum.mhetlive.com",
   "vendor": "MH-ET Live"

boards/microduino-core-esp32.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 2000000,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 2000000
   },
   "url": "https://microduinoinc.com",
   "vendor": "Microduino"

boards/nano32.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf",
     "simba",
@@ -26,12 +26,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://iot-bits.com/nano32-esp32-development-board",
   "vendor": "MakerAsia"

boards/nina_w10.json

@@ -16,7 +16,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -25,12 +25,12 @@
     "flash_size": "2MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://www.u-blox.com/en/product/nina-w10-series",
   "vendor": "u-blox"

boards/node32s.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://www.ayarafun.com",
   "vendor": "Aiyarafun"

boards/nodemcu-32s.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://www.nodemcu.com/",
   "vendor": "NodeMCU"

boards/onehorse32dev.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://www.tindie.com/products/onehorse/esp32-development-board/",
   "vendor": "Onehorse"

boards/pico32.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://esp-idf.readthedocs.io/en/latest/get-started/get-started-pico-kit.html",
   "vendor": "Espressif"

boards/pocket_32.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://dong-sen.com",
   "vendor": "Dongsen Technology"

boards/quantum.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "16MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://wiki.jackslab.org/Noduino",
   "vendor": "Noduino"

boards/wemosbat.json

@@ -18,7 +18,7 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -27,15 +27,17 @@
     "flash_size": "4MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool",
       "olimex-arm-usb-tiny-h",
       "olimex-arm-usb-ocd-h",
+      "olimex-arm-usb-ocd",
+      "olimex-jtag-tiny",
       "minimodule"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "https://www.wemos.cc",
   "vendor": "WEMOS"

boards/widora-air.json

@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
@@ -24,12 +24,12 @@
     "flash_size": "16MB",
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 115200
   },
   "url": "http://widora.io",
   "vendor": "Widora"

platform.py

@@ -44,10 +44,9 @@ class Espressif32Platform(PlatformBase):
         if "tools" not in debug:
             debug['tools'] = {}
 
-        available_tools = (
+        available_tools = ("ft2232h", "minimodule", "olimex-arm-usb-tiny-h",
-            "ft2232h", "minimodule",
+                           "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd",
-            "olimex-arm-usb-ocd-h", "olimex-arm-usb-tiny-h"
+                           "olimex-jtag-tiny")
-        )
 
         # Only FTDI based debug probes
         for link in available_tools: