From ae55b59756f1e6e271e9304980a97fd902836683 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 8 Jun 2018 19:53:48 +0300 Subject: [PATCH 01/16] Test project with space --- examples/arduino-blink/platformio.ini | 2 +- examples/espidf-hello-world/platformio.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index 3a1b7ce..2195501 100644 --- a/examples/arduino-blink/platformio.ini +++ b/examples/arduino-blink/platformio.ini @@ -12,7 +12,7 @@ platform = espressif32 framework = arduino board = esp32dev -[env:esp-wrover-kit] +[env:esp wrover kit] platform = espressif32 framework = arduino board = esp-wrover-kit 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 From a9fe7ed2f2824a94f7470b6b46211e654c600c40 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 9 Jun 2018 01:00:20 +0300 Subject: [PATCH 02/16] Restore formatting --- builder/main.py | 84 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 23 deletions(-) diff --git a/builder/main.py b/builder/main.py index 9b0b786..e211efe 100644 --- a/builder/main.py +++ b/builder/main.py @@ -140,22 +140,44 @@ 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"], + + CXXFLAGS=[ + "-fno-rtti", + "-fno-exceptions", + "-std=gnu++11" + ], + CPPDEFINES=[ - "ESP32", "ESP_PLATFORM", ("F_CPU", "$BOARD_F_CPU"), "HAVE_CONFIG_H", + "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" + "-nostdlib", + "-Wl,-static", + "-u", "call_user_start_cpu0", + "-Wl,--undefined=uxTopUsedPriority", + "-Wl,--gc-sections" ], SIZEPROGREGEXP=r"^(?:\.iram0\.text|\.dram0\.text|\.flash\.text|\.dram0\.data|\.flash\.rodata|)\s+(\d+).*", @@ -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", @@ -281,10 +314,15 @@ if upload_protocol == "esptool": 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', ) From bc058b977b7571feff5131d21756f0bfd7571ede Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 13 Jun 2018 13:45:04 +0300 Subject: [PATCH 03/16] Fix broken variant for ESP32vn IoT Uno // Issue #81 --- boards/esp32vn-iot-uno.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 0997da8..81fa9c2 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", From e9d3b71b884f24e0c2e486e567baee5b42d9a5ed Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 15 Jun 2018 21:35:03 +0300 Subject: [PATCH 04/16] Minor changes --- builder/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/main.py b/builder/main.py index e211efe..ea8439d 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 From edbf3131087c817a7868b9879109265ce4c4ef1a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 26 Jun 2018 00:45:23 +0300 Subject: [PATCH 05/16] 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: From d5074c53be728953d52eeb03e6dc21145b3a28fd Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 27 Jun 2018 14:28:05 +0300 Subject: [PATCH 06/16] Set monitor speed to 115200 by default --- examples/arduino-blink/platformio.ini | 4 ++++ examples/arduino-wifiscan/platformio.ini | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index 2195501..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] 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 From 2100b95f60d0edb380dbea1fcd09fe488ae7b64a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 Jun 2018 20:18:28 +0300 Subject: [PATCH 07/16] Update esptool to 2.4.1 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 48a133b..e736a51 100644 --- a/platform.json +++ b/platform.json @@ -64,7 +64,7 @@ }, "tool-esptoolpy": { "type": "uploader", - "version": "~1.20310.0" + "version": "~1.20410.0" }, "tool-espotapy": { "type": "uploader", From f7d095579178ef936defa96c6390f2656dd03056 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 Jun 2018 20:18:47 +0300 Subject: [PATCH 08/16] Update default debug initial commands --- platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.py b/platform.py index 3c9f05f..74686b7 100644 --- a/platform.py +++ b/platform.py @@ -74,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", From 4cb4d122a6532afbb9c14a4e5153c55dd871770b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 29 Jun 2018 18:53:42 +0300 Subject: [PATCH 09/16] Update ESP-IDF to 3.0.1 // Resolve #97 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index e736a51..53b3e04 100644 --- a/platform.json +++ b/platform.json @@ -50,7 +50,7 @@ "framework-espidf": { "type": "framework", "optional": true, - "version": "~2.300.0" + "version": "~2.301.0" }, "framework-simba": { "type": "framework", From e61786cac1e7c28c6341120bb602ec99380cbc28 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 29 Jun 2018 19:26:34 +0300 Subject: [PATCH 10/16] Update board flash size --- boards/esp-wrover-kit.json | 4 ++-- boards/esp32-evb.json | 2 +- boards/esp32-gateway.json | 2 +- boards/esp320.json | 2 +- boards/esp32dev.json | 2 +- boards/esp32doit-devkit-v1.json | 2 +- boards/esp32thing.json | 2 +- boards/esp32vn-iot-uno.json | 2 +- boards/espea32.json | 2 +- boards/espectro32.json | 2 +- boards/espino32.json | 2 +- boards/featheresp32.json | 2 +- boards/firebeetle32.json | 2 +- boards/heltec_wifi_kit_32.json | 2 +- boards/heltec_wifi_lora_32.json | 2 +- boards/hornbill32dev.json | 2 +- boards/hornbill32minima.json | 2 +- boards/intorobot.json | 2 +- boards/lolin32.json | 2 +- boards/m5stack-core-esp32.json | 2 +- boards/mhetesp32devkit.json | 2 +- boards/mhetesp32minikit.json | 2 +- boards/microduino-core-esp32.json | 2 +- boards/nano32.json | 2 +- boards/nina_w10.json | 2 +- boards/node32s.json | 2 +- boards/nodemcu-32s.json | 2 +- boards/onehorse32dev.json | 2 +- boards/pico32.json | 2 +- boards/pocket_32.json | 2 +- boards/quantum.json | 2 +- boards/wemosbat.json | 2 +- boards/widora-air.json | 2 +- 33 files changed, 34 insertions(+), 34 deletions(-) diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 7d21506..4e76b44 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -37,8 +37,8 @@ "name": "Espressif ESP-WROVER-KIT", "upload": { "flash_size": "4MB", - "maximum_ram_size": 4194304, - "maximum_size": 1310720, + "maximum_ram_size": 294912, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 3bc67e5..ee13349 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index e8a1cab..3eb5573 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/esp320.json b/boards/esp320.json index 9b1978a..c25f2cb 100644 --- a/boards/esp320.json +++ b/boards/esp320.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/esp32dev.json b/boards/esp32dev.json index 00c9eb5..3bc36dc 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index 44c61a7..2b8516d 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/esp32thing.json b/boards/esp32thing.json index 18fc65e..720f039 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index b4855c2..434fd08 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/espea32.json b/boards/espea32.json index 68ab985..beef4e7 100644 --- a/boards/espea32.json +++ b/boards/espea32.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/espectro32.json b/boards/espectro32.json index 6ddb2b4..a49bc26 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/espino32.json b/boards/espino32.json index ba7731d..7a9d217 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/featheresp32.json b/boards/featheresp32.json index a3d915c..44367f0 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index ae118ac..63fc373 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json index c631bc8..4c21a25 100644 --- a/boards/heltec_wifi_kit_32.json +++ b/boards/heltec_wifi_kit_32.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json index a63a698..53ec0ee 100644 --- a/boards/heltec_wifi_lora_32.json +++ b/boards/heltec_wifi_lora_32.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index 120577e..ec9c741 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index 0f6fa11..e255fe0 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/intorobot.json b/boards/intorobot.json index 4394697..627bbb0 100644 --- a/boards/intorobot.json +++ b/boards/intorobot.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/lolin32.json b/boards/lolin32.json index 0072cee..a37750e 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index 733b0d9..130331e 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 3f1eb31..6c3d631 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index 762db82..e06a08f 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/microduino-core-esp32.json b/boards/microduino-core-esp32.json index 17aa23b..eb29335 100644 --- a/boards/microduino-core-esp32.json +++ b/boards/microduino-core-esp32.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/nano32.json b/boards/nano32.json index c3f394e..b844800 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -25,7 +25,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/nina_w10.json b/boards/nina_w10.json index 55db93a..0f8549b 100644 --- a/boards/nina_w10.json +++ b/boards/nina_w10.json @@ -24,7 +24,7 @@ "upload": { "flash_size": "2MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 2097152, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/node32s.json b/boards/node32s.json index a64fcec..67445c6 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index 5a78ebe..0decbc6 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json index bc45b98..a2fa194 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/pico32.json b/boards/pico32.json index 7e64080..0fcdf35 100644 --- a/boards/pico32.json +++ b/boards/pico32.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/pocket_32.json b/boards/pocket_32.json index aa3d37f..625098b 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/quantum.json b/boards/quantum.json index 06f5541..7ffffb8 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "16MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 16777216, "protocol": "esptool", "protocols": [ "esptool" diff --git a/boards/wemosbat.json b/boards/wemosbat.json index d5a3b2f..7315cdc 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -26,7 +26,7 @@ "upload": { "flash_size": "4MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 4194304, "protocol": "esptool", "protocols": [ "esptool", diff --git a/boards/widora-air.json b/boards/widora-air.json index 4bcd7ff..0b48902 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -23,7 +23,7 @@ "upload": { "flash_size": "16MB", "maximum_ram_size": 294912, - "maximum_size": 1310720, + "maximum_size": 16777216, "protocol": "esptool", "protocols": [ "esptool" From 3d98efd6b4392f653ed012b48adf4e2e55acdcad Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Jul 2018 15:33:43 +0300 Subject: [PATCH 11/16] Fix maximum allowed data size for ESP32 --- boards/esp-wrover-kit.json | 2 +- boards/esp32-evb.json | 2 +- boards/esp32-gateway.json | 2 +- boards/esp320.json | 2 +- boards/esp32dev.json | 2 +- boards/esp32doit-devkit-v1.json | 2 +- boards/esp32thing.json | 2 +- boards/esp32vn-iot-uno.json | 2 +- boards/espea32.json | 2 +- boards/espectro32.json | 2 +- boards/espino32.json | 2 +- boards/featheresp32.json | 2 +- boards/firebeetle32.json | 2 +- boards/heltec_wifi_kit_32.json | 2 +- boards/heltec_wifi_lora_32.json | 2 +- boards/hornbill32dev.json | 2 +- boards/hornbill32minima.json | 2 +- boards/intorobot.json | 2 +- boards/lolin32.json | 2 +- boards/m5stack-core-esp32.json | 2 +- boards/mhetesp32devkit.json | 2 +- boards/mhetesp32minikit.json | 2 +- boards/microduino-core-esp32.json | 2 +- boards/nano32.json | 2 +- boards/nina_w10.json | 2 +- boards/node32s.json | 2 +- boards/nodemcu-32s.json | 2 +- boards/onehorse32dev.json | 2 +- boards/pico32.json | 2 +- boards/pocket_32.json | 2 +- boards/quantum.json | 2 +- boards/wemosbat.json | 2 +- boards/widora-air.json | 2 +- builder/main.py | 4 ++-- 34 files changed, 35 insertions(+), 35 deletions(-) diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 4e76b44..df342e9 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -37,7 +37,7 @@ "name": "Espressif ESP-WROVER-KIT", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index ee13349..e52e48d 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -25,7 +25,7 @@ "name": "OLIMEX ESP32-EVB", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index 3eb5573..5bd5b98 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -25,7 +25,7 @@ "name": "OLIMEX ESP32-GATEWAY", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/esp320.json b/boards/esp320.json index c25f2cb..f954995 100644 --- a/boards/esp320.json +++ b/boards/esp320.json @@ -22,7 +22,7 @@ "name": "Electronic SweetPeas ESP320", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/esp32dev.json b/boards/esp32dev.json index 3bc36dc..c4a0217 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -25,7 +25,7 @@ "name": "Espressif ESP32 Dev Module", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index 2b8516d..e321ce6 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -25,7 +25,7 @@ "name": "DOIT ESP32 DEVKIT V1", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/esp32thing.json b/boards/esp32thing.json index 720f039..b2ad0de 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -25,7 +25,7 @@ "name": "SparkFun ESP32 Thing", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 434fd08..7084280 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -25,7 +25,7 @@ "name": "ESP32vn IoT Uno", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/espea32.json b/boards/espea32.json index beef4e7..856df0f 100644 --- a/boards/espea32.json +++ b/boards/espea32.json @@ -22,7 +22,7 @@ "name": "April Brother ESPea32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/espectro32.json b/boards/espectro32.json index a49bc26..7050ce8 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -25,7 +25,7 @@ "name": "ESPectro32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/espino32.json b/boards/espino32.json index 7a9d217..e00919e 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -25,7 +25,7 @@ "name": "ESPino32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/featheresp32.json b/boards/featheresp32.json index 44367f0..906f6cb 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -25,7 +25,7 @@ "name": "Adafruit ESP32 Feather", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index 63fc373..d2ae31e 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -25,7 +25,7 @@ "name": "FireBeetle-ESP32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json index 4c21a25..3fc36ac 100644 --- a/boards/heltec_wifi_kit_32.json +++ b/boards/heltec_wifi_kit_32.json @@ -22,7 +22,7 @@ "name": "Heltec WIFI Kit 32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json index 53ec0ee..0da8fb4 100644 --- a/boards/heltec_wifi_lora_32.json +++ b/boards/heltec_wifi_lora_32.json @@ -22,7 +22,7 @@ "name": "Heltec WIFI LoRa 32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index ec9c741..d2cb208 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -25,7 +25,7 @@ "name": "Hornbill ESP32 Dev", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index e255fe0..7ec391f 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -25,7 +25,7 @@ "name": "Hornbill ESP32 Minima", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/intorobot.json b/boards/intorobot.json index 627bbb0..dab9610 100644 --- a/boards/intorobot.json +++ b/boards/intorobot.json @@ -22,7 +22,7 @@ "name": "IntoRobot Fig", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/lolin32.json b/boards/lolin32.json index a37750e..7c54c81 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -25,7 +25,7 @@ "name": "WEMOS LOLIN32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index 130331e..9f32c0e 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -22,7 +22,7 @@ "name": "M5Stack Core ESP32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 6c3d631..83bfed0 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -25,7 +25,7 @@ "name": "MH ET LIVE ESP32DevKIT", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index e06a08f..e135f80 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -25,7 +25,7 @@ "name": "MH ET LIVE ESP32MiniKit", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/microduino-core-esp32.json b/boards/microduino-core-esp32.json index eb29335..4d000ba 100644 --- a/boards/microduino-core-esp32.json +++ b/boards/microduino-core-esp32.json @@ -22,7 +22,7 @@ "name": "Microduino Core ESP32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/nano32.json b/boards/nano32.json index b844800..4350355 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -24,7 +24,7 @@ "name": "MakerAsia Nano32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/nina_w10.json b/boards/nina_w10.json index 0f8549b..f69f598 100644 --- a/boards/nina_w10.json +++ b/boards/nina_w10.json @@ -23,7 +23,7 @@ "name": "u-blox NINA-W10 series", "upload": { "flash_size": "2MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 2097152, "protocol": "esptool", "protocols": [ diff --git a/boards/node32s.json b/boards/node32s.json index 67445c6..85fb660 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -25,7 +25,7 @@ "name": "Node32s", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index 0decbc6..8a9f00e 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -25,7 +25,7 @@ "name": "NodeMCU-32S", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json index a2fa194..c681c11 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -22,7 +22,7 @@ "name": "Onehorse ESP32 Dev Module", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/pico32.json b/boards/pico32.json index 0fcdf35..accf092 100644 --- a/boards/pico32.json +++ b/boards/pico32.json @@ -22,7 +22,7 @@ "name": "ESP32 Pico Kit", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/pocket_32.json b/boards/pocket_32.json index 625098b..265a036 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -25,7 +25,7 @@ "name": "Dongsen Tech Pocket 32", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/quantum.json b/boards/quantum.json index 7ffffb8..e34bed8 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -22,7 +22,7 @@ "name": "Noduino Quantum", "upload": { "flash_size": "16MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 16777216, "protocol": "esptool", "protocols": [ diff --git a/boards/wemosbat.json b/boards/wemosbat.json index 7315cdc..d459efb 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -25,7 +25,7 @@ "name": "WeMos WiFi & Bluetooth Battery", "upload": { "flash_size": "4MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 4194304, "protocol": "esptool", "protocols": [ diff --git a/boards/widora-air.json b/boards/widora-air.json index 0b48902..a53a6ff 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -22,7 +22,7 @@ "name": "Widora AIR", "upload": { "flash_size": "16MB", - "maximum_ram_size": 294912, + "maximum_ram_size": 327680, "maximum_size": 16777216, "protocol": "esptool", "protocols": [ diff --git a/builder/main.py b/builder/main.py index ea8439d..6d5a50c 100644 --- a/builder/main.py +++ b/builder/main.py @@ -180,8 +180,8 @@ env.Replace( "-Wl,--gc-sections" ], - SIZEPROGREGEXP=r"^(?:\.iram0\.text|\.dram0\.text|\.flash\.text|\.dram0\.data|\.flash\.rodata|)\s+(\d+).*", - SIZEDATAREGEXP=r"^(?:\.dram0\.data|\.dram0\.bss)\s+(\d+).*", + 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", From fefd489cf79fe3a02044cb6c66c9324997d4c4e0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Jul 2018 15:56:04 +0300 Subject: [PATCH 12/16] Set default upload speed to 921600 --- boards/esp-wrover-kit.json | 2 +- boards/esp32-evb.json | 2 +- boards/esp32-gateway.json | 2 +- boards/esp320.json | 2 +- boards/esp32dev.json | 2 +- boards/esp32doit-devkit-v1.json | 2 +- boards/esp32thing.json | 2 +- boards/esp32vn-iot-uno.json | 2 +- boards/espea32.json | 2 +- boards/espino32.json | 2 +- boards/featheresp32.json | 2 +- boards/firebeetle32.json | 2 +- boards/heltec_wifi_kit_32.json | 2 +- boards/heltec_wifi_lora_32.json | 2 +- boards/hornbill32dev.json | 2 +- boards/hornbill32minima.json | 2 +- boards/intorobot.json | 2 +- boards/lolin32.json | 2 +- boards/m5stack-core-esp32.json | 2 +- boards/mhetesp32devkit.json | 2 +- boards/mhetesp32minikit.json | 2 +- boards/nano32.json | 2 +- boards/nina_w10.json | 2 +- boards/node32s.json | 2 +- boards/nodemcu-32s.json | 2 +- boards/onehorse32dev.json | 2 +- boards/pico32.json | 2 +- boards/pocket_32.json | 2 +- boards/quantum.json | 2 +- boards/wemosbat.json | 2 +- boards/widora-air.json | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index df342e9..cdd88c7 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -50,7 +50,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "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 e52e48d..330149a 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "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 5bd5b98..edb8157 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "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 f954995..fe2c064 100644 --- a/boards/esp320.json +++ b/boards/esp320.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "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 c4a0217..064df32 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "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 e321ce6..46c971e 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://www.doit.am/", "vendor": "DOIT" diff --git a/boards/esp32thing.json b/boards/esp32thing.json index b2ad0de..f17aaa4 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "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 7084280..e1101eb 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "https://esp32.vn/", "vendor": "ESP32vn" diff --git a/boards/espea32.json b/boards/espea32.json index 856df0f..1b94555 100644 --- a/boards/espea32.json +++ b/boards/espea32.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "https://blog.aprbrother.com/product/espea", "vendor": "April Brother" diff --git a/boards/espino32.json b/boards/espino32.json index e00919e..ac5c2dc 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "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 906f6cb..9bae251 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "https://www.adafruit.com/product/3405", "vendor": "Adafruit" diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index d2ae31e..7c09e8b 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "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 3fc36ac..6e3c7bc 100644 --- a/boards/heltec_wifi_kit_32.json +++ b/boards/heltec_wifi_kit_32.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "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 0da8fb4..ee48d15 100644 --- a/boards/heltec_wifi_lora_32.json +++ b/boards/heltec_wifi_lora_32.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://www.heltec.cn", "vendor": "Heltec Automation" diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index d2cb208..015d347 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "https://hackaday.io/project/18997-hornbill", "vendor": "Hornbill" diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index 7ec391f..f81bf1f 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "https://hackaday.io/project/18997-hornbill", "vendor": "Hornbill" diff --git a/boards/intorobot.json b/boards/intorobot.json index dab9610..5ab27c1 100644 --- a/boards/intorobot.json +++ b/boards/intorobot.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://docs.intorobot.com/zh/hardware/fig/hardware/", "vendor": "IntoRobot" diff --git a/boards/lolin32.json b/boards/lolin32.json index 7c54c81..f39bef7 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "https://wemos.cc", "vendor": "WEMOS" diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index 9f32c0e..dcd382b 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://www.m5stack.com", "vendor": "M5Stack" diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 83bfed0..2202631 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://forum.mhetlive.com", "vendor": "MH-ET Live" diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index e135f80..0bec143 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://forum.mhetlive.com", "vendor": "MH-ET Live" diff --git a/boards/nano32.json b/boards/nano32.json index 4350355..79e9cf6 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -31,7 +31,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "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 f69f598..8099566 100644 --- a/boards/nina_w10.json +++ b/boards/nina_w10.json @@ -30,7 +30,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "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 85fb660..b1ff128 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://www.ayarafun.com", "vendor": "Aiyarafun" diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index 8a9f00e..5435e74 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://www.nodemcu.com/", "vendor": "NodeMCU" diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json index c681c11..d383639 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "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 accf092..223510d 100644 --- a/boards/pico32.json +++ b/boards/pico32.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "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 265a036..78d492e 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://dong-sen.com", "vendor": "Dongsen Technology" diff --git a/boards/quantum.json b/boards/quantum.json index e34bed8..a0dac53 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://wiki.jackslab.org/Noduino", "vendor": "Noduino" diff --git a/boards/wemosbat.json b/boards/wemosbat.json index d459efb..7ca7a87 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -37,7 +37,7 @@ "minimodule" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "https://www.wemos.cc", "vendor": "WEMOS" diff --git a/boards/widora-air.json b/boards/widora-air.json index a53a6ff..7b5dcae 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -29,7 +29,7 @@ "esptool" ], "require_upload_port": true, - "speed": 115200 + "speed": 921600 }, "url": "http://widora.io", "vendor": "Widora" From 7b45f051f0536dc4f62316f096f9fec8a0a5981b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Jul 2018 15:57:15 +0300 Subject: [PATCH 13/16] New board "ODROID-GO" --- boards/odroid_esp32.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 boards/odroid_esp32.json 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" +} From a64488026cca484ec2f2210a2476cfd24d4a9772 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Jul 2018 15:58:17 +0300 Subject: [PATCH 14/16] Update Arduino Core to the latest upstream version --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 53b3e04..9c4ee41 100644 --- a/platform.json +++ b/platform.json @@ -45,7 +45,7 @@ "framework-arduinoespressif32": { "type": "framework", "optional": true, - "version": "~1.5.3" + "version": "~1.6.0" }, "framework-espidf": { "type": "framework", From b3bcc30858164ee70b40c08f88666842e9593c81 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Jul 2018 16:03:11 +0300 Subject: [PATCH 15/16] Fix SPIFFS uploading via OTA --- builder/main.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/builder/main.py b/builder/main.py index 6d5a50c..a39ffb8 100644 --- a/builder/main.py +++ b/builder/main.py @@ -301,16 +301,6 @@ 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=[ @@ -328,6 +318,15 @@ if upload_protocol == "esptool": ) 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..."), From 4af51082daa7282b8a57660c1971fdda5be89ea2 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Jul 2018 16:09:13 +0300 Subject: [PATCH 16/16] Bump version to 1.1.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 9c4ee41..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",