Merge pull request #14339 from Jason2866/autoconf

enable autoconf for all esp32 builds
This commit is contained in:
Jason2866 2022-01-08 23:42:51 +01:00 committed by GitHub
commit 0d6b7124e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions

View File

@ -58,17 +58,17 @@ build_flags = ${core32solo1.build_flags} -DFIRMWARE_TASMOTA32
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32-cam board = esp32-cam
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_WEBCAM build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_WEBCAM
lib_extra_dirs = lib/libesp32 lib_extra_dirs = lib/lib_ssl, lib/libesp32
[env:tasmota32-odroidgo] [env:tasmota32-odroidgo]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32-odroid board = esp32-odroid
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_ODROID_GO -DUSE_UNIVERSAL_DISPLAY -DUSE_AUTOCONF build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_ODROID_GO -DUSE_UNIVERSAL_DISPLAY
[env:tasmota32-core2] [env:tasmota32-core2]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32-m5core2 board = esp32-m5core2
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_M5STACK_CORE2 -DUSE_UNIVERSAL_DISPLAY -DUSE_AUTOCONF build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_M5STACK_CORE2 -DUSE_UNIVERSAL_DISPLAY
lib_extra_dirs = lib/libesp32, lib/libesp32_lvgl, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio lib_extra_dirs = lib/libesp32, lib/libesp32_lvgl, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
[env:tasmota32-bluetooth] [env:tasmota32-bluetooth]
@ -79,25 +79,25 @@ lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib
[env:tasmota32-display] [env:tasmota32-display]
extends = env:tasmota32_base extends = env:tasmota32_base
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_DISPLAYS build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_DISPLAYS
lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_display lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_display, lib/lib_ssl
[env:tasmota32-lvgl] [env:tasmota32-lvgl]
extends = env:tasmota32_base extends = env:tasmota32_base
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_LVGL -DUSE_AUTOCONF build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_LVGL
board_build.f_cpu = 160000000L board_build.f_cpu = 160000000L
lib_extra_dirs = lib/libesp32, lib/libesp32_lvgl, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display lib_extra_dirs = lib/libesp32, lib/libesp32_lvgl, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display
[env:tasmota32-ir] [env:tasmota32-ir]
extends = env:tasmota32_base extends = env:tasmota32_base
build_flags = ${env:tasmota32_base.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR build_flags = ${env:tasmota32_base.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
lib_extra_dirs = lib/libesp32, lib/lib_basic lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_ssl
[env:tasmota32c3] [env:tasmota32c3]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c3 board = esp32c3
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 -DUSE_AUTOCONF build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
lib_ignore = lib_ignore =
TTGO TWatch Library TTGO TWatch Library
Micro-RTSP Micro-RTSP
@ -106,7 +106,7 @@ lib_ignore =
[env:tasmota32s2] [env:tasmota32s2]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s2 board = esp32s2
build_flags = ${env:tasmota32_base.build_flags} -D FIRMWARE_TASMOTA32 -DUSE_AUTOCONF build_flags = ${env:tasmota32_base.build_flags} -D FIRMWARE_TASMOTA32
lib_ignore = lib_ignore =
TTGO TWatch Library TTGO TWatch Library
NimBLE-Arduino NimBLE-Arduino

View File

@ -1004,7 +1004,7 @@
//#define USE_IBEACON_ESP32 //#define USE_IBEACON_ESP32
//#define USE_WEBCAM // Add support for webcam //#define USE_WEBCAM // Add support for webcam
// #define USE_AUTOCONF // Enable Esp32 autoconf feature, requires USE_BERRY and USE_WEBCLIENT_HTTPS (12KB Flash) #define USE_AUTOCONF // Enable Esp32 autoconf feature, requires USE_BERRY and USE_WEBCLIENT_HTTPS (12KB Flash)
#define USE_BERRY // Enable Berry scripting language #define USE_BERRY // Enable Berry scripting language
#define USE_BERRY_PYTHON_COMPAT // Enable by default `import python_compat` #define USE_BERRY_PYTHON_COMPAT // Enable by default `import python_compat`
#define USE_BERRY_TIMEOUT 4000 // Timeout in ms, will raise an exception if running time exceeds this timeout #define USE_BERRY_TIMEOUT 4000 // Timeout in ms, will raise an exception if running time exceeds this timeout

View File

@ -51,7 +51,7 @@
#undef USE_DS18x20 #undef USE_DS18x20
#undef USE_WS2812 #undef USE_WS2812
#undef USE_ENERGY_SENSOR #undef USE_ENERGY_SENSOR
#undef USE_BERRY // Disable Berry scripting language //#undef USE_BERRY // Disable Berry scripting language
#undef USE_MI_ESP32 // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash) #undef USE_MI_ESP32 // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
#endif // FIRMWARE_WEBCAM #endif // FIRMWARE_WEBCAM