Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Misc] Various fixes for new installed nodes #4979

Merged
merged 9 commits into from
Feb 18, 2024
2 changes: 1 addition & 1 deletion boards/esp32-cam.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32-m5core2.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32-odroid.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32_16M1M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32_16M8M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32_4M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32_4M2M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32_4M_fix.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32_8M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_8M -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_8M -DESP32_CLASSIC",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32_solo1_4M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DCORE32SOLO1 -DESP32_CLASSIC",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DCORE32SOLO1 -DESP32_CLASSIC",
"f_cpu": "160000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32c2.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "esp32c2_out.ld"
},
"core": "esp32",
"extra_flags": "-DESP32_4M -DESP32C2",
"extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C2",
"f_cpu": "120000000L",
"f_flash": "60000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32c2_2M.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "esp32c2_out.ld"
},
"core": "esp32",
"extra_flags": "-DESP32_2M -DESP32C2",
"extra_flags": "-DARDUINO_TASMOTA -DESP32_2M -DESP32C2",
"f_cpu": "120000000L",
"f_flash": "60000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32c2_safeboot.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "esp32c2_out.ld"
},
"core": "esp32",
"extra_flags": "-DESP32_4M -DESP32C2",
"extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C2",
"f_cpu": "120000000L",
"f_flash": "60000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32c3cdc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "esp32c3_out.ld"
},
"core": "esp32",
"extra_flags": "-DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C3 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C3 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32c6cdc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "esp32c6_out.ld"
},
"core": "esp32",
"extra_flags": "-DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32C6 -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32C6 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32s2cdc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "dio_qspi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32s3cdc-qio_opi-16M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "qio_opi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32s3cdc-qio_opi-8M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "qio_opi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32s3cdc-qio_opi.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "qio_opi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32s3cdc-qio_qspi-16M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "qio_qspi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32s3cdc-qio_qspi-8M.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "qio_qspi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp32s3cdc-qio_qspi.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"memory_type": "qio_qspi"
},
"core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_16M14M_board.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.16m14m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_16M14M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_16M14M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_1M128k.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.1m128.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_1M128k_OTA.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.1m128.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_2M1M.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.2m1m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M1M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M1M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_2M256.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.2m256.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_4M1M_board.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.4m1m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M1M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M1M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_4M2M_board.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.4m2m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M2M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M2M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_4M3M.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.4m3m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M3M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M3M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8266_zbbridge.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.2m256.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256",
"f_cpu": "160000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8285_1M128k.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.1m128.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DESP8285 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DESP8285 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
2 changes: 1 addition & 1 deletion boards/esp8285_1M128k_OTA.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ldscript": "eagle.flash.1m128.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DESP8285 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DESP8285 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_1M",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
Expand Down
1 change: 1 addition & 0 deletions platformio_core_defs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ build_flags = -DESP32_STAGE
-DLIBRARIES_NO_LOG=1
-DDISABLE_SC16IS752_SPI
-DCONFIG_PM_ENABLE
-DCONFIG_LWIP_L2_TO_L3_COPY
-DCONFIG_FREERTOS_USE_TICKLESS_IDLE=1
-DCONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3
-DNEOPIXEL_ESP32_RMT_DEFAULT
Expand Down
2 changes: 1 addition & 1 deletion src/src/CustomBuild/define_plugin_sets.h
Original file line number Diff line number Diff line change
Expand Up @@ -2760,7 +2760,7 @@ To create/register a plugin, you have to :
#ifndef LIMIT_BUILD_SIZE
#ifndef FEATURE_MDNS
#ifdef ESP32
#define FEATURE_MDNS 1
#define FEATURE_MDNS 0
#else
// Do not use MDNS on ESP8266 due to memory leak
#define FEATURE_MDNS 0
Expand Down
11 changes: 5 additions & 6 deletions src/src/DataStructs/Web_StreamingBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifdef ESP8266
#define CHUNKED_BUFFER_SIZE 512
#else
#define CHUNKED_BUFFER_SIZE 1400
#define CHUNKED_BUFFER_SIZE 1200
#endif

Web_StreamingBuffer::Web_StreamingBuffer(void) : lowMemorySkip(false),
Expand Down Expand Up @@ -289,6 +289,7 @@ void Web_StreamingBuffer::endStream() {
addLog(LOG_LEVEL_ERROR, concat("Webpage skipped: low memory: ", finalRam));
lowMemorySkip = false;
}
delay(5);
}


Expand Down Expand Up @@ -327,8 +328,6 @@ void Web_StreamingBuffer::sendContentBlocking(String& data) {
if (length > 0) { web_server.sendContent(data); }
web_server.sendContent("\r\n");
#else // ESP8266 2.4.0rc2 and higher and the ESP32 webserver supports chunked http transfer
unsigned int timeout = 100;

web_server.sendContent(data);

if (data.length() > (CHUNKED_BUFFER_SIZE + 1)) {
Expand All @@ -337,9 +336,9 @@ void Web_StreamingBuffer::sendContentBlocking(String& data) {
data.clear();
}

const uint32_t beginWait = millis();
const uint32_t timeout = millis() + 100;
while ((!data.reserve(CHUNKED_BUFFER_SIZE) || (ESP.getFreeHeap() < 4000 /*freeBeforeSend*/ )) &&
!timeOutReached(beginWait + timeout)) {
!timeOutReached(timeout)) {
if (ESP.getFreeHeap() < duringTXRam) {
duringTXRam = ESP.getFreeHeap();
}
Expand All @@ -353,7 +352,7 @@ void Web_StreamingBuffer::sendContentBlocking(String& data) {
#endif // if defined(ESP8266) && defined(ARDUINO_ESP8266_RELEASE_2_3_0)

sentBytes += length;
delay(0);
delay(1);
}

void Web_StreamingBuffer::sendHeaderBlocking(bool allowOriginAll,
Expand Down
2 changes: 1 addition & 1 deletion src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void processEthernetGotIPv6() {
addLog(LOG_LEVEL_INFO, String(F("ETH event: Got IP6 ")) + EthEventData.unprocessed_IP6.toString(true));
EthEventData.processedGotIP6 = true;
#if FEATURE_ESPEASY_P2P
updateUDPport(true);
// updateUDPport(true);
#endif

}
Expand Down
2 changes: 1 addition & 1 deletion src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ void processGotIPv6() {
if (loglevelActiveFor(LOG_LEVEL_INFO))
addLog(LOG_LEVEL_INFO, String(F("WIFI : STA got IP6 ")) + WiFiEventData.unprocessed_IP6.toString(true));
#if FEATURE_ESPEASY_P2P
updateUDPport(true);
// updateUDPport(true);
#endif
}
}
Expand Down
Loading