From f2c5b5acedd794f65b46c6c781877d938af61f01 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 17 Feb 2024 16:07:15 +0100 Subject: [PATCH 1/9] [HW info] Add checks for properly identify embedded flash/PSRAM --- src/src/Helpers/Hardware_device_info.cpp | 34 ++++++- src/src/Helpers/Hardware_device_info.h | 3 + .../Helpers/Hardware_device_info_ESP32.cpp | 16 +++ .../Helpers/Hardware_device_info_ESP32C2.cpp | 17 ++++ .../Helpers/Hardware_device_info_ESP32C3.cpp | 44 +++++++++ .../Helpers/Hardware_device_info_ESP32C6.cpp | 33 +++++++ .../Helpers/Hardware_device_info_ESP32S2.cpp | 63 ++++++++++++ .../Helpers/Hardware_device_info_ESP32S3.cpp | 99 +++++++++++++++++++ tools/pio/generate_web_flasher_manifest.py | 2 +- 9 files changed, 308 insertions(+), 3 deletions(-) create mode 100644 src/src/Helpers/Hardware_device_info_ESP32.cpp create mode 100644 src/src/Helpers/Hardware_device_info_ESP32C2.cpp create mode 100644 src/src/Helpers/Hardware_device_info_ESP32C3.cpp create mode 100644 src/src/Helpers/Hardware_device_info_ESP32C6.cpp create mode 100644 src/src/Helpers/Hardware_device_info_ESP32S2.cpp create mode 100644 src/src/Helpers/Hardware_device_info_ESP32S3.cpp diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index d25e351fdc..7831c1a781 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -249,9 +249,28 @@ String getChipFeaturesString() { if (getChipFeatures().ieee_802_15_4) { features += F("IEEE 802.15.4 / "); } - if (getChipFeatures().embeddedFlash) { features += F("Emb. Flash / "); } + const int32_t flash_cap = getEmbeddedFlashSize(); - if (getChipFeatures().embeddedPSRAM) { features += F("Emb. PSRAM"); } + if (getChipFeatures().embeddedFlash || (flash_cap != 0)) { + if (flash_cap > 0) { + features += strformat(F("%dMB "), flash_cap); + } else if (flash_cap < 0) { + features += strformat(F("(%d) "), flash_cap); + } + features += F("Emb. Flash"); + features += F(" / "); + } + + const int32_t psram_cap = getEmbeddedPSRAMSize(); + + if (getChipFeatures().embeddedPSRAM || (psram_cap != 0)) { + if (psram_cap > 0) { + features += strformat(F("%dMB "), psram_cap); + } else if (psram_cap < 0) { + features += strformat(F("(%d) "), psram_cap); + } + features += F("Emb. PSRAM"); + } features.trim(); if (features.endsWith(F("/"))) { features = features.substring(0, features.length() - 1); } @@ -590,6 +609,17 @@ const __FlashStringHelper* getChipModel() { - Reliable security features ensured by RSA-based secure boot, AES-XTS-based flash encryption, the innovative digital signature and the HMAC peripheral, “World Controller” */ + +/* + + efuse_reg.h: + EFUSE_RD_MAC_SPI_SYS_0_REG = block1_addr + EFUSE_RD_MAC_SPI_SYS_3_REG = block1_addr + (4 * num_word)) // (num_word = 3) + +*/ + pkg_version = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION); + + # ifdef CONFIG_IDF_TARGET_ESP32S3 # if (ESP_IDF_VERSION_MAJOR >= 5) diff --git a/src/src/Helpers/Hardware_device_info.h b/src/src/Helpers/Hardware_device_info.h index b768cad108..b162e6cfac 100644 --- a/src/src/Helpers/Hardware_device_info.h +++ b/src/src/Helpers/Hardware_device_info.h @@ -52,6 +52,9 @@ struct esp32_chip_features { esp32_chip_features getChipFeatures(); String getChipFeaturesString(); +int32_t getEmbeddedFlashSize(); +int32_t getEmbeddedPSRAMSize(); + // @retval true: octal (8 data lines) // @retval false: quad (4 data lines) bool getFlashChipOPI_wired(); diff --git a/src/src/Helpers/Hardware_device_info_ESP32.cpp b/src/src/Helpers/Hardware_device_info_ESP32.cpp new file mode 100644 index 0000000000..0134bf464e --- /dev/null +++ b/src/src/Helpers/Hardware_device_info_ESP32.cpp @@ -0,0 +1,16 @@ +#include "../Helpers/Hardware_device_info.h" + +#ifdef ESP32_CLASSIC + +int32_t getEmbeddedFlashSize() +{ + return 0; +} + +int32_t getEmbeddedPSRAMSize() +{ + // FIXME TD-er: Need to implement + return 0; +} + +#endif diff --git a/src/src/Helpers/Hardware_device_info_ESP32C2.cpp b/src/src/Helpers/Hardware_device_info_ESP32C2.cpp new file mode 100644 index 0000000000..14963dc57c --- /dev/null +++ b/src/src/Helpers/Hardware_device_info_ESP32C2.cpp @@ -0,0 +1,17 @@ +#include "../Helpers/Hardware_device_info.h" + +#ifdef ESP32C2 + +int32_t getEmbeddedFlashSize() +{ + // ESP32-C2 doesn't have eFuse field FLASH_CAP. + // Can't get info about the flash chip. + return 0; +} + +int32_t getEmbeddedPSRAMSize() +{ + // Doesn't have PSRAM + return 0; +} +#endif diff --git a/src/src/Helpers/Hardware_device_info_ESP32C3.cpp b/src/src/Helpers/Hardware_device_info_ESP32C3.cpp new file mode 100644 index 0000000000..9e47b5d29b --- /dev/null +++ b/src/src/Helpers/Hardware_device_info_ESP32C3.cpp @@ -0,0 +1,44 @@ +#include "../Helpers/Hardware_device_info.h" + +#ifdef ESP32C3 + +// See: https://github.com/espressif/esptool/blob/master/esptool/targets/esp32c3.py + + + # include + # include + # include + # include + + +/** EFUSE_FLASH_CAP : R; bitpos: [29:27]; default: 0; + * register: EFUSE_RD_MAC_SPI_SYS_3_REG + */ + # define EFUSE_FLASH_CAP 0x00000007U + # define EFUSE_FLASH_CAP_M (EFUSE_FLASH_CAP_V << EFUSE_FLASH_CAP_S) + # define EFUSE_FLASH_CAP_V 0x00000007U + # define EFUSE_FLASH_CAP_S 27 + + +int32_t getEmbeddedFlashSize() +{ + const uint32_t flash_cap = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_FLASH_CAP); + + switch (flash_cap) { + case 0: return 0; + case 1: return 4; + case 2: return 2; + case 3: return 1; + case 4: return 8; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(flash_cap); +} + +int32_t getEmbeddedPSRAMSize() +{ + // Doesn't have PSRAM + return 0; +} +#endif diff --git a/src/src/Helpers/Hardware_device_info_ESP32C6.cpp b/src/src/Helpers/Hardware_device_info_ESP32C6.cpp new file mode 100644 index 0000000000..484ee2b7bc --- /dev/null +++ b/src/src/Helpers/Hardware_device_info_ESP32C6.cpp @@ -0,0 +1,33 @@ +#include "../Helpers/Hardware_device_info.h" + +#ifdef ESP32C6 + +# include +# include +# include +# include + +int32_t getEmbeddedFlashSize() +{ + // See: framework-arduinoespressif32\tools\esp32-arduino-libs\esp32c6\include\soc\esp32c6\include\soc\efuse_reg.h + const uint32_t flash_cap = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_4_REG, EFUSE_FLASH_CAP); + + // FIXME TD-er: No idea about meaning of values + switch (flash_cap) { + case 0: return 0; + case 1: return 4; + case 2: return 2; + case 3: return 1; + case 4: return 8; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(flash_cap); +} + +int32_t getEmbeddedPSRAMSize() +{ + // Doesn't have PSRAM + return 0; +} +#endif diff --git a/src/src/Helpers/Hardware_device_info_ESP32S2.cpp b/src/src/Helpers/Hardware_device_info_ESP32S2.cpp new file mode 100644 index 0000000000..48f81dbb1b --- /dev/null +++ b/src/src/Helpers/Hardware_device_info_ESP32S2.cpp @@ -0,0 +1,63 @@ +#include "../Helpers/Hardware_device_info.h" + +#ifdef ESP32S2 + +// See: https://github.com/espressif/esptool/blob/master/esptool/targets/esp32s2.py + + # include + # include + # include + # include + + +// Flash datalines: https://github.com/tasmota/esp-idf/blob/206ce4b7f875bf5568ba47aba23f4b28e81b0574/components/efuse/esp32s2/esp_efuse_table.csv#L155 + + + +/** EFUSE_FLASH_CAP : R; bitpos: [24:21]; default: 0; + * register: EFUSE_RD_MAC_SPI_SYS_3_REG + */ + # define EFUSE_FLASH_CAP 0x0000000FU + # define EFUSE_FLASH_CAP_M (EFUSE_FLASH_CAP_V << EFUSE_FLASH_CAP_S) + # define EFUSE_FLASH_CAP_V 0x0000000FU + # define EFUSE_FLASH_CAP_S 21 + + +int32_t getEmbeddedFlashSize() +{ + const uint32_t flash_cap = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_FLASH_CAP); + + switch (flash_cap) { + case 0: return 0; + case 1: return 2; + case 2: return 4; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(flash_cap); +} + +/** EFUSE_PSRAM_CAP : R; bitpos: [31:28]; default: 0; + * register: EFUSE_RD_MAC_SPI_SYS_3_REG + */ + # define EFUSE_PSRAM_CAP 0x0000000FU + # define EFUSE_PSRAM_CAPACITY_M (EFUSE_PSRAM_CAPACITY_V << EFUSE_PSRAM_CAPACITY_S) + # define EFUSE_PSRAM_CAPACITY_V 0x0000000FU + # define EFUSE_PSRAM_CAPACITY_S 28 + +int32_t getEmbeddedPSRAMSize() +{ + const uint32_t psram_cap = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PSRAM_CAP); + + switch (psram_cap) { + case 0: return 0; + case 1: return 2; + case 2: return 4; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(psram_cap); +} + + +#endif diff --git a/src/src/Helpers/Hardware_device_info_ESP32S3.cpp b/src/src/Helpers/Hardware_device_info_ESP32S3.cpp new file mode 100644 index 0000000000..6f77195706 --- /dev/null +++ b/src/src/Helpers/Hardware_device_info_ESP32S3.cpp @@ -0,0 +1,99 @@ +#include "../Helpers/Hardware_device_info.h" + +#ifdef ESP32S3 + +// See: +// - https://github.com/espressif/esptool/blob/master/esptool/targets/esp32s3.py +// - https://github.com/tasmota/esp-idf/blob/206ce4b7f875bf5568ba47aba23f4b28e81b0574/components/efuse/esp32s3/esp_efuse_table.csv#L203-L208 + # include + # include + # include + # include + +// Flash data lines: https://github.com/tasmota/esp-idf/blob/206ce4b7f875bf5568ba47aba23f4b28e81b0574/components/efuse/esp32s3/esp_efuse_table.csv#L175 + +/** EFUSE_FLASH_CAP : R; bitpos: [29:27]; default: 0; + * register: EFUSE_RD_MAC_SPI_SYS_3_REG + */ + # define EFUSE_FLASH_CAP 0x00000007U + # define EFUSE_FLASH_CAP_M (EFUSE_FLASH_CAP_V << EFUSE_FLASH_CAP_S) + # define EFUSE_FLASH_CAP_V 0x00000007U + # define EFUSE_FLASH_CAP_S 27 + + +/** EFUSE_FLASH_VENDOR : R; bitpos: [2:0]; default: 0; + * register: EFUSE_RD_MAC_SPI_SYS_4_REG + */ + # define EFUSE_FLASH_VENDOR 0x00000007U + # define EFUSE_FLASH_VENDOR_M (EFUSE_FLASH_VENDOR_V << EFUSE_FLASH_VENDOR_S) + # define EFUSE_FLASH_VENDOR_V 0x00000007U + # define EFUSE_FLASH_VENDOR_S 0 + + +/* + switch (flash_vendor) + { + case 1: features += F("(XMC)"); break; + case 2: features += F("(GD)"); break; + case 3: features += F("(FM)"); break; + case 4: features += F("(TT)"); break; + case 5: features += F("(BY)"); break; + } + */ + + +int32_t getEmbeddedFlashSize() +{ + const uint32_t flash_cap = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_FLASH_CAP); + + switch (flash_cap) { + case 0: return 0; + case 1: return 8; + case 2: return 4; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(flash_cap); +} + +/** EFUSE_PSRAM_CAP : R; bitpos: [4:3]; default: 0; + * register: EFUSE_RD_MAC_SPI_SYS_4_REG + */ + # define EFUSE_PSRAM_CAP 0x00000003U + # define EFUSE_PSRAM_CAPACITY_M (EFUSE_PSRAM_CAPACITY_V << EFUSE_PSRAM_CAPACITY_S) + # define EFUSE_PSRAM_CAPACITY_V 0x00000003U + # define EFUSE_PSRAM_CAPACITY_S 3 + +/** EFUSE_PSRAM_VENDOR : R; bitpos: [8:7]; default: 0; + * register: EFUSE_RD_MAC_SPI_SYS_4_REG + */ + # define EFUSE_PSRAM_VENDOR 0x00000003U + # define EFUSE_PSRAM_VENDOR_M (EFUSE_PSRAM_VENDOR_V << EFUSE_PSRAM_VENDOR_S) + # define EFUSE_PSRAM_VENDOR_V 0x00000003U + # define EFUSE_PSRAM_VENDOR_S 7 + + +/* + switch (psram_vendor) + { + case 1: features += F("(AP_3v3)"); break; + case 2: features += F("(AP_1v8)"); break; + } +*/ + + +int32_t getEmbeddedPSRAMSize() +{ + const uint32_t psram_cap = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_4_REG, EFUSE_PSRAM_CAP); + + switch (psram_cap) { + case 0: return 0; + case 1: return 8; + case 2: return 2; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(psram_cap); +} + +#endif // ifdef ESP32S3 diff --git a/tools/pio/generate_web_flasher_manifest.py b/tools/pio/generate_web_flasher_manifest.py index dda0c80416..b0f1cbfadf 100644 --- a/tools/pio/generate_web_flasher_manifest.py +++ b/tools/pio/generate_web_flasher_manifest.py @@ -355,7 +355,7 @@ def generate_manifest_files(bin_folder, output_prefix): ' \n', ' \n', ' \n', ' \n', From 7399c7ac4916cf6e748a0710bfce6aeffc89692c Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 17 Feb 2024 16:08:21 +0100 Subject: [PATCH 2/9] [ESP8266] Reduce memory usage by actively flushing webpage buffers --- src/src/DataStructs/Web_StreamingBuffer.cpp | 9 ++++----- src/src/WebServer/ESPEasy_WebServer.cpp | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index ef27cd2d32..77fc6044bd 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -289,6 +289,7 @@ void Web_StreamingBuffer::endStream() { addLog(LOG_LEVEL_ERROR, concat("Webpage skipped: low memory: ", finalRam)); lowMemorySkip = false; } + delay(5); } @@ -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)) { @@ -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(); } @@ -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, diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 644c76849e..b138d4dc56 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -158,6 +158,11 @@ void sendHeadandTail_stdtemplate(bool Tail, bool rebooting) { */ #endif // ifndef BUILD_NO_DEBUG } + // We have sent a lot of data at once. + // try to flush it to the connected client to free up some RAM + // from pending transfers + TXBuffer.flush(); + delay(10); } bool captivePortal() { From e9d480833639fdbcead0647b1a762abf08006517 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 17 Feb 2024 16:08:59 +0100 Subject: [PATCH 3/9] [IPv6] Fix slowdown restarting services on receiving IPv6 address --- src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp | 2 +- src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp index 574c2aa879..75e86eb092 100644 --- a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp @@ -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 } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index 4a038eb601..7e81f864fe 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -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 } } From 77e1d29bdcbdd8ed7281e1fcb4b75298fd56a87c Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 17 Feb 2024 16:09:37 +0100 Subject: [PATCH 4/9] [ESP32-C3/C6] Fix web slowdown by reverting Arduino/IDF code --- platformio_core_defs.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 142a15b1b7..7315070d4f 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -209,9 +209,9 @@ lib_ignore = ; ESP_IDF 5.1 [core_esp32_IDF5_1__3_0_0] ;platform = https://github.com/Jason2866/platform-espressif32.git -platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.02.10/platform-espressif32.zip +platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.12/platform-espressif32.zip ;platform_packages = -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2036/framework-arduinoespressif32-release_v5.1-246cad0.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1976/framework-arduinoespressif32-release_v5.1-b8e2640.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From f79fbe5048cdaf95651316d03ace92c4e14f3754 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 17 Feb 2024 16:33:19 +0100 Subject: [PATCH 5/9] [Build] Fix build issue on ESP-IDF4.4 --- src/src/Helpers/Hardware_device_info.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index 7831c1a781..bae0d294ce 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -617,8 +617,9 @@ const __FlashStringHelper* getChipModel() { EFUSE_RD_MAC_SPI_SYS_3_REG = block1_addr + (4 * num_word)) // (num_word = 3) */ +# if (ESP_IDF_VERSION_MAJOR >= 5) pkg_version = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION); - +#endif # ifdef CONFIG_IDF_TARGET_ESP32S3 # if (ESP_IDF_VERSION_MAJOR >= 5) From 3a4e24f163127392057cff12daefccfed755f4e2 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 17 Feb 2024 16:57:16 +0100 Subject: [PATCH 6/9] [Build] Fix build on non-ESP32-S3 --- src/src/Helpers/Hardware_device_info.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index bae0d294ce..47d0b4ec9e 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -617,12 +617,10 @@ const __FlashStringHelper* getChipModel() { EFUSE_RD_MAC_SPI_SYS_3_REG = block1_addr + (4 * num_word)) // (num_word = 3) */ -# if (ESP_IDF_VERSION_MAJOR >= 5) - pkg_version = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION); -#endif # ifdef CONFIG_IDF_TARGET_ESP32S3 # if (ESP_IDF_VERSION_MAJOR >= 5) + pkg_version = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION); switch (pkg_version) { case 0: return F("ESP32-S3"); // QFN56 From 517b25973985914d5fa2356c3dbd231180a3ec09 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 17 Feb 2024 17:27:07 +0100 Subject: [PATCH 7/9] [Build] Fix typo in ESP32-S2 code --- src/src/Helpers/Hardware_device_info_ESP32S2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/src/Helpers/Hardware_device_info_ESP32S2.cpp b/src/src/Helpers/Hardware_device_info_ESP32S2.cpp index 48f81dbb1b..ea23ec982f 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32S2.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32S2.cpp @@ -41,9 +41,9 @@ int32_t getEmbeddedFlashSize() * register: EFUSE_RD_MAC_SPI_SYS_3_REG */ # define EFUSE_PSRAM_CAP 0x0000000FU - # define EFUSE_PSRAM_CAPACITY_M (EFUSE_PSRAM_CAPACITY_V << EFUSE_PSRAM_CAPACITY_S) - # define EFUSE_PSRAM_CAPACITY_V 0x0000000FU - # define EFUSE_PSRAM_CAPACITY_S 28 + # define EFUSE_PSRAM_CAP_M (EFUSE_PSRAM_CAP_V << EFUSE_PSRAM_CAP_S) + # define EFUSE_PSRAM_CAP_V 0x0000000FU + # define EFUSE_PSRAM_CAP_S 28 int32_t getEmbeddedPSRAMSize() { From bfe5926589cb009b7dc5ed4b68f841946c5f2008 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 18 Feb 2024 01:43:18 +0100 Subject: [PATCH 8/9] [ESP32-C3/C6] Fix stalling on concurrent connections --- platformio_core_defs.ini | 5 +++-- src/src/CustomBuild/define_plugin_sets.h | 2 +- src/src/DataStructs/Web_StreamingBuffer.cpp | 2 +- src/src/Helpers/Hardware_device_info_ESP32S3.cpp | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 7315070d4f..70c35edabd 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -209,14 +209,15 @@ lib_ignore = ; ESP_IDF 5.1 [core_esp32_IDF5_1__3_0_0] ;platform = https://github.com/Jason2866/platform-espressif32.git -platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.12/platform-espressif32.zip +platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.02.10/platform-espressif32.zip ;platform_packages = -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1976/framework-arduinoespressif32-release_v5.1-b8e2640.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2036/framework-arduinoespressif32-release_v5.1-246cad0.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -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 diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 5a46bc0905..5091c64f4a 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -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 diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index 77fc6044bd..b69173836e 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -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), diff --git a/src/src/Helpers/Hardware_device_info_ESP32S3.cpp b/src/src/Helpers/Hardware_device_info_ESP32S3.cpp index 6f77195706..298e8540f3 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32S3.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32S3.cpp @@ -60,9 +60,9 @@ int32_t getEmbeddedFlashSize() * register: EFUSE_RD_MAC_SPI_SYS_4_REG */ # define EFUSE_PSRAM_CAP 0x00000003U - # define EFUSE_PSRAM_CAPACITY_M (EFUSE_PSRAM_CAPACITY_V << EFUSE_PSRAM_CAPACITY_S) - # define EFUSE_PSRAM_CAPACITY_V 0x00000003U - # define EFUSE_PSRAM_CAPACITY_S 3 + # define EFUSE_PSRAM_CAP_M (EFUSE_PSRAM_CAP_V << EFUSE_PSRAM_CAP_S) + # define EFUSE_PSRAM_CAP_V 0x00000003U + # define EFUSE_PSRAM_CAP_S 3 /** EFUSE_PSRAM_VENDOR : R; bitpos: [8:7]; default: 0; * register: EFUSE_RD_MAC_SPI_SYS_4_REG From acd31386d406b6962830773f2ed6ea0a3031f83e Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 18 Feb 2024 01:44:15 +0100 Subject: [PATCH 9/9] [Build] Add flag to help not compile/download unused libs --- boards/esp32-cam.json | 2 +- boards/esp32-m5core2.json | 2 +- boards/esp32-odroid.json | 2 +- boards/esp32_16M1M.json | 2 +- boards/esp32_16M8M.json | 2 +- boards/esp32_4M.json | 2 +- boards/esp32_4M2M.json | 2 +- boards/esp32_4M_fix.json | 2 +- boards/esp32_8M.json | 2 +- boards/esp32_solo1_4M.json | 2 +- boards/esp32c2.json | 2 +- boards/esp32c2_2M.json | 2 +- boards/esp32c2_safeboot.json | 2 +- boards/esp32c3cdc.json | 2 +- boards/esp32c6cdc.json | 2 +- boards/esp32s2cdc.json | 2 +- boards/esp32s3cdc-qio_opi-16M.json | 2 +- boards/esp32s3cdc-qio_opi-8M.json | 2 +- boards/esp32s3cdc-qio_opi.json | 2 +- boards/esp32s3cdc-qio_qspi-16M.json | 2 +- boards/esp32s3cdc-qio_qspi-8M.json | 2 +- boards/esp32s3cdc-qio_qspi.json | 2 +- boards/esp8266_16M14M_board.json | 2 +- boards/esp8266_1M128k.json | 2 +- boards/esp8266_1M128k_OTA.json | 2 +- boards/esp8266_2M1M.json | 2 +- boards/esp8266_2M256.json | 2 +- boards/esp8266_4M1M_board.json | 2 +- boards/esp8266_4M2M_board.json | 2 +- boards/esp8266_4M3M.json | 2 +- boards/esp8266_zbbridge.json | 2 +- boards/esp8285_1M128k.json | 2 +- boards/esp8285_1M128k_OTA.json | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json index 6fd7bdb539..fdaff2c312 100644 --- a/boards/esp32-cam.json +++ b/boards/esp32-cam.json @@ -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", diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json index 0defb1d608..ac8f88085e 100644 --- a/boards/esp32-m5core2.json +++ b/boards/esp32-m5core2.json @@ -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", diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json index a63cbfbc5c..37f33f934c 100644 --- a/boards/esp32-odroid.json +++ b/boards/esp32-odroid.json @@ -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", diff --git a/boards/esp32_16M1M.json b/boards/esp32_16M1M.json index 58feece140..f636c5588f 100644 --- a/boards/esp32_16M1M.json +++ b/boards/esp32_16M1M.json @@ -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", diff --git a/boards/esp32_16M8M.json b/boards/esp32_16M8M.json index 453be7e5a5..ac7aca3530 100644 --- a/boards/esp32_16M8M.json +++ b/boards/esp32_16M8M.json @@ -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", diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json index d4b4e90b77..a48b32c229 100644 --- a/boards/esp32_4M.json +++ b/boards/esp32_4M.json @@ -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", diff --git a/boards/esp32_4M2M.json b/boards/esp32_4M2M.json index aac31ebdc9..96109a9ee2 100644 --- a/boards/esp32_4M2M.json +++ b/boards/esp32_4M2M.json @@ -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", diff --git a/boards/esp32_4M_fix.json b/boards/esp32_4M_fix.json index 5a2327b196..445eb5055d 100644 --- a/boards/esp32_4M_fix.json +++ b/boards/esp32_4M_fix.json @@ -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", diff --git a/boards/esp32_8M.json b/boards/esp32_8M.json index 02d5fb3627..ff72fa3074 100644 --- a/boards/esp32_8M.json +++ b/boards/esp32_8M.json @@ -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", diff --git a/boards/esp32_solo1_4M.json b/boards/esp32_solo1_4M.json index edee14a57e..dfc2b039e9 100644 --- a/boards/esp32_solo1_4M.json +++ b/boards/esp32_solo1_4M.json @@ -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", diff --git a/boards/esp32c2.json b/boards/esp32c2.json index f8b826fa20..2304758ec2 100644 --- a/boards/esp32c2.json +++ b/boards/esp32c2.json @@ -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", diff --git a/boards/esp32c2_2M.json b/boards/esp32c2_2M.json index 741790d71a..0d0cd9a374 100644 --- a/boards/esp32c2_2M.json +++ b/boards/esp32c2_2M.json @@ -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", diff --git a/boards/esp32c2_safeboot.json b/boards/esp32c2_safeboot.json index 0154e9a247..a0ef79f7c7 100644 --- a/boards/esp32c2_safeboot.json +++ b/boards/esp32c2_safeboot.json @@ -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", diff --git a/boards/esp32c3cdc.json b/boards/esp32c3cdc.json index 54b81e9d0e..206367fb93 100644 --- a/boards/esp32c3cdc.json +++ b/boards/esp32c3cdc.json @@ -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", diff --git a/boards/esp32c6cdc.json b/boards/esp32c6cdc.json index 339126b2ba..b6615cba4f 100644 --- a/boards/esp32c6cdc.json +++ b/boards/esp32c6cdc.json @@ -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", diff --git a/boards/esp32s2cdc.json b/boards/esp32s2cdc.json index f358f6a3cf..1f71388af4 100644 --- a/boards/esp32s2cdc.json +++ b/boards/esp32s2cdc.json @@ -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", diff --git a/boards/esp32s3cdc-qio_opi-16M.json b/boards/esp32s3cdc-qio_opi-16M.json index ff62fb1302..05b6807689 100644 --- a/boards/esp32s3cdc-qio_opi-16M.json +++ b/boards/esp32s3cdc-qio_opi-16M.json @@ -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", diff --git a/boards/esp32s3cdc-qio_opi-8M.json b/boards/esp32s3cdc-qio_opi-8M.json index 49511be404..064cb4019d 100644 --- a/boards/esp32s3cdc-qio_opi-8M.json +++ b/boards/esp32s3cdc-qio_opi-8M.json @@ -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", diff --git a/boards/esp32s3cdc-qio_opi.json b/boards/esp32s3cdc-qio_opi.json index 63f69a7d7d..03943d071d 100644 --- a/boards/esp32s3cdc-qio_opi.json +++ b/boards/esp32s3cdc-qio_opi.json @@ -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", diff --git a/boards/esp32s3cdc-qio_qspi-16M.json b/boards/esp32s3cdc-qio_qspi-16M.json index b93dc474d6..e924d3dbdd 100644 --- a/boards/esp32s3cdc-qio_qspi-16M.json +++ b/boards/esp32s3cdc-qio_qspi-16M.json @@ -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", diff --git a/boards/esp32s3cdc-qio_qspi-8M.json b/boards/esp32s3cdc-qio_qspi-8M.json index 705df27c40..669a50bb59 100644 --- a/boards/esp32s3cdc-qio_qspi-8M.json +++ b/boards/esp32s3cdc-qio_qspi-8M.json @@ -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", diff --git a/boards/esp32s3cdc-qio_qspi.json b/boards/esp32s3cdc-qio_qspi.json index e040168ac4..e1ecb79108 100644 --- a/boards/esp32s3cdc-qio_qspi.json +++ b/boards/esp32s3cdc-qio_qspi.json @@ -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", diff --git a/boards/esp8266_16M14M_board.json b/boards/esp8266_16M14M_board.json index 49de401108..b9632c2972 100644 --- a/boards/esp8266_16M14M_board.json +++ b/boards/esp8266_16M14M_board.json @@ -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", diff --git a/boards/esp8266_1M128k.json b/boards/esp8266_1M128k.json index edeb0be953..4dd7f03056 100644 --- a/boards/esp8266_1M128k.json +++ b/boards/esp8266_1M128k.json @@ -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", diff --git a/boards/esp8266_1M128k_OTA.json b/boards/esp8266_1M128k_OTA.json index 0f21682ee5..d6de103f66 100644 --- a/boards/esp8266_1M128k_OTA.json +++ b/boards/esp8266_1M128k_OTA.json @@ -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", diff --git a/boards/esp8266_2M1M.json b/boards/esp8266_2M1M.json index e1bf85b784..ea484598fc 100644 --- a/boards/esp8266_2M1M.json +++ b/boards/esp8266_2M1M.json @@ -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", diff --git a/boards/esp8266_2M256.json b/boards/esp8266_2M256.json index d7bfd158a1..91fa850395 100644 --- a/boards/esp8266_2M256.json +++ b/boards/esp8266_2M256.json @@ -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", diff --git a/boards/esp8266_4M1M_board.json b/boards/esp8266_4M1M_board.json index 45112964e0..9b98f1b165 100644 --- a/boards/esp8266_4M1M_board.json +++ b/boards/esp8266_4M1M_board.json @@ -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", diff --git a/boards/esp8266_4M2M_board.json b/boards/esp8266_4M2M_board.json index c04af6056f..e5aa17f165 100644 --- a/boards/esp8266_4M2M_board.json +++ b/boards/esp8266_4M2M_board.json @@ -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", diff --git a/boards/esp8266_4M3M.json b/boards/esp8266_4M3M.json index 7cf3a4a3f2..90b9450e98 100644 --- a/boards/esp8266_4M3M.json +++ b/boards/esp8266_4M3M.json @@ -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", diff --git a/boards/esp8266_zbbridge.json b/boards/esp8266_zbbridge.json index 4589dfc7d8..f323885601 100644 --- a/boards/esp8266_zbbridge.json +++ b/boards/esp8266_zbbridge.json @@ -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", diff --git a/boards/esp8285_1M128k.json b/boards/esp8285_1M128k.json index a7df5b0882..955e750c3a 100644 --- a/boards/esp8285_1M128k.json +++ b/boards/esp8285_1M128k.json @@ -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", diff --git a/boards/esp8285_1M128k_OTA.json b/boards/esp8285_1M128k_OTA.json index e6934c535b..be1576c299 100644 --- a/boards/esp8285_1M128k_OTA.json +++ b/boards/esp8285_1M128k_OTA.json @@ -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",