diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json
index e05ea81..cdd88c7 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",
@@ -33,18 +37,20 @@
   "name": "Espressif ESP-WROVER-KIT",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 4194304,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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..330149a 100644
--- a/boards/esp32-evb.json
+++ b/boards/esp32-evb.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "OLIMEX ESP32-EVB",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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..edb8157 100644
--- a/boards/esp32-gateway.json
+++ b/boards/esp32-gateway.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "OLIMEX ESP32-GATEWAY",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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..fe2c064 100644
--- a/boards/esp320.json
+++ b/boards/esp320.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Electronic SweetPeas ESP320",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "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..064df32 100644
--- a/boards/esp32dev.json
+++ b/boards/esp32dev.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32 Dev Module",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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..46c971e 100644
--- a/boards/esp32doit-devkit-v1.json
+++ b/boards/esp32doit-devkit-v1.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "DOIT ESP32 DEVKIT V1",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "http://www.doit.am/",
   "vendor": "DOIT"
diff --git a/boards/esp32thing.json b/boards/esp32thing.json
index 358bf9c..f17aaa4 100644
--- a/boards/esp32thing.json
+++ b/boards/esp32thing.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "SparkFun ESP32 Thing",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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 0997da8..e1101eb 100644
--- a/boards/esp32vn-iot-uno.json
+++ b/boards/esp32vn-iot-uno.json
@@ -7,7 +7,7 @@
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
-    "variant": "esp32vn_iot_uno"
+    "variant": "esp32vn-iot-uno"
   },
   "connectivity": [
     "wifi",
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "ESP32vn IoT Uno",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "https://esp32.vn/",
   "vendor": "ESP32vn"
diff --git a/boards/espea32.json b/boards/espea32.json
index 7dca70c..1b94555 100644
--- a/boards/espea32.json
+++ b/boards/espea32.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "April Brother ESPea32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "url": "https://blog.aprbrother.com/product/espea",
   "vendor": "April Brother"
diff --git a/boards/espectro32.json b/boards/espectro32.json
index d4aab70..7050ce8 100644
--- a/boards/espectro32.json
+++ b/boards/espectro32.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "ESPectro32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 2000000,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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..ac5c2dc 100644
--- a/boards/espino32.json
+++ b/boards/espino32.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "ESPino32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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..9bae251 100644
--- a/boards/featheresp32.json
+++ b/boards/featheresp32.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Adafruit ESP32 Feather",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "https://www.adafruit.com/product/3405",
   "vendor": "Adafruit"
diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json
index dcbf0de..7c09e8b 100644
--- a/boards/firebeetle32.json
+++ b/boards/firebeetle32.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "FireBeetle-ESP32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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..6e3c7bc 100644
--- a/boards/heltec_wifi_kit_32.json
+++ b/boards/heltec_wifi_kit_32.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Heltec WIFI Kit 32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "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..ee48d15 100644
--- a/boards/heltec_wifi_lora_32.json
+++ b/boards/heltec_wifi_lora_32.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Heltec WIFI LoRa 32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "url": "http://www.heltec.cn",
   "vendor": "Heltec Automation"
diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json
index 3f00ad7..015d347 100644
--- a/boards/hornbill32dev.json
+++ b/boards/hornbill32dev.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Hornbill ESP32 Dev",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "https://hackaday.io/project/18997-hornbill",
   "vendor": "Hornbill"
diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json
index 3a0f24d..f81bf1f 100644
--- a/boards/hornbill32minima.json
+++ b/boards/hornbill32minima.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Hornbill ESP32 Minima",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "https://hackaday.io/project/18997-hornbill",
   "vendor": "Hornbill"
diff --git a/boards/intorobot.json b/boards/intorobot.json
index b54b43e..5ab27c1 100644
--- a/boards/intorobot.json
+++ b/boards/intorobot.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "IntoRobot Fig",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "url": "http://docs.intorobot.com/zh/hardware/fig/hardware/",
   "vendor": "IntoRobot"
diff --git a/boards/lolin32.json b/boards/lolin32.json
index 457df60..f39bef7 100644
--- a/boards/lolin32.json
+++ b/boards/lolin32.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "WEMOS LOLIN32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "https://wemos.cc",
   "vendor": "WEMOS"
diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json
index 98f4e14..dcd382b 100644
--- a/boards/m5stack-core-esp32.json
+++ b/boards/m5stack-core-esp32.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "M5Stack Core ESP32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "url": "http://www.m5stack.com",
   "vendor": "M5Stack"
diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json
index 73384d8..2202631 100644
--- a/boards/mhetesp32devkit.json
+++ b/boards/mhetesp32devkit.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "MH ET LIVE ESP32DevKIT",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "http://forum.mhetlive.com",
   "vendor": "MH-ET Live"
diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json
index 85a4b64..0bec143 100644
--- a/boards/mhetesp32minikit.json
+++ b/boards/mhetesp32minikit.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "MH ET LIVE ESP32MiniKit",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "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..4d000ba 100644
--- a/boards/microduino-core-esp32.json
+++ b/boards/microduino-core-esp32.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Microduino Core ESP32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 2000000,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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..79e9cf6 100644
--- a/boards/nano32.json
+++ b/boards/nano32.json
@@ -15,7 +15,7 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf",
     "simba",
@@ -24,14 +24,14 @@
   "name": "MakerAsia Nano32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "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..8099566 100644
--- a/boards/nina_w10.json
+++ b/boards/nina_w10.json
@@ -16,21 +16,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "u-blox NINA-W10 series",
   "upload": {
     "flash_size": "2MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 2097152,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "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..b1ff128 100644
--- a/boards/node32s.json
+++ b/boards/node32s.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Node32s",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "http://www.ayarafun.com",
   "vendor": "Aiyarafun"
diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json
index 0f7d49c..5435e74 100644
--- a/boards/nodemcu-32s.json
+++ b/boards/nodemcu-32s.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "NodeMCU-32S",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "http://www.nodemcu.com/",
   "vendor": "NodeMCU"
diff --git a/boards/odroid_esp32.json b/boards/odroid_esp32.json
new file mode 100644
index 0000000..4edcb93
--- /dev/null
+++ b/boards/odroid_esp32.json
@@ -0,0 +1,36 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_ODROID_ESP32",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "mcu": "esp32",
+    "variant": "odroid_esp32"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "ODROID-GO",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "protocol": "esptool",
+    "protocols": [
+      "esptool"
+    ],
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.hardkernel.com/main/products/prdt_info.php?g_code=G152875062626",
+  "vendor": "Hardkernel"
+}
diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json
index 0dfa0c2..d383639 100644
--- a/boards/onehorse32dev.json
+++ b/boards/onehorse32dev.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Onehorse ESP32 Dev Module",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "url": "https://www.tindie.com/products/onehorse/esp32-development-board/",
   "vendor": "Onehorse"
diff --git a/boards/pico32.json b/boards/pico32.json
index 459857b..223510d 100644
--- a/boards/pico32.json
+++ b/boards/pico32.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "ESP32 Pico Kit",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "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..78d492e 100644
--- a/boards/pocket_32.json
+++ b/boards/pocket_32.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Dongsen Tech Pocket 32",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "http://dong-sen.com",
   "vendor": "Dongsen Technology"
diff --git a/boards/quantum.json b/boards/quantum.json
index b77bb67..a0dac53 100644
--- a/boards/quantum.json
+++ b/boards/quantum.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Noduino Quantum",
   "upload": {
     "flash_size": "16MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "url": "http://wiki.jackslab.org/Noduino",
   "vendor": "Noduino"
diff --git a/boards/wemosbat.json b/boards/wemosbat.json
index 761235c..7ca7a87 100644
--- a/boards/wemosbat.json
+++ b/boards/wemosbat.json
@@ -18,24 +18,26 @@
   "debug": {
     "openocd_board": "esp-wroom-32.cfg"
   },
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "WeMos WiFi & Bluetooth Battery",
   "upload": {
     "flash_size": "4MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
     "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": 921600
   },
   "url": "https://www.wemos.cc",
   "vendor": "WEMOS"
diff --git a/boards/widora-air.json b/boards/widora-air.json
index 2b2ed91..7b5dcae 100644
--- a/boards/widora-air.json
+++ b/boards/widora-air.json
@@ -15,21 +15,21 @@
     "ethernet",
     "can"
   ],
-  "frameworks":  [
+  "frameworks": [
     "arduino",
     "espidf"
   ],
   "name": "Widora AIR",
   "upload": {
     "flash_size": "16MB",
-    "maximum_ram_size": 294912,
-    "maximum_size": 1310720,
-    "require_upload_port": true,
-    "speed": 115200,
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
     "protocol": "esptool",
     "protocols": [
       "esptool"
-    ]
+    ],
+    "require_upload_port": true,
+    "speed": 921600
   },
   "url": "http://widora.io",
   "vendor": "Widora"
diff --git a/builder/main.py b/builder/main.py
index 9b0b786..a39ffb8 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -46,8 +46,8 @@ def _parse_size(value):
         return int(value)
     elif value.startswith("0x"):
         return int(value, 16)
-    elif value[-1] in ("K", "M"):
-        base = 1024 if value[-1] == "K" else 1024 * 1024
+    elif value[-1].upper() in ("K", "M"):
+        base = 1024 if value[-1].upper() == "K" else 1024 * 1024
         return int(value[:-1]) * base
     return value
 
@@ -140,26 +140,48 @@ env.Replace(
     SIZETOOL="xtensa-esp32-elf-size",
 
     ARFLAGS=["rc"],
+
     ASFLAGS=["-x", "assembler-with-cpp"],
+
     CFLAGS=["-std=gnu99"],
+
     CCFLAGS=[
-        "-Os", "-Wall", "-nostdlib", "-Wpointer-arith",
-        "-Wno-error=unused-but-set-variable", "-Wno-error=unused-variable",
-        "-mlongcalls", "-ffunction-sections", "-fdata-sections",
+        "-Os",
+        "-Wall",
+        "-nostdlib",
+        "-Wpointer-arith",
+        "-Wno-error=unused-but-set-variable",
+        "-Wno-error=unused-variable",
+        "-mlongcalls",
+        "-ffunction-sections",
+        "-fdata-sections",
         "-fstrict-volatile-bitfields"
     ],
-    CXXFLAGS=["-fno-rtti", "-fno-exceptions", "-std=gnu++11"],
-    CPPDEFINES=[
-        "ESP32", "ESP_PLATFORM", ("F_CPU", "$BOARD_F_CPU"), "HAVE_CONFIG_H",
-        ("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"')
-    ],
-    LINKFLAGS=[
-        "-nostdlib", "-Wl,-static", "-u", "call_user_start_cpu0",
-        "-Wl,--undefined=uxTopUsedPriority", "-Wl,--gc-sections"
+
+    CXXFLAGS=[
+        "-fno-rtti",
+        "-fno-exceptions",
+        "-std=gnu++11"
     ],
 
-    SIZEPROGREGEXP=r"^(?:\.iram0\.text|\.dram0\.text|\.flash\.text|\.dram0\.data|\.flash\.rodata|)\s+(\d+).*",
-    SIZEDATAREGEXP=r"^(?:\.dram0\.data|\.dram0\.bss)\s+(\d+).*",
+    CPPDEFINES=[
+        "ESP32",
+        "ESP_PLATFORM",
+        ("F_CPU", "$BOARD_F_CPU"),
+        "HAVE_CONFIG_H",
+        ("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"')
+    ],
+
+    LINKFLAGS=[
+        "-nostdlib",
+        "-Wl,-static",
+        "-u", "call_user_start_cpu0",
+        "-Wl,--undefined=uxTopUsedPriority",
+        "-Wl,--gc-sections"
+    ],
+
+    SIZEPROGREGEXP=r"^(?:\.iram0\.text|\.iram0\.vectors|\.dram0\.data|\.flash\.text|\.flash\.rodata|)\s+([0-9]+).*",
+    SIZEDATAREGEXP=r"^(?:\.dram0\.data|\.dram0\.bss|\.noinit)\s+([0-9]+).*",
     SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
     SIZEPRINTCMD="$SIZETOOL -B -d $SOURCES",
 
@@ -177,17 +199,24 @@ env.Append(
     BUILDERS=dict(
         ElfToBin=Builder(
             action=env.VerboseAction(" ".join([
-                '"$PYTHONEXE" "$OBJCOPY"', "--chip", "esp32", "elf2image",
-                "--flash_mode", "$BOARD_FLASH_MODE", "--flash_freq",
-                "${__get_board_f_flash(__env__)}", "--flash_size",
-                env.BoardConfig().get("upload.flash_size",
-                                      "detect"), "-o", "$TARGET", "$SOURCES"
+                '"$PYTHONEXE" "$OBJCOPY"',
+                "--chip", "esp32",
+                "elf2image",
+                "--flash_mode", "$BOARD_FLASH_MODE",
+                "--flash_freq", "${__get_board_f_flash(__env__)}",
+                "--flash_size", env.BoardConfig().get(
+                    "upload.flash_size", "detect"),
+                "-o", "$TARGET", "$SOURCES"
             ]), "Building $TARGET"),
             suffix=".bin"),
         DataToBin=Builder(
             action=env.VerboseAction(" ".join([
-                '"$MKSPIFFSTOOL"', "-c", "$SOURCES", "-p", "$SPIFFS_PAGE",
-                "-b", "$SPIFFS_BLOCK", "-s", "$SPIFFS_SIZE", "$TARGET"
+                '"$MKSPIFFSTOOL"',
+                "-c", "$SOURCES",
+                "-p", "$SPIFFS_PAGE",
+                "-b", "$SPIFFS_BLOCK",
+                "-s", "$SPIFFS_SIZE",
+                "$TARGET"
             ]), "Building SPIFFS image from '$SOURCES' directory to $TARGET"),
             emitter=__fetch_spiffs_size,
             source_factory=env.Dir,
@@ -252,11 +281,15 @@ if upload_protocol == "esptool":
         UPLOADEROTA=join(
             platform.get_package_dir("tool-espotapy") or "", "espota.py"),
         UPLOADERFLAGS=[
-            "--chip", "esp32", "--port", '"$UPLOAD_PORT"', "--baud",
-            "$UPLOAD_SPEED", "--before", "default_reset", "--after",
-            "hard_reset", "write_flash", "-z", "--flash_mode",
-            "${__get_board_flash_mode(__env__)}", "--flash_freq",
-            "${__get_board_f_flash(__env__)}", "--flash_size", "detect"
+            "--chip", "esp32",
+            "--port", '"$UPLOAD_PORT"',
+            "--baud", "$UPLOAD_SPEED",
+            "--before", "default_reset",
+            "--after", "hard_reset",
+            "write_flash", "-z",
+            "--flash_mode", "${__get_board_flash_mode(__env__)}",
+            "--flash_freq", "${__get_board_f_flash(__env__)}",
+            "--flash_size", "detect"
         ],
         UPLOADEROTAFLAGS=[
             "--debug", "--progress", "-i", "$UPLOAD_PORT", "-p", "3232",
@@ -268,28 +301,32 @@ if upload_protocol == "esptool":
     for image in env.get("FLASH_EXTRA_IMAGES", []):
         env.Append(UPLOADERFLAGS=[image[0], "%s" % image[1]])
 
-    if env.subst("$PIOFRAMEWORK") == "arduino":
-        # Handle uploading via OTA
-        ota_port = None
-        if env.get("UPLOAD_PORT"):
-            ota_port = re.match(
-                r"\"?((([0-9]{1,3}\.){3}[0-9]{1,3})|.+\.local)\"?$",
-                env.get("UPLOAD_PORT"))
-        if ota_port:
-            env.Replace(UPLOADCMD="$UPLOADOTACMD")
-
     if "uploadfs" in COMMAND_LINE_TARGETS:
         env.Replace(
             UPLOADERFLAGS=[
-                "--chip", "esp32", "--port", '"$UPLOAD_PORT"', "--baud",
-                "$UPLOAD_SPEED", "--before", "default_reset", "--after",
-                "hard_reset", "write_flash", "-z", "--flash_mode",
-                "$BOARD_FLASH_MODE", "--flash_size", "detect", "$SPIFFS_START"
+                "--chip", "esp32",
+                "--port", '"$UPLOAD_PORT"',
+                "--baud", "$UPLOAD_SPEED",
+                "--before", "default_reset",
+                "--after", "hard_reset",
+                "write_flash", "-z",
+                "--flash_mode", "$BOARD_FLASH_MODE",
+                "--flash_size", "detect",
+                "$SPIFFS_START"
             ],
             UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $SOURCE',
         )
         env.Append(UPLOADEROTAFLAGS=["-s"])
 
+    # Handle uploading via OTA
+    ota_port = None
+    if env.get("UPLOAD_PORT"):
+        ota_port = re.match(
+            r"\"?((([0-9]{1,3}\.){3}[0-9]{1,3})|.+\.local)\"?$",
+            env.get("UPLOAD_PORT"))
+    if ota_port:
+        env.Replace(UPLOADCMD="$UPLOADOTACMD")
+
     upload_actions = [
         env.VerboseAction(env.AutodetectUploadPort,
                           "Looking for upload port..."),
diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
index 3a1b7ce..840c806 100644
--- a/examples/arduino-blink/platformio.ini
+++ b/examples/arduino-blink/platformio.ini
@@ -11,18 +11,22 @@
 platform = espressif32
 framework = arduino
 board = esp32dev
+monitor_speed = 115200
 
-[env:esp-wrover-kit]
+[env:esp wrover kit]
 platform = espressif32
 framework = arduino
 board = esp-wrover-kit
+monitor_speed = 115200
 
 [env:quantum]
 platform = espressif32
 framework = arduino
 board = quantum
+monitor_speed = 115200
 
 [env:lolin32]
 platform = espressif32
 framework = arduino
 board = lolin32
+monitor_speed = 115200
diff --git a/examples/arduino-wifiscan/platformio.ini b/examples/arduino-wifiscan/platformio.ini
index 0ab6904..c10fb3f 100644
--- a/examples/arduino-wifiscan/platformio.ini
+++ b/examples/arduino-wifiscan/platformio.ini
@@ -11,18 +11,22 @@
 platform = espressif32
 framework = arduino
 board = esp32dev
+monitor_speed = 115200
 
 [env:nano32]
 platform = espressif32
 framework = arduino
 board = nano32
+monitor_speed = 115200
 
 [env:espea32]
 platform = espressif32
 framework = arduino
 board = espea32
+monitor_speed = 115200
 
 [env:esp320]
 platform = espressif32
 framework = arduino
 board = esp320
+monitor_speed = 115200
diff --git a/examples/espidf-hello-world/platformio.ini b/examples/espidf-hello-world/platformio.ini
index 8b15518..d5db57d 100644
--- a/examples/espidf-hello-world/platformio.ini
+++ b/examples/espidf-hello-world/platformio.ini
@@ -19,7 +19,7 @@ framework = espidf
 board = quantum
 monitor_speed = 115200
 
-[env:lolin32]
+[env:lolin 32]
 platform = espressif32
 framework = espidf
 board = lolin32
diff --git a/platform.json b/platform.json
index 48a133b..d35ae24 100644
--- a/platform.json
+++ b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "1.0.2",
+  "version": "1.1.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",
@@ -45,12 +45,12 @@
     "framework-arduinoespressif32": {
       "type": "framework",
       "optional": true,
-      "version": "~1.5.3"
+      "version": "~1.6.0"
     },
     "framework-espidf": {
       "type": "framework",
       "optional": true,
-      "version": "~2.300.0"
+      "version": "~2.301.0"
     },
     "framework-simba": {
       "type": "framework",
@@ -64,7 +64,7 @@
     },
     "tool-esptoolpy": {
       "type": "uploader",
-      "version": "~1.20310.0"
+      "version": "~1.20410.0"
     },
     "tool-espotapy": {
       "type": "uploader",
diff --git a/platform.py b/platform.py
index c9210a4..74686b7 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:
@@ -75,7 +74,7 @@ class Espressif32Platform(PlatformBase):
                 "init_cmds": [
                     "define pio_reset_halt_target",
                     "   mon reset halt",
-                    "   x $a1=0",
+                    "   flushregs",
                     "end",
                     "define pio_reset_target",
                     "   mon reset",