jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 13:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align arduino3 firmware build to Tasmota32 (#20015)

Browse Source 
* step1 of phase out Arduino30 firmware variant

* rm duplicate Matter define
This commit is contained in:
Jason2866 2023-11-14 17:02:00 +01:00 committed by GitHub
parent 58f50045d9
commit 7abf8c469b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platformio_tasmota_core3_env_sample.ini
View File

@ -23,7 +23,6 @@ board = esp32
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -33,7 +32,6 @@ board = esp32_solo1
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -45,7 +43,6 @@ board_build.f_cpu = 240000000L
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -55,7 +52,6 @@ board = esp32s2
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -65,7 +61,6 @@ board = esp32s2cdc
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -77,7 +72,6 @@ board_build.f_flash = 80000000L
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -89,7 +83,6 @@ board_build.f_flash = 80000000L
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -99,7 +92,6 @@ board = esp32s3-qio_qspi
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -124,7 +116,6 @@ build_unflags = ${env:arduino30.build_unflags}
-DUSE_IPV6 -DUSE_IPV6
-mtarget-align -mtarget-align
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -137,7 +128,6 @@ build_unflags = ${env:arduino30.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
-fno-lto -fno-lto
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
@ -151,7 +141,6 @@ build_unflags = ${env:arduino30.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
-fno-lto -fno-lto
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -164,7 +153,6 @@ build_unflags = ${env:arduino30.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
-fno-lto -fno-lto
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -178,7 +166,6 @@ build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-fno-lto -fno-lto
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}
@ -192,7 +179,6 @@ build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-fno-lto -fno-lto
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30
-DUSE_MATTER_DEVICE
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore} lib_ignore = ${env:arduino30.lib_ignore}

25
tasmota/include/tasmota_configurations_ESP32.h
View File

@ -200,30 +200,7 @@
#define CODE_IMAGE_STR "arduino30" #define CODE_IMAGE_STR "arduino30"
#endif #endif
#define FIRMWARE_TASMOTA32
#undef FIRMWARE_LITE // Disable tasmota-lite with no sensors
#undef FIRMWARE_SENSORS // Disable tasmota-sensors with useful sensors enabled
#undef FIRMWARE_KNX_NO_EMULATION // Disable tasmota-knx with KNX but without Emulation
#undef FIRMWARE_DISPLAYS // Disable tasmota-display with display drivers enabled
#undef FIRMWARE_IR // Disable tasmota-ir with IR full protocols activated
#undef FIRMWARE_WEBCAM
#undef FIRMWARE_BLUETOOTH
#undef FIRMWARE_LVGL
#undef FIRMWARE_TASMOTA32
// -- Optional modules ----------------------------
#undef USE_SHUTTER // Disable Shutter support for up to 4 shutter with different motortypes (+6k code)
#define USE_AC_ZERO_CROSS_DIMMER // Enable support for AC_ZERO_CROSS_DIMMER
#define USE_IR_REMOTE // Enable IR driver
#define USE_TLS
#define USE_WEBSERVER
#define USE_WEBCLIENT
#define USE_WEBCLIENT_HTTPS
#define USE_SERIAL_BRIDGE // Add support for software Serial Bridge console Tee (+2k code)
#define USE_ETHERNET
#endif // FIRMWARE_ARDUINO30 #endif // FIRMWARE_ARDUINO30