From eaaea504df43bb48763fc85b48a94f49313e15e3 Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 9 Oct 2026 08:36:15 +0200 Subject: [PATCH] rename tasmota, fix includes --- boards/s3_32M_P.json | 2 +- boards/s_16M.json | 2 +- boards/s_16M_P.json | 2 +- boards/s_4M.json | 2 +- mock-api/restServer.ts | 6 +++--- platformio.ini | 23 ++++++++++++++--------- src/core/analogsensor.h | 2 +- src/core/command.h | 2 +- src/core/console.cpp | 2 +- src/core/console_stream.h | 2 +- src/core/default_settings.h | 2 +- src/core/emsesp.h | 4 ++-- src/core/httpClient.cpp | 2 +- src/core/mqtt.h | 2 +- src/core/network.cpp | 2 +- src/core/shuntingYard.cpp | 2 +- src/core/system.cpp | 4 ++-- src/core/system.h | 2 +- src/core/temperaturesensor.h | 2 +- src/emsesp_version.h | 2 +- src/test/test.cpp | 2 +- src/web/WebCommandService.cpp | 2 +- src/web/WebStatusService.cpp | 2 +- 23 files changed, 40 insertions(+), 35 deletions(-) diff --git a/boards/s3_32M_P.json b/boards/s3_32M_P.json index 792b1a6b1..e172d9bb7 100644 --- a/boards/s3_32M_P.json +++ b/boards/s3_32M_P.json @@ -21,7 +21,7 @@ "arduino", "espidf" ], - "name": "Tasmota ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS", + "name": "ESP32-S3 32M Flash OPI PSRAM, 4608KB Code/OTA, 2MB FS", "upload": { "flash_size": "32MB", "maximum_ram_size": 327680, diff --git a/boards/s_16M.json b/boards/s_16M.json index 664d2bd61..c9a0d32a2 100644 --- a/boards/s_16M.json +++ b/boards/s_16M.json @@ -18,7 +18,7 @@ "arduino", "espidf" ], - "name": "Tasmota ESP32 16M Flash, 4608KB Code/OTA, 2MB FS", + "name": "ESP32 16M Flash, 4608KB Code/OTA, 2MB FS", "upload": { "flash_size": "16MB", "maximum_ram_size": 327680, diff --git a/boards/s_16M_P.json b/boards/s_16M_P.json index a0d10643d..f9218cea9 100644 --- a/boards/s_16M_P.json +++ b/boards/s_16M_P.json @@ -19,7 +19,7 @@ "arduino", "espidf" ], - "name": "Tasmota ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS", + "name": "ESP32 16M Flash DIO PSRAM, 4608KB Code/OTA, 2MB FS", "upload": { "flash_size": "16MB", "maximum_ram_size": 327680, diff --git a/boards/s_4M.json b/boards/s_4M.json index 8978e2625..2c2b0ebeb 100644 --- a/boards/s_4M.json +++ b/boards/s_4M.json @@ -17,7 +17,7 @@ "arduino", "espidf" ], - "name": "Tasmota ESP32 4M Flash, 4608KB Code/OTA, 2MB FS", + "name": "ESP32 4M Flash, 4608KB Code/OTA, 2MB FS", "upload": { "flash_size": "4MB", "maximum_ram_size": 327680, diff --git a/mock-api/restServer.ts b/mock-api/restServer.ts index c606b951b..5e2c14f66 100644 --- a/mock-api/restServer.ts +++ b/mock-api/restServer.ts @@ -103,7 +103,7 @@ let system_status = { cpu_cores: 2, cpu_freq_mhz: 240, max_alloc_heap: 191, - arduino_version: 'Tasmota Arduino v3.3.8', + arduino_version: 'Arduino v3.3.8', sdk_version: '5.5.4.260407', partition: 'app0', flash_chip_size: 16384, @@ -209,7 +209,7 @@ switch (emulate_esp) { case 'ESP32': system_status.esp_platform = 'ESP32'; system_status.cpu_type = 'ESP32-D0WD-V3'; - system_status.arduino_version = 'Tasmota Arduino v3.3.8'; + system_status.arduino_version = 'Arduino v3.3.8'; system_status.sdk_version = '5.5.4.260407'; system_status.psram = true; system_status.psram_size = 4096; @@ -225,7 +225,7 @@ switch (emulate_esp) { default: system_status.esp_platform = 'ESP32S3'; system_status.cpu_type = 'ESP32-S3'; - system_status.arduino_version = 'Tasmota Arduino v3.3.8'; + system_status.arduino_version = 'Arduino v3.3.8'; system_status.sdk_version = '5.5.4.260407'; system_status.psram = true; system_status.psram_size = 8189; diff --git a/platformio.ini b/platformio.ini index db0340026..1f7fc3038 100644 --- a/platformio.ini +++ b/platformio.ini @@ -21,8 +21,8 @@ extra_configs = pio_local.ini [common] -core_build_flags = -std=gnu++20 -O3 -flto=auto -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format -Wno-missing-field-initializers -core_unbuild_flags = -std=gnu++11 -std=gnu++14 -std=gnu++17 -fno-lto +core_build_flags = -Wall -Wextra -Wno-type-limits -Wno-unused-parameter -Wno-unused-variable -Wno-format -Wno-missing-field-initializers +core_unbuild_flags = -O2 -O3 -Og -fno-lto my_build_flags = @@ -31,6 +31,9 @@ build_flags = ${factory_settings.build_flags} ${common.my_build_flags} -I./src/core + ; core 3.3.12 uses spi_host_device_t in ETH.h without including it. A framework + ; refresh restores that header, so force the declaration on every compile. + -include hal/spi_types.h -D ARDUINO_ARCH_ESP32 -D ONEWIRE_CRC16=0 -D CONFIG_UART_ISR_IN_IRAM @@ -62,8 +65,7 @@ framework = arduino board_build.partitions = partitions/esp32_partition_4M.csv board_upload.flash_size = 4MB board_build.app_partition_name = app0 -platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.05.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.8 based on IDF 5.5.4.260407 -; platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.09.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.12 based on IDF 5.5.5 +platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.09.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.12 based on IDF 5.5.5 ; 16MB Flash variants [espressif32_base_16M] @@ -71,8 +73,8 @@ framework = arduino board_build.partitions = partitions/esp32_partition_16M.csv board_upload.flash_size = 16MB board_build.app_partition_name = app0 -platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.05.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.8 based on IDF 5.5.4.260407 -; platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.09.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.12 based on IDF 5.5.5 +platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.09.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.12 based on IDF 5.5.5 +; platform_packages = framework-arduinoespressif32 @ https://github.com/emsesp/esp32-arduino-lib-builder/releases/download/0810-2237-5.5.5/framework-arduinoespressif32-v5.5.5-a63b839f.tar.xz ; 32MB Flash variants [espressif32_base_32M] @@ -80,8 +82,7 @@ framework = arduino board_build.partitions = partitions/esp32_partition_32M.csv board_upload.flash_size = 32MB board_build.app_partition_name = app0 -platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.05.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.8 based on IDF 5.5.4.260407 -; platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.09.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.12 based on IDF 5.5.5 +platform = https://github.com/tasmota/platform-espressif32/releases/download/2026.09.50/platform-espressif32.zip ; Tasmota Arduino Core 3.3.12 based on IDF 5.5.5 [env] build_flags = @@ -143,7 +144,11 @@ custom_sdkconfig = '# CONFIG_LWIP_IP_FORWARD is not set' '# CONFIG_LWIP_IPV4_NAPT is not set' '# CONFIG_ULP_COPROC_ENABLED is not set' - CONFIG_LWIP_LOCAL_HOSTNAME="ems-esp" + '# CONFIG_ETH_USE_SPI_ETHERNET is not set' + '# CONFIG_ETH_SPI_ETHERNET_W5500 is not set' + '# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set' + '# CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set' + '# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set' [env:s3_16M_P] ; 16MB ESP32-S3 - with PSRAM - like a BBQKees S3 diff --git a/src/core/analogsensor.h b/src/core/analogsensor.h index ce3909953..a6f334a9a 100644 --- a/src/core/analogsensor.h +++ b/src/core/analogsensor.h @@ -21,7 +21,7 @@ #include "helpers.h" #include "mqtt.h" -#include "console.h" +#include "emsesp_console.h" #include diff --git a/src/core/command.h b/src/core/command.h index efc8ed6a4..1a2d2b820 100644 --- a/src/core/command.h +++ b/src/core/command.h @@ -21,7 +21,7 @@ #include -#include "console.h" +#include "emsesp_console.h" #include using uuid::console::Shell; diff --git a/src/core/console.cpp b/src/core/console.cpp index da3ef8815..be2f828b5 100644 --- a/src/core/console.cpp +++ b/src/core/console.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "console.h" +#include "emsesp_console.h" #include "console_stream.h" #include "emsesp.h" diff --git a/src/core/console_stream.h b/src/core/console_stream.h index ba1a4458e..edb95a749 100644 --- a/src/core/console_stream.h +++ b/src/core/console_stream.h @@ -20,7 +20,7 @@ #include -#include "console.h" +#include "emsesp_console.h" namespace emsesp { diff --git a/src/core/default_settings.h b/src/core/default_settings.h index fea89c2fc..ab15b0e3e 100644 --- a/src/core/default_settings.h +++ b/src/core/default_settings.h @@ -304,7 +304,7 @@ enum { #define STRINGIZE(s) #s #endif -#define ARDUINO_VERSION_STR(major, minor, patch) "Tasmota Arduino v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch) +#define ARDUINO_VERSION_STR(major, minor, patch) "Arduino v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch) #define ARDUINO_VERSION ARDUINO_VERSION_STR(ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH) #endif diff --git a/src/core/emsesp.h b/src/core/emsesp.h index ac15d7fb5..d5fe2212d 100644 --- a/src/core/emsesp.h +++ b/src/core/emsesp.h @@ -66,10 +66,10 @@ #include "mqtt.h" #include "modbus.h" #include "system.h" -#include "network.h" +#include "emsesp_network.h" #include "temperaturesensor.h" #include "analogsensor.h" -#include "console.h" +#include "emsesp_console.h" #include "console_stream.h" #include "shower.h" #include "roomcontrol.h" diff --git a/src/core/httpClient.cpp b/src/core/httpClient.cpp index 29f00eba8..cf2a104c0 100644 --- a/src/core/httpClient.cpp +++ b/src/core/httpClient.cpp @@ -18,7 +18,7 @@ #include "emsesp.h" -#include "httpClient.h" +#include "emsesp_http_client.h" #include #include diff --git a/src/core/mqtt.h b/src/core/mqtt.h index a8d6503df..5bbf9f821 100644 --- a/src/core/mqtt.h +++ b/src/core/mqtt.h @@ -23,7 +23,7 @@ #include "helpers.h" #include "system.h" -#include "console.h" +#include "emsesp_console.h" #include "command.h" #include "emsdevicevalue.h" #include diff --git a/src/core/network.cpp b/src/core/network.cpp index 235619916..8dbeccb8f 100644 --- a/src/core/network.cpp +++ b/src/core/network.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "network.h" +#include "emsesp_network.h" #include "emsesp.h" diff --git a/src/core/shuntingYard.cpp b/src/core/shuntingYard.cpp index a60fc77a6..78a5fed2c 100644 --- a/src/core/shuntingYard.cpp +++ b/src/core/shuntingYard.cpp @@ -22,7 +22,7 @@ #include "shuntingYard.h" -#include "httpClient.h" +#include "emsesp_http_client.h" namespace emsesp { diff --git a/src/core/system.cpp b/src/core/system.cpp index 3c65f7c82..2d8eb1aba 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -17,7 +17,7 @@ */ #include "system.h" -#include "network.h" +#include "emsesp_network.h" #include "emsesp.h" // for send_raw_telegram() command #ifndef EMSESP_STANDALONE @@ -33,7 +33,7 @@ #include "firmwareVersion.h" #include "shuntingYard.h" // for compute() used by the message and sendmail commands -#include "httpClient.h" // for the shared TLS client settings +#include "emsesp_http_client.h" // for the shared TLS client settings #if defined(EMSESP_TEST) #include "../test/test.h" diff --git a/src/core/system.h b/src/core/system.h index 66b1c8fc0..36b061d45 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -23,7 +23,7 @@ #include #include "helpers.h" -#include "console.h" +#include "emsesp_console.h" #include "mqtt.h" #include "telegram.h" #include "led.h" diff --git a/src/core/temperaturesensor.h b/src/core/temperaturesensor.h index 1b9ebe23a..42fc29be4 100644 --- a/src/core/temperaturesensor.h +++ b/src/core/temperaturesensor.h @@ -23,7 +23,7 @@ #include "helpers.h" #include "mqtt.h" -#include "console.h" +#include "emsesp_console.h" #include diff --git a/src/emsesp_version.h b/src/emsesp_version.h index fc1c2c9d9..98f549e52 100644 --- a/src/emsesp_version.h +++ b/src/emsesp_version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.9.0-dev.16" +#define EMSESP_APP_VERSION "3.9.0-dev.17a" diff --git a/src/test/test.cpp b/src/test/test.cpp index 9a1045ea5..8e38974dd 100644 --- a/src/test/test.cpp +++ b/src/test/test.cpp @@ -458,7 +458,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const // S3 has 16MB flash // EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_0-dev_32-ESP32S3-16MB+.bin"); // S3 - // Test for 4MB Tasmota builds + // Test for 4MB builds // EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_2-dev_8-ESP32-4MB.bin"); // S32 EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_2-dev_8-ESP32-16MB.bin"); // E32 diff --git a/src/web/WebCommandService.cpp b/src/web/WebCommandService.cpp index 62b6610d5..62db7a08e 100644 --- a/src/web/WebCommandService.cpp +++ b/src/web/WebCommandService.cpp @@ -20,7 +20,7 @@ #include "WebCommandService.h" #include "shuntingYard.h" -#include "httpClient.h" +#include "emsesp_http_client.h" namespace emsesp { diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp index 642d84a52..6207e5db8 100644 --- a/src/web/WebStatusService.cpp +++ b/src/web/WebStatusService.cpp @@ -21,7 +21,7 @@ #ifndef EMSESP_STANDALONE #include #endif -#include "httpClient.h" +#include "emsesp_http_client.h" namespace emsesp {