From 6f500e594b0bf9c1d9099e3fb3d4516dd9beed4c Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Nov 2021 14:53:49 +0100
Subject: [PATCH 1/2] align c3 variant to env standard

---
 platformio_tasmota_env32.ini | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 4d268b71e..00c00281a 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -121,17 +121,14 @@ build_flags             = ${env:tasmota32idf4.build_flags}
 ;                          -DUSE_BLE_ESP32
 ;                          -DUSE_MI_ESP32
                            ;-DESP32_STAGE=true
-lib_extra_dirs          = lib/libesp32
-                          lib/libesp32_div
-                          lib/libesp32_lvgl
-                          lib/lib_basic
-                          lib/lib_i2c
-                          lib/lib_ssl
-                          lib/lib_display
+                           -DFIRMWARE_TASMOTA32
 lib_ignore              =
+                          ESP8266Audio
+                          ESP8266SAM
                           TTGO TWatch Library
                           ESP32-HomeKit
                           Micro-RTSP
+                          epdiy
 
 [env:tasmota32-AF]
 extends                 = env:tasmota32_base

From b20a110b9332b541f143b85ec54716981474f284 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 7 Nov 2021 15:21:32 +0100
Subject: [PATCH 2/2] Refactor S2 env to align with env standard

---
 platformio_tasmota_cenv_sample.ini | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index b5854e80a..d3733589e 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -14,12 +14,11 @@ extends                     = env:tasmota32-dev
 platform_packages           = ${env:tasmota32-dev.platform_packages}
 board                       = esp32s2
 build_flags                 = ${env:tasmota32idf4.build_flags}
-lib_extra_dirs              = lib/libesp32
-                              lib/libesp32_lvgl
-                              lib/lib_basic
-                              lib/lib_i2c
-                              lib/lib_ssl
-                              lib/lib_display
+                             -D FIRMWARE_TASMOTA32
+lib_ignore                  =
+                              ESP8266Audio
+                              ESP8266SAM
+                              TTGO TWatch Library
 
 [env:tasmota-rangeextender]
 build_flags                 = ${env.build_flags}