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",