diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 1109686..0ed0fbe 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -40,7 +40,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://espressif.com/en/products/hardware/esp-wrover-kit/overview", diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 4d546cb..4924a04 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://www.olimex.com/Products/IoT/ESP32-EVB/open-source-hardware", diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index d88afff..ba3223f 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://www.olimex.com/Products/IoT/ESP32-GATEWAY/open-source-hardware", diff --git a/boards/esp32dev.json b/boards/esp32dev.json index e5efe8e..ee3ff0d 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://en.wikipedia.org/wiki/ESP32", diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index d4f8e16..b48466b 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "http://www.doit.am/", diff --git a/boards/esp32thing.json b/boards/esp32thing.json index 636f7ae..50930cc 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://www.sparkfun.com/products/13907", diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 58cfbf9..7c4ee27 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://esp32.vn/", diff --git a/boards/espectro32.json b/boards/espectro32.json index 2f228b8..664bfd1 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://shop.makestro.com/product/espectro32", diff --git a/boards/espino32.json b/boards/espino32.json index 2c5668e..44d8a21 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "http://thaieasyelec.com/products/development-boards/espino-wifi-development-board-detail.html", diff --git a/boards/featheresp32.json b/boards/featheresp32.json index 8478b40..bfcc0a4 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://www.adafruit.com/product/3405", diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index fc32da4..0683a06 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://dfrobotblog.wordpress.com", diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index d6acf1e..4d0d0af 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://hackaday.io/project/18997-hornbill", diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index c6d2f8a..3563431 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://hackaday.io/project/18997-hornbill", diff --git a/boards/lolin32.json b/boards/lolin32.json index 4c415ea..b620ae7 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://wemos.cc", diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 59cc0df..2b8c2df 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "http://forum.mhetlive.com", diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index ba2e279..cccd9a7 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "http://forum.mhetlive.com", diff --git a/boards/node32s.json b/boards/node32s.json index 884684c..406a58b 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "http://www.ayarafun.com", diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index e3825e3..dbd0d98 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "http://www.nodemcu.com/", diff --git a/boards/pocket_32.json b/boards/pocket_32.json index db868ec..ddfc0c5 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "http://dong-sen.com", diff --git a/boards/wemosbat.json b/boards/wemosbat.json index c0f1dfa..2aab99e 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -34,7 +34,8 @@ "protocols": [ "esptool", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h" + "olimex-arm-usb-ocd-h", + "minimodule" ] }, "url": "https://www.wemos.cc", diff --git a/platform.py b/platform.py index b2a1603..e5c573b 100644 --- a/platform.py +++ b/platform.py @@ -42,14 +42,20 @@ class Espressif32Platform(PlatformBase): if "tools" not in debug: debug['tools'] = {} + available_tools = ( + "olimex-arm-usb-ocd-h", "olimex-arm-usb-tiny-h", "minimodule" + ) + # Only FTDI based debug probes - for link in ("olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h"): + for link in available_tools: if link not in upload_protocols or link in debug['tools']: continue + ftdi_interface = "mbftdi" if link == "minimodule" else link + server_args = [ "-s", "$PACKAGE_DIR/share/openocd/scripts", - "-f", "share/openocd/scripts/interface/ftdi/%s.cfg" % link, + "-f", "share/openocd/scripts/interface/ftdi/%s.cfg" % ftdi_interface, "-f", "share/openocd/scripts/board/%s" % debug.get("openocd_board") ]