jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/arendst/Tasmota into development

Browse Source
This commit is contained in:
Theo Arends 2024-04-15 12:26:52 +02:00
commit d957c97c1e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/Tasmota_build_devel.yml vendored
View File

@ -99,8 +99,8 @@ jobs:
- tasmota32c2-safeboot - tasmota32c2-safeboot
- tasmota32c3cdc-safeboot - tasmota32c3cdc-safeboot
- tasmota32s2-safeboot - tasmota32s2-safeboot
- tasmota32s2cdc-safeboot
- tasmota32s3cdc-safeboot - tasmota32s3cdc-safeboot
- tasmota32c2-safeboot
- tasmota32c6cdc-safeboot - tasmota32c6cdc-safeboot
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -192,7 +192,6 @@ jobs:
- tasmota32c6cdc - tasmota32c6cdc
- tasmota32s2 - tasmota32s2
- tasmota32s2cdc - tasmota32s2cdc
- tasmota32s3
- tasmota32s3cdc - tasmota32s3cdc
- tasmota32solo1 - tasmota32solo1
steps: steps:

10
tasmota/include/tasmota_configurations_ESP32.h
View File

@ -186,10 +186,12 @@
#define USE_WEBSERVER #define USE_WEBSERVER
#define USE_WEBCLIENT #define USE_WEBCLIENT
#define USE_WEBCLIENT_HTTPS #define USE_WEBCLIENT_HTTPS
#if CONFIG_IDF_TARGET_ESP32
#define USE_SERIAL_BRIDGE // Add support for software Serial Bridge console Tee (+2k code) // FIX ME Safeboot for ESP32 and ESP32solo1 to big with Core 3.0.0
#define USE_ETHERNET //#if CONFIG_IDF_TARGET_ESP32
#endif // CONFIG_IDF_TARGET_ESP32 // #define USE_SERIAL_BRIDGE // Add support for software Serial Bridge console Tee (+2k code)
// #define USE_ETHERNET
//#endif // CONFIG_IDF_TARGET_ESP32
#endif // FIRMWARE_SAFEBOOT #endif // FIRMWARE_SAFEBOOT