andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-10-28 11:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename tasmota, fix includes

Browse Source
This commit is contained in:
proddy
2026-10-09 08:36:15 +02:00
parent cefd5a14cf
commit eaaea504df
23 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/s3_32M_P.json
+1 -1
View File
@@ -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,
boards/s_16M.json
+1 -1
View File
@@ -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,
boards/s_16M_P.json
+1 -1
View File
@@ -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,
boards/s_4M.json
+1 -1
View File
@@ -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,
mock-api/restServer.ts
+3 -3
View File
@@ -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;
platformio.ini
+14 -9
View File
@@ -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
src/core/analogsensor.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include "helpers.h"
#include "mqtt.h"
#include "console.h"
#include "emsesp_console.h"
#include <uuid/log.h>
src/core/command.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include <map>
#include "console.h"
#include "emsesp_console.h"
#include <esp32-psram.h>
using uuid::console::Shell;
src/core/console.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "console.h"
#include "emsesp_console.h"
#include "console_stream.h"
#include "emsesp.h"
src/core/console_stream.h
+1 -1
View File
@@ -20,7 +20,7 @@
#include <uuid/console.h>
#include "console.h"
#include "emsesp_console.h"
namespace emsesp {
src/core/default_settings.h
+1 -1
View File
@@ -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
src/core/emsesp.h
+2 -2
View File
@@ -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"
src/core/httpClient.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "emsesp.h"
#include "httpClient.h"
#include "emsesp_http_client.h"
#include <WiFiClient.h>
#include <ESP_SSLClient.h>
src/core/mqtt.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "helpers.h"
#include "system.h"
#include "console.h"
#include "emsesp_console.h"
#include "command.h"
#include "emsdevicevalue.h"
#include <esp32-psram.h>
src/core/network.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "network.h"
#include "emsesp_network.h"
#include "emsesp.h"
src/core/shuntingYard.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "shuntingYard.h"
#include "httpClient.h"
#include "emsesp_http_client.h"
namespace emsesp {
src/core/system.cpp
+2 -2
View File
@@ -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"
src/core/system.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include <ArduinoJson.h>
#include "helpers.h"
#include "console.h"
#include "emsesp_console.h"
#include "mqtt.h"
#include "telegram.h"
#include "led.h"
src/core/temperaturesensor.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "helpers.h"
#include "mqtt.h"
#include "console.h"
#include "emsesp_console.h"
#include <uuid/log.h>
src/emsesp_version.h
+1 -1
View File
@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.9.0-dev.16"
#define EMSESP_APP_VERSION "3.9.0-dev.17a"
src/test/test.cpp
+1 -1
View File
@@ -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
src/web/WebCommandService.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "WebCommandService.h"
#include "shuntingYard.h"
#include "httpClient.h"
#include "emsesp_http_client.h"
namespace emsesp {
src/web/WebStatusService.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#ifndef EMSESP_STANDALONE
#include <esp_ota_ops.h>
#endif
#include "httpClient.h"
#include "emsesp_http_client.h"
namespace emsesp {