From 71ca63e49d729a5866e7fd9c95b7bae7fc145b6b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 21 May 2022 14:01:30 +0200
Subject: [PATCH] Add platformio S3 and S3usb envs

- Add platformio S3 and S3usb envs
- Reorganize env32 to compile safeboot before production
---
 platformio_tasmota_cenv_sample.ini |   2 +-
 platformio_tasmota_env32.ini       | 138 +++++++++++++++--------------
 2 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index d2ac59086..90d13b59c 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -12,7 +12,7 @@ build_flags                 = ${env:tasmota32_base.build_flags}
                               -D USE_WIFI_RANGE_EXTENDER
                               -D USE_WIFI_RANGE_EXTENDER_NAPT
 
-[env:tasmota32s3]
+[env:tasmota32s3-file]
 extends                     = env:tasmota32_base
 board                       = esp32s3
 build_flags                 = ${env:tasmota32_base.build_flags} -D FIRMWARE_TASMOTA32
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index ee7be6bd1..177e9dc72 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -40,6 +40,16 @@ lib_ignore                  =
 ; tasmota/berry/modules/Partition_Manager.tapp
 custom_files_upload         = no_files
 
+[env:tasmota32-safeboot]
+extends                 = env:tasmota32_base
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT
+lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+lib_ignore              =
+                          TTGO TWatch Library
+                          NimBLE-Arduino
+                          Micro-RTSP
+                          epdiy
+
 [env:tasmota32]
 extends                 = env:tasmota32_base
 build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
@@ -54,13 +64,6 @@ extends                 = env:tasmota32_base
 board                   = esp32_16M
 build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 
-[env:tasmota32solo1]
-extends                 = env:tasmota32_base
-board                   = esp32_solo1_4M
-platform                = ${core32solo1.platform}
-platform_packages       = ${core32solo1.platform_packages}
-build_flags             = ${core32solo1.build_flags} -DFIRMWARE_TASMOTA32
-
 [env:tasmota32-webcam]
 extends                 = env:tasmota32_base
 board                   = esp32-cam
@@ -98,42 +101,6 @@ extends                 = env:tasmota32_base
 build_flags             = ${env:tasmota32_base.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_ssl
 
-[env:tasmota32c3]
-extends                 = env:tasmota32_base
-board                   = esp32c3
-build_unflags           = ${env:tasmota32_base.build_unflags}
-                          -flto
-                          -mtarget-align
-build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
-                          -fno-lto
-lib_ignore              =
-                          TTGO TWatch Library
-                          Micro-RTSP
-                          epdiy
-[env:tasmota32c3usb]
-extends                 = env:tasmota32c3
-board                   = esp32c3usb
-
-[env:tasmota32s2]
-extends                 = env:tasmota32_base
-board                   = esp32s2
-build_flags             = ${env:tasmota32_base.build_flags} -D FIRMWARE_TASMOTA32
-lib_ignore              =
-                          TTGO TWatch Library
-                          NimBLE-Arduino
-                          Micro-RTSP
-                          epdiy
-
-[env:tasmota32-safeboot]
-extends                 = env:tasmota32_base
-build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT
-lib_extra_dirs          = lib/lib_ssl, lib/libesp32
-lib_ignore              =
-                          TTGO TWatch Library
-                          NimBLE-Arduino
-                          Micro-RTSP
-                          epdiy
-
 [env:tasmota32solo1-safeboot]
 extends                 = env:tasmota32_base
 board                   = esp32_solo1_4M
@@ -147,6 +114,49 @@ lib_ignore              =
                           Micro-RTSP
                           epdiy
 
+[env:tasmota32solo1]
+extends                 = env:tasmota32_base
+board                   = esp32_solo1_4M
+platform                = ${core32solo1.platform}
+platform_packages       = ${core32solo1.platform_packages}
+build_flags             = ${core32solo1.build_flags} -DFIRMWARE_TASMOTA32
+
+[env:tasmota32c3-safeboot]
+extends                 = env:tasmota32_base
+board                   = esp32c3
+build_unflags           = ${env:tasmota32_base.build_unflags}
+                          -flto
+                          -mtarget-align
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT
+                          -fno-lto
+lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+lib_ignore              =
+                          TTGO TWatch Library
+                          NimBLE-Arduino
+                          Micro-RTSP
+                          epdiy
+
+[env:tasmota32c3]
+extends                 = env:tasmota32_base
+board                   = esp32c3
+build_unflags           = ${env:tasmota32_base.build_unflags}
+                          -flto
+                          -mtarget-align
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
+                          -fno-lto
+lib_ignore              =
+                          TTGO TWatch Library
+                          Micro-RTSP
+                          epdiy
+
+[env:tasmota32c3usb-safeboot]
+extends                 = env:tasmota32c3-safeboot
+board                   = esp32c3usb
+
+[env:tasmota32c3usb]
+extends                 = env:tasmota32c3
+board                   = esp32c3usb
+
 [env:tasmota32s2-safeboot]
 extends                 = env:tasmota32_base
 board                   = esp32s2
@@ -158,6 +168,16 @@ lib_ignore              =
                           Micro-RTSP
                           epdiy
 
+[env:tasmota32s2]
+extends                 = env:tasmota32_base
+board                   = esp32s2
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
+lib_ignore              =
+                          TTGO TWatch Library
+                          NimBLE-Arduino
+                          Micro-RTSP
+                          epdiy
+
 [env:tasmota32s3-safeboot]
 extends                 = env:tasmota32_base
 board                   = esp32s3
@@ -169,35 +189,23 @@ lib_ignore              =
                           Micro-RTSP
                           epdiy
 
-[env:tasmota32c3-safeboot]
+[env:tasmota32s3]
 extends                 = env:tasmota32_base
-board                   = esp32c3
-build_unflags           = ${env:tasmota32_base.build_unflags}
-                          -flto
-                          -mtarget-align
-build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT
-                          -fno-lto
-lib_extra_dirs          = lib/lib_ssl, lib/libesp32
+board                   = esp32s3
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 lib_ignore              =
                           TTGO TWatch Library
                           NimBLE-Arduino
                           Micro-RTSP
                           epdiy
 
-[env:tasmota32c3usb-safeboot]
-extends                 = env:tasmota32_base
-board                   = esp32c3usb
-build_unflags           = ${env:tasmota32_base.build_unflags}
-                          -flto
-                          -mtarget-align
-build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT
-                          -fno-lto
-lib_extra_dirs          = lib/lib_ssl, lib/libesp32
-lib_ignore              =
-                          TTGO TWatch Library
-                          NimBLE-Arduino
-                          Micro-RTSP
-                          epdiy
+[env:tasmota32s3usb-safeboot]
+extends                 = env:tasmota32s3-safeboot
+board                   = esp32s3usb
+
+[env:tasmota32s3usb]
+extends                 = env:tasmota32s3
+board                   = esp32s3usb
 
 [env:tasmota32-AF]
 extends                 = env:tasmota32_base