From 3be135cb1c1ba1df98f9a0d5d92d712f2a7a609c Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 14 Mar 2021 11:21:55 +0100
Subject: [PATCH] Tasmota32 with env

---
 platformio_override_sample.ini         |  2 +
 platformio_tasmota_env32.ini           | 70 ++++++++++++++------------
 tasmota/tasmota.h                      |  1 -
 tasmota/tasmota_configurations.h       |  9 ----
 tasmota/tasmota_configurations_ESP32.h | 11 +---
 5 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index da565a651..380145cd6 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -29,6 +29,8 @@ default_envs =
 ;                tasmota32
 ;                tasmota32-bluetooth
 ;                tasmota32-webcam
+;                tasmota32-knx
+;                tasmota32-sensors
 ;                tasmota32-display
 ;                tasmota32-ir
 ;                tasmota32-ircustom
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 29e8d69a5..219776576 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -1,4 +1,4 @@
-[env:tasmota32]
+[env:tasmota32_base]
 framework               = ${common.framework}
 platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
@@ -30,8 +30,12 @@ lib_ignore              =
 ; Disable next if you want to use ArduinoOTA in Tasmota32 (default disabled)
     ArduinoOTA
 
+[env:tasmota32]
+extends                 = env:tasmota32_base
+build_flags             = ${common32.build_flags} -DFIRMWARE_TASMOTA32
+
 [env:tasmota32-webcam]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 board                   = esp32cam
 board_build.f_cpu       = 240000000L
 board_build.flash_mode  = qio
@@ -40,7 +44,7 @@ build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-
 lib_extra_dirs          = lib/libesp32, lib/lib_basic
 
 [env:tasmota32-odroidgo]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 board                   = odroid_esp32
 board_build.f_cpu       = 240000000L
 board_build.flash_mode  = qio
@@ -51,7 +55,7 @@ build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display
 
 [env:tasmota32-core2]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 board                   = odroid_esp32
 board_build.f_cpu       = 240000000L
 board_build.flash_mode  = qio
@@ -62,120 +66,120 @@ build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
 
 [env:tasmota32-bluetooth]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DFIRMWARE_BLUETOOTH
 lib_extra_dirs          = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_ssl
 
 [env:tasmota32-display]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DFIRMWARE_DISPLAYS
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_display
 
 [env:tasmota32-ir]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR
 lib_extra_dirs          = lib/libesp32, lib/lib_basic
 
 [env:tasmota32-ircustom]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR_CUSTOM
 
 [env:tasmota32-AF]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=af_AF
 
 [env:tasmota32-BG]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=bg_BG
 
 [env:tasmota32-BR]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=pt_BR
 
 [env:tasmota32-CN]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=zh_CN
 
 [env:tasmota32-CZ]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=cs_CZ
 
 [env:tasmota32-DE]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=de_DE
 
 [env:tasmota32-ES]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=es_ES
 
 [env:tasmota32-FR]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=fr_FR
 
 [env:tasmota32-FY]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=fy_NL
 
 [env:tasmota32-GR]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=el_GR
 
 [env:tasmota32-HE]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=he_HE
 
 [env:tasmota32-HU]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=hu_HU
 
 [env:tasmota32-IT]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=it_IT
 
 [env:tasmota32-KO]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=ko_KO
 
 [env:tasmota32-NL]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=nl_NL
 
 [env:tasmota32-PL]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=pl_PL
 
 [env:tasmota32-PT]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=pt_PT
 
 [env:tasmota32-RO]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=ro_RO
 
 [env:tasmota32-RU]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=ru_RU
 
 [env:tasmota32-SE]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=sv_SE
 
 [env:tasmota32-SK]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=sk_SK
 
 [env:tasmota32-TR]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=tr_TR
 
 [env:tasmota32-TW]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=zh_TW
 
 [env:tasmota32-UK]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=uk_UA
 
 [env:tasmota32-VN]
-extends                 = env:tasmota32
+extends                 = env:tasmota32_base
 build_flags             = ${common32.build_flags} -DMY_LANGUAGE=vi_VN
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 6c3f2c7db..87e5f01b3 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -31,7 +31,6 @@
 \*********************************************************************************************/
 
 #define CODE_IMAGE_STR "tasmota"
-#define FLAG_VARIANT_TASMOTA32
 
 #define USE_LIGHT                           // Enable light control
 #define USE_ENERGY_SENSOR                   // Use energy sensors (+14k code)
diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h
index beefe4d8b..c4956bdbd 100644
--- a/tasmota/tasmota_configurations.h
+++ b/tasmota/tasmota_configurations.h
@@ -29,8 +29,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "sensors"
-#undef FLAG_VARIANT_TASMOTA32
-
 
 #undef USE_DISCOVERY                             // Disable mDNS (+8k code or +23.5k code with core 2_5_x, +0.3k mem)
 
@@ -233,7 +231,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "knx"
-#undef FLAG_VARIANT_TASMOTA32
 
 #ifndef USE_KNX
 #define USE_KNX                                  // Enable KNX IP Protocol Support (+23k code, +3k3 mem)
@@ -260,7 +257,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "display"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef USE_EMULATION                             // Disable Belkin WeMo and Hue Bridge emulation for Alexa (-16k code, -2k mem)
 #undef USE_EMULATION_HUE                         // Disable Hue Bridge emulation for Alexa (+14k code, +2k mem common)
@@ -342,7 +338,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "ir"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef USE_EMULATION
 #undef USE_EMULATION_HUE                         // Disable Hue emulation - only for lights and relays
@@ -468,7 +463,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "zbbridge"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef MODULE
 #define MODULE                 SONOFF_ZB_BRIDGE  // [Module] Select default module from tasmota_template.h
@@ -626,7 +620,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "lite"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef APP_SLEEP
 #define APP_SLEEP 1                              // Default to sleep = 1 for FIRMWARE_LITE
@@ -759,7 +752,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "minimal"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef FIRMWARE_LITE                             // Disable tasmota-lite with no sensors
 #undef FIRMWARE_SENSORS                          // Disable tasmota-sensors with useful sensors enabled
@@ -907,7 +899,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "mini-custom"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef FIRMWARE_LITE                            // Disable tasmota-lite with no sensors
 #undef FIRMWARE_SENSORS                         // Disable tasmota-sensors with useful sensors enabled
diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index 990d95edc..3b0f969a4 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -31,7 +31,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "webcam"
-#undef FLAG_VARIANT_TASMOTA32
 
 #define USE_WEBCAM
 #undef  USE_MI_ESP32                             // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
@@ -46,7 +45,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "odroid-go"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef MODULE
 #define MODULE                 ODROID_GO         // [Module] Select default module from tasmota_template.h
@@ -74,7 +72,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "core2"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef MODULE
 #define MODULE                 M5STACK_CORE2     // [Module] Select default module from tasmota_template.h
@@ -129,7 +126,6 @@
 
 #undef CODE_IMAGE_STR
 #define CODE_IMAGE_STR "bluetooth"
-#undef FLAG_VARIANT_TASMOTA32
 
 #undef MODULE
 #define MODULE                 WEMOS             // [Module] Select default module from tasmota_template.h
@@ -149,10 +145,7 @@
  * Provide an image which includes KNX and Sensors
 \*********************************************************************************************/
 
-// FLAG_VARIANT_TASMOTA32 is set for variant "Tasmota32" -> tasmota.h
-// for all other Tasmota build variants this flag needs to be undefined!!
-
-#ifdef FLAG_VARIANT_TASMOTA32
+#ifdef FIRMWARE_TASMOTA32
 
 #define USE_ENHANCED_GUI_WIFI_SCAN
 
@@ -325,7 +318,7 @@
 #define USE_KNX                                  // Enable KNX IP Protocol Support (+23k code, +3k3 mem)
 #endif
 
-#endif // FLAG_VARIANT_TASMOTA32
+#endif // FIRMWARE_TASMOTA32
 
 #endif  // ESP32
 #endif  // _TASMOTA_CONFIGURATIONS_ESP32_H_