diff --git a/boards/alksesp32.json b/boards/alksesp32.json index a2df27c..44de9f1 100644 --- a/boards/alksesp32.json +++ b/boards/alksesp32.json @@ -29,6 +29,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", @@ -40,4 +41,4 @@ }, "url": "https://github.com/RoboticsBrno/ArduinoLearningKitStarter.git", "vendor": "RoboticsBrno" -} \ No newline at end of file +} diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 6c44368..298e597 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -43,6 +43,7 @@ "protocols": [ "esptool", "ftdi", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 330149a..09f1d0b 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index edb8157..b888921 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32dev.json b/boards/esp32dev.json index 064df32..0444441 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index 46c971e..335339e 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32thing.json b/boards/esp32thing.json index f17aaa4..a794a68 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index e1101eb..058ab56 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/espectro32.json b/boards/espectro32.json index 7050ce8..63b7447 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/espino32.json b/boards/espino32.json index ac5c2dc..6676276 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/featheresp32.json b/boards/featheresp32.json index 9bae251..efde4f9 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index 7c09e8b..d35c990 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index 015d347..6aba02c 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index f81bf1f..eae4517 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/lolin32.json b/boards/lolin32.json index 4a0cc51..9f58186 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/lolin_d32.json b/boards/lolin_d32.json index a71ac9c..2ff1f80 100644 --- a/boards/lolin_d32.json +++ b/boards/lolin_d32.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/lolin_d32_pro.json b/boards/lolin_d32_pro.json index 1fa88e2..e219bc6 100644 --- a/boards/lolin_d32_pro.json +++ b/boards/lolin_d32_pro.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 2202631..839d7d2 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index 0bec143..2660eb4 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/node32s.json b/boards/node32s.json index b1ff128..a3e37d9 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index 5435e74..f1912c8 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/pocket_32.json b/boards/pocket_32.json index 78d492e..9c4c789 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/ttgo-lora32-v1.json b/boards/ttgo-lora32-v1.json index a776012..b1425fb 100644 --- a/boards/ttgo-lora32-v1.json +++ b/boards/ttgo-lora32-v1.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/wemosbat.json b/boards/wemosbat.json index 7ca7a87..91bc766 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/xinabox_cw02.json b/boards/xinabox_cw02.json index 435b4f5..5e2c0db 100644 --- a/boards/xinabox_cw02.json +++ b/boards/xinabox_cw02.json @@ -30,6 +30,7 @@ "protocol": "esptool", "protocols": [ "esptool", + "esp-prog", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/platform.py b/platform.py index 4c65a1f..a42de38 100644 --- a/platform.py +++ b/platform.py @@ -44,24 +44,27 @@ class Espressif32Platform(PlatformBase): if "tools" not in debug: debug['tools'] = {} - available_tools = ("ftdi", "minimodule", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", - "olimex-jtag-tiny") + available_tools = [ + "esp-idf", "ftdi", "minimodule", "olimex-arm-usb-tiny-h", + "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny" + ] # Only FTDI based debug probes for link in available_tools: if link not in upload_protocols or link in debug['tools']: continue - openocd_board = debug.get("openocd_board") - openocd_interface = "mbftdi" if link == "minimodule" else link - if board.id == "esp-wrover-kit": + if link in ("esp-prog", "ftdi"): openocd_interface = "esp32_devkitj_v1" + elif link == "minimodule": + openocd_interface = "mbftdi" + else: + openocd_interface = link server_args = [ "-s", "$PACKAGE_DIR/share/openocd/scripts", "-f", "share/openocd/scripts/interface/ftdi/%s.cfg" % openocd_interface, - "-f", "share/openocd/scripts/board/%s" % openocd_board + "-f", "share/openocd/scripts/board/%s" % debug.get("openocd_board") ] debug['tools'][link] = {