diff --git a/boards/alksesp32.json b/boards/alksesp32.json index 45a1e21..a51527b 100644 --- a/boards/alksesp32.json +++ b/boards/alksesp32.json @@ -35,6 +35,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 4df3c9c..7b1a0b9 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -49,6 +49,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 018f5a5..95ea9e2 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index d51c037..85a9de5 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/esp32dev.json b/boards/esp32dev.json index e0ebe89..517274f 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index b129fac..984a4f1 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/esp32thing.json b/boards/esp32thing.json index 8f891e7..64a089e 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 14ffcb9..7a3b99c 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/espectro32.json b/boards/espectro32.json index 4538ace..1a8e762 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/espino32.json b/boards/espino32.json index 894fc89..1611e96 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/featheresp32.json b/boards/featheresp32.json index 4c576c8..9e1c8f4 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index f1d2bbc..d64fb14 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index 8aeda68..483c897 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index 054311f..bd4586b 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/lolin32.json b/boards/lolin32.json index 000d16e..d7ee26f 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/lolin_d32.json b/boards/lolin_d32.json index 16f86c5..a43f4a6 100644 --- a/boards/lolin_d32.json +++ b/boards/lolin_d32.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/lolin_d32_pro.json b/boards/lolin_d32_pro.json index 56810dd..6cffe5f 100644 --- a/boards/lolin_d32_pro.json +++ b/boards/lolin_d32_pro.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 4ca433e..d32aec9 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index 063f33f..5a14b83 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/node32s.json b/boards/node32s.json index 296ecc9..bc6efbe 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index cac5326..5fcc7ea 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/pocket_32.json b/boards/pocket_32.json index a54d1e7..6670e6a 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/ttgo-lora32-v1.json b/boards/ttgo-lora32-v1.json index 412efc6..45d1b1f 100644 --- a/boards/ttgo-lora32-v1.json +++ b/boards/ttgo-lora32-v1.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/wemosbat.json b/boards/wemosbat.json index 517eb71..d20bceb 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/boards/xinabox_cw02.json b/boards/xinabox_cw02.json index f6016ce..100e84f 100644 --- a/boards/xinabox_cw02.json +++ b/boards/xinabox_cw02.json @@ -36,6 +36,7 @@ "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny", + "iot-bus-jtag", "minimodule" ], "require_upload_port": true, diff --git a/platform.json b/platform.json index edc019e..be1da91 100644 --- a/platform.json +++ b/platform.json @@ -74,7 +74,7 @@ "tool-openocd-esp32": { "type": "debugger", "optional": true, - "version": "~1.1000.0" + "version": "~1.1000.20181026" }, "tool-mkspiffs": { "type": "uploader", diff --git a/platform.py b/platform.py index 56b4d52..dc2baf8 100644 --- a/platform.py +++ b/platform.py @@ -22,8 +22,8 @@ class Espressif32Platform(PlatformBase): self.packages['tool-mkspiffs']['optional'] = False if variables.get("upload_protocol"): self.packages['tool-openocd-esp32']['optional'] = False - return PlatformBase.configure_default_packages( - self, variables, targets) + return PlatformBase.configure_default_packages(self, variables, + targets) def get_boards(self, id_=None): result = PlatformBase.get_boards(self, id_) @@ -44,14 +44,11 @@ class Espressif32Platform(PlatformBase): if "tools" not in debug: debug['tools'] = {} - available_tools = [ - "esp-prog", "ftdi", "jlink", "minimodule", "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny" - ] + non_debug_protocols = ["esptool"] # Only FTDI based debug probes - for link in available_tools: - if link not in upload_protocols or link in debug['tools']: + for link in upload_protocols: + if link in non_debug_protocols or link in debug['tools']: continue if link == "jlink":