From edbf3131087c817a7868b9879109265ce4c4ef1a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 26 Jun 2018 00:45:23 +0300 Subject: [PATCH] Add new Olimex debug tools: ARM-USB-OCD and ARM-USB-TINY --- boards/esp-wrover-kit.json | 18 ++++++++++++------ boards/esp32-evb.json | 10 ++++++---- boards/esp32-gateway.json | 10 ++++++---- boards/esp320.json | 8 ++++---- boards/esp32dev.json | 10 ++++++---- boards/esp32doit-devkit-v1.json | 10 ++++++---- boards/esp32thing.json | 10 ++++++---- boards/esp32vn-iot-uno.json | 10 ++++++---- boards/espea32.json | 8 ++++---- boards/espectro32.json | 10 ++++++---- boards/espino32.json | 10 ++++++---- boards/featheresp32.json | 10 ++++++---- boards/firebeetle32.json | 10 ++++++---- boards/heltec_wifi_kit_32.json | 8 ++++---- boards/heltec_wifi_lora_32.json | 8 ++++---- boards/hornbill32dev.json | 10 ++++++---- boards/hornbill32minima.json | 10 ++++++---- boards/intorobot.json | 8 ++++---- boards/lolin32.json | 10 ++++++---- boards/m5stack-core-esp32.json | 8 ++++---- boards/mhetesp32devkit.json | 10 ++++++---- boards/mhetesp32minikit.json | 10 ++++++---- boards/microduino-core-esp32.json | 8 ++++---- boards/nano32.json | 8 ++++---- boards/nina_w10.json | 8 ++++---- boards/node32s.json | 10 ++++++---- boards/nodemcu-32s.json | 10 ++++++---- boards/onehorse32dev.json | 8 ++++---- boards/pico32.json | 8 ++++---- boards/pocket_32.json | 10 ++++++---- boards/quantum.json | 8 ++++---- boards/wemosbat.json | 10 ++++++---- boards/widora-air.json | 8 ++++---- platform.py | 7 +++---- 34 files changed, 181 insertions(+), 138 deletions(-) diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index e05ea81..7d21506 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -22,9 +22,13 @@ "can" ], "debug": { - "openocd_board": "esp32-wrover.cfg", - "onboard_tools": ["ft2232h"], - "default_tools": ["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" diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 19aefa2..3bc67e5 100644 --- a/boards/esp32-evb.json +++ b/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" diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index dccfd6a..e8a1cab 100644 --- a/boards/esp32-gateway.json +++ b/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" diff --git a/boards/esp320.json b/boards/esp320.json index 4ff912e..9b1978a 100644 --- a/boards/esp320.json +++ b/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" diff --git a/boards/esp32dev.json b/boards/esp32dev.json index d0620de..00c9eb5 100644 --- a/boards/esp32dev.json +++ b/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" diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index b5ff28c..44c61a7 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/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" diff --git a/boards/esp32thing.json b/boards/esp32thing.json index 358bf9c..18fc65e 100644 --- a/boards/esp32thing.json +++ b/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" diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 81fa9c2..b4855c2 100644 --- a/boards/esp32vn-iot-uno.json +++ b/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" diff --git a/boards/espea32.json b/boards/espea32.json index 7dca70c..68ab985 100644 --- a/boards/espea32.json +++ b/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" diff --git a/boards/espectro32.json b/boards/espectro32.json index d4aab70..6ddb2b4 100644 --- a/boards/espectro32.json +++ b/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" diff --git a/boards/espino32.json b/boards/espino32.json index 808aae1..ba7731d 100644 --- a/boards/espino32.json +++ b/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" diff --git a/boards/featheresp32.json b/boards/featheresp32.json index 2ead628..a3d915c 100644 --- a/boards/featheresp32.json +++ b/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" diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index dcbf0de..ae118ac 100644 --- a/boards/firebeetle32.json +++ b/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" diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json index cb8f223..c631bc8 100644 --- a/boards/heltec_wifi_kit_32.json +++ b/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" diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json index 7ffaa30..a63a698 100644 --- a/boards/heltec_wifi_lora_32.json +++ b/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" diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index 3f00ad7..120577e 100644 --- a/boards/hornbill32dev.json +++ b/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" diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index 3a0f24d..0f6fa11 100644 --- a/boards/hornbill32minima.json +++ b/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" diff --git a/boards/intorobot.json b/boards/intorobot.json index b54b43e..4394697 100644 --- a/boards/intorobot.json +++ b/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" diff --git a/boards/lolin32.json b/boards/lolin32.json index 457df60..0072cee 100644 --- a/boards/lolin32.json +++ b/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" diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index 98f4e14..733b0d9 100644 --- a/boards/m5stack-core-esp32.json +++ b/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" diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 73384d8..3f1eb31 100644 --- a/boards/mhetesp32devkit.json +++ b/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" diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index 85a4b64..762db82 100644 --- a/boards/mhetesp32minikit.json +++ b/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" diff --git a/boards/microduino-core-esp32.json b/boards/microduino-core-esp32.json index 93a8c74..17aa23b 100644 --- a/boards/microduino-core-esp32.json +++ b/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" diff --git a/boards/nano32.json b/boards/nano32.json index 921cb87..c3f394e 100644 --- a/boards/nano32.json +++ b/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" diff --git a/boards/nina_w10.json b/boards/nina_w10.json index 91ca4d7..55db93a 100644 --- a/boards/nina_w10.json +++ b/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" diff --git a/boards/node32s.json b/boards/node32s.json index 04b8b1f..a64fcec 100644 --- a/boards/node32s.json +++ b/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" diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index 0f7d49c..5a78ebe 100644 --- a/boards/nodemcu-32s.json +++ b/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" diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json index 0dfa0c2..bc45b98 100644 --- a/boards/onehorse32dev.json +++ b/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" diff --git a/boards/pico32.json b/boards/pico32.json index 459857b..7e64080 100644 --- a/boards/pico32.json +++ b/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" diff --git a/boards/pocket_32.json b/boards/pocket_32.json index 361e071..aa3d37f 100644 --- a/boards/pocket_32.json +++ b/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" diff --git a/boards/quantum.json b/boards/quantum.json index b77bb67..06f5541 100644 --- a/boards/quantum.json +++ b/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" diff --git a/boards/wemosbat.json b/boards/wemosbat.json index 761235c..d5a3b2f 100644 --- a/boards/wemosbat.json +++ b/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" diff --git a/boards/widora-air.json b/boards/widora-air.json index 2b2ed91..4bcd7ff 100644 --- a/boards/widora-air.json +++ b/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" diff --git a/platform.py b/platform.py index c9210a4..3c9f05f 100644 --- a/platform.py +++ b/platform.py @@ -44,10 +44,9 @@ class Espressif32Platform(PlatformBase): if "tools" not in debug: debug['tools'] = {} - available_tools = ( - "ft2232h", "minimodule", - "olimex-arm-usb-ocd-h", "olimex-arm-usb-tiny-h" - ) + available_tools = ("ft2232h", "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: