From 2817577da4f712887e431275258ec43f0992dd56 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 24 Nov 2018 15:10:10 +0200 Subject: [PATCH] Automatically generate known debug tools and upload protocols --- boards/alksesp32.json | 12 ----- boards/d-duino-32.json | 83 +++++++++++++------------------ boards/esp-wrover-kit.json | 11 +--- boards/esp32-evb.json | 12 ----- boards/esp32-gateway.json | 12 ----- boards/esp32-pro.json | 3 -- boards/esp320.json | 3 -- boards/esp32dev.json | 12 ----- boards/esp32doit-devkit-v1.json | 12 ----- boards/esp32thing.json | 12 ----- boards/esp32vn-iot-uno.json | 12 ----- boards/espea32.json | 3 -- boards/espectro32.json | 12 ----- boards/espino32.json | 12 ----- boards/featheresp32.json | 12 ----- boards/firebeetle32.json | 12 ----- boards/heltec_wifi_kit_32.json | 3 -- boards/heltec_wifi_lora_32.json | 9 ---- boards/hornbill32dev.json | 12 ----- boards/hornbill32minima.json | 12 ----- boards/intorobot.json | 3 -- boards/iotbusio.json | 12 ----- boards/iotbusproteus.json | 12 ----- boards/lolin32.json | 12 ----- boards/lolin_d32.json | 12 ----- boards/lolin_d32_pro.json | 12 ----- boards/lopy.json | 11 +--- boards/lopy4.json | 9 ---- boards/m5stack-core-esp32.json | 3 -- boards/m5stack-fire.json | 3 -- boards/mhetesp32devkit.json | 12 ----- boards/mhetesp32minikit.json | 12 ----- boards/microduino-core-esp32.json | 3 -- boards/nano32.json | 3 -- boards/nina_w10.json | 3 -- boards/node32s.json | 12 ----- boards/nodemcu-32s.json | 12 ----- boards/odroid_esp32.json | 3 -- boards/onehorse32dev.json | 3 -- boards/pico32.json | 3 -- boards/pocket_32.json | 12 ----- boards/quantum.json | 3 -- boards/ttgo-lora32-v1.json | 12 ----- boards/wemosbat.json | 12 ----- boards/widora-air.json | 3 -- boards/xinabox_cw02.json | 12 ----- platform.py | 18 ++++++- 47 files changed, 54 insertions(+), 444 deletions(-) diff --git a/boards/alksesp32.json b/boards/alksesp32.json index 437dd59..6fd1401 100644 --- a/boards/alksesp32.json +++ b/boards/alksesp32.json @@ -27,18 +27,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 115200 }, diff --git a/boards/d-duino-32.json b/boards/d-duino-32.json index bcf7d6b..03adcb7 100644 --- a/boards/d-duino-32.json +++ b/boards/d-duino-32.json @@ -1,49 +1,36 @@ { - "build": { - "core": "esp32", - "extra_flags": "-DARDUINO_D_DUINO_32", - "f_cpu": "240000000L", - "f_flash": "40000000L", - "flash_mode": "dio", - "ldscript": "esp32_out.ld", - "mcu": "esp32", - "variant": "d-duino-32" - }, - "connectivity": [ - "wifi", - "bluetooth", - "ethernet", - "can" - ], - "debug": { - "openocd_board": "esp-wroom-32.cfg" - }, - "frameworks": [ - "arduino", - "espidf" - ], - "name": "D-duino-32", - "upload": { - "flash_size": "4MB", - "maximum_ram_size": 327680, - "maximum_size": 4194304, - "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], - "require_upload_port": true, - "speed": 921600 - }, - "url": "https://www.tindie.com/products/lspoplove/dstike-d-duino-32-v3/", - "vendor": "DSTIKE" - } - \ No newline at end of file + "build": { + "core": "esp32", + "extra_flags": "-DARDUINO_D_DUINO_32", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "d-duino-32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "debug": { + "openocd_board": "esp-wroom-32.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "D-duino-32", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "protocol": "esptool", + "require_upload_port": true, + "speed": 921600 + }, + "url": "https://www.tindie.com/products/lspoplove/dstike-d-duino-32-v3/", + "vendor": "DSTIKE" +} diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 6b8a5b4..2531e6f 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -40,16 +40,7 @@ "protocol": "esptool", "protocols": [ "esptool", - "ftdi", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" + "ftdi" ], "require_upload_port": true, "speed": 921600 diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 4dff358..97b9bb7 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index 60edc4e..cb9ac03 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/esp32-pro.json b/boards/esp32-pro.json index 8e1b18b..cc99c5e 100644 --- a/boards/esp32-pro.json +++ b/boards/esp32-pro.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/esp320.json b/boards/esp320.json index fe2c064..08fe3d1 100644 --- a/boards/esp320.json +++ b/boards/esp320.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/esp32dev.json b/boards/esp32dev.json index 60850cd..e9271ed 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index e8a5e0c..9e06162 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/esp32thing.json b/boards/esp32thing.json index 056faae..550a5cb 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index a9d4dc5..0a9c39a 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/espea32.json b/boards/espea32.json index 1b94555..6bb3d52 100644 --- a/boards/espea32.json +++ b/boards/espea32.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/espectro32.json b/boards/espectro32.json index e09e2ca..30fe0d2 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 2000000 }, diff --git a/boards/espino32.json b/boards/espino32.json index 7a99c12..82664aa 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/featheresp32.json b/boards/featheresp32.json index a00b76a..bed8f15 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index 2d7a341..98678f2 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json index 6e3c7bc..5d4db01 100644 --- a/boards/heltec_wifi_kit_32.json +++ b/boards/heltec_wifi_kit_32.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json index e5c559b..f39ff1f 100644 --- a/boards/heltec_wifi_lora_32.json +++ b/boards/heltec_wifi_lora_32.json @@ -28,15 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index 98e1bd3..0114770 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index 3c79e85..838b8cf 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/intorobot.json b/boards/intorobot.json index 5ab27c1..097f271 100644 --- a/boards/intorobot.json +++ b/boards/intorobot.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/iotbusio.json b/boards/iotbusio.json index 6c7adf2..cafa5b0 100644 --- a/boards/iotbusio.json +++ b/boards/iotbusio.json @@ -29,18 +29,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/iotbusproteus.json b/boards/iotbusproteus.json index a06994b..3c4d176 100644 --- a/boards/iotbusproteus.json +++ b/boards/iotbusproteus.json @@ -29,18 +29,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/lolin32.json b/boards/lolin32.json index 1a84a2e..e487d78 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/lolin_d32.json b/boards/lolin_d32.json index c13480b..29a8816 100644 --- a/boards/lolin_d32.json +++ b/boards/lolin_d32.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/lolin_d32_pro.json b/boards/lolin_d32_pro.json index 1930a03..696ab3f 100644 --- a/boards/lolin_d32_pro.json +++ b/boards/lolin_d32_pro.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/lopy.json b/boards/lopy.json index 64084c0..f1afd28 100644 --- a/boards/lopy.json +++ b/boards/lopy.json @@ -1,4 +1,4 @@ - +{ "build": { "core": "esp32", "extra_flags": "-DARDUINO_LoPy", @@ -28,15 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/lopy4.json b/boards/lopy4.json index 573c0a4..007c120 100644 --- a/boards/lopy4.json +++ b/boards/lopy4.json @@ -28,15 +28,6 @@ "maximum_ram_size": 1310720, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index dcd382b..59f14e7 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/m5stack-fire.json b/boards/m5stack-fire.json index c2953d2..7f319ca 100644 --- a/boards/m5stack-fire.json +++ b/boards/m5stack-fire.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 16777216, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 4ad8aa5..dc3ad6c 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index a2d6cf9..ef3c21c 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/microduino-core-esp32.json b/boards/microduino-core-esp32.json index 4d000ba..9677eed 100644 --- a/boards/microduino-core-esp32.json +++ b/boards/microduino-core-esp32.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 2000000 }, diff --git a/boards/nano32.json b/boards/nano32.json index 79e9cf6..204b56c 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -27,9 +27,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/nina_w10.json b/boards/nina_w10.json index 8099566..3ae4680 100644 --- a/boards/nina_w10.json +++ b/boards/nina_w10.json @@ -26,9 +26,6 @@ "maximum_ram_size": 327680, "maximum_size": 2097152, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/node32s.json b/boards/node32s.json index 59e4174..72fa136 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index ed8325b..13e3711 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/odroid_esp32.json b/boards/odroid_esp32.json index 4edcb93..3eebbb3 100644 --- a/boards/odroid_esp32.json +++ b/boards/odroid_esp32.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 16777216, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json index d383639..5adcafc 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/pico32.json b/boards/pico32.json index 223510d..b786a94 100644 --- a/boards/pico32.json +++ b/boards/pico32.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/pocket_32.json b/boards/pocket_32.json index 441ef9c..15cc54e 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/quantum.json b/boards/quantum.json index a0dac53..701274b 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 16777216, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/ttgo-lora32-v1.json b/boards/ttgo-lora32-v1.json index 2cd54b4..b8af8d3 100644 --- a/boards/ttgo-lora32-v1.json +++ b/boards/ttgo-lora32-v1.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/wemosbat.json b/boards/wemosbat.json index b81dd21..4037c26 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/widora-air.json b/boards/widora-air.json index 7b5dcae..15dee83 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -25,9 +25,6 @@ "maximum_ram_size": 327680, "maximum_size": 16777216, "protocol": "esptool", - "protocols": [ - "esptool" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/boards/xinabox_cw02.json b/boards/xinabox_cw02.json index cff66b4..38e4e62 100644 --- a/boards/xinabox_cw02.json +++ b/boards/xinabox_cw02.json @@ -28,18 +28,6 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", - "protocols": [ - "esptool", - "esp-prog", - "jlink", - "olimex-arm-usb-tiny-h", - "olimex-arm-usb-ocd-h", - "olimex-arm-usb-ocd", - "olimex-jtag-tiny", - "iot-bus-jtag", - "tumpa", - "minimodule" - ], "require_upload_port": true, "speed": 921600 }, diff --git a/platform.py b/platform.py index 61f023e..703da2e 100644 --- a/platform.py +++ b/platform.py @@ -38,13 +38,29 @@ class Espressif32Platform(PlatformBase): def _add_default_debug_tools(self, board): debug = board.manifest.get("debug", {}) - + upload_protocol = board.manifest.get("upload", {}).get("protocol") upload_protocols = board.manifest.get("upload", {}).get( "protocols", []) if "tools" not in debug: debug['tools'] = {} non_debug_protocols = ["esptool"] + supported_debu_tools = [ + "esp-prog", + "iot-bus-jtag", + "jlink", + "minimodule", + "olimex-arm-usb-tiny-h", + "olimex-arm-usb-ocd-h", + "olimex-arm-usb-ocd", + "olimex-jtag-tiny", + "tumpa" + ] + if debug: + upload_protocols.extend(supported_debu_tools) + + if upload_protocol and upload_protocol not in upload_protocols: + upload_protocols.append(upload_protocol) # Only FTDI based debug probes for link in upload_protocols: