Breaking: ESP32 Core 3.0.0 only support (#21180)

* Core 3.0.0 only * rm Arduino30 settings * rm lib ignore `NimBLE-Arduino` * rm obsolete or duplicate env entrys
arendst · Apr 15, 2024 · 951fba9 · 951fba9
1 parent a006e5f
commit 951fba9
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 388 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@
   - [ ] Only relevant files were touched
   - [ ] Only one feature/fix was added per PR and the code change compiles without warnings
   - [ ] The code change is tested and works with Tasmota core ESP8266 V.2.7.6
-  - [ ] The code change is tested and works with Tasmota core ESP32 V.2.0.15
+  - [ ] The code change is tested and works with Tasmota core ESP32 V.3.0.0
   - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
 
 _NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_
diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
@@ -96,14 +96,13 @@ jobs:
         variant:
           - tasmota32solo1-safeboot
           - tasmota32-safeboot
-          - tasmota32c3-safeboot
+          - tasmota32c2-safeboot
           - tasmota32c3cdc-safeboot
           - tasmota32s2-safeboot
           - tasmota32s2cdc-safeboot
           - tasmota32s3-safeboot
           - tasmota32s3cdc-safeboot
           - tasmota32c2-safeboot
-          - tasmota32c6-safeboot
           - tasmota32c6cdc-safeboot
     steps:
       - uses: actions/checkout@v4
@@ -117,7 +116,6 @@ jobs:
         run: |
           pip install wheel
           pip install -U platformio
-          cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Add SHA to footer
         run: |
@@ -191,15 +189,14 @@ jobs:
           - tasmota32-display
           - tasmota32-ir
           - tasmota32-lvgl
-          - tasmota32c3
+          - tasmota32c2
           - tasmota32c3cdc
+          - tasmota32c6cdc
           - tasmota32s2
           - tasmota32s2cdc
           - tasmota32s3
           - tasmota32s3cdc
           - tasmota32solo1
-          - tasmota32c2-arduino30
-          - tasmota32c6cdc-arduino30
     steps:
       - uses: actions/checkout@v4
         with:
@@ -212,7 +209,6 @@ jobs:
         run: |
           pip install wheel
           pip install -U platformio
-          cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Download safeboot firmwares
         uses: jason2866/[email protected]
@@ -253,7 +249,6 @@ jobs:
         run: |
           pip install wheel
           pip install -U platformio
-          cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Download safeboot firmwares
         uses: jason2866/[email protected]

diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
@@ -23,14 +23,13 @@ jobs:
         variant:
           - tasmota32solo1-safeboot
           - tasmota32-safeboot
-          - tasmota32c3-safeboot
+          - tasmota32c2-safeboot
           - tasmota32c3cdc-safeboot
           - tasmota32s2-safeboot
           - tasmota32s2cdc-safeboot
           - tasmota32s3-safeboot
           - tasmota32s3cdc-safeboot
           - tasmota32c2-safeboot
-          - tasmota32c6-safeboot
           - tasmota32c6cdc-safeboot
     steps:
       - uses: actions/checkout@v4
@@ -44,7 +43,6 @@ jobs:
         run: |
           pip install wheel
           pip install -U platformio
-          cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Add "release" to footer
         run: |
@@ -113,8 +111,9 @@ jobs:
           - tasmota32-display
           - tasmota32-ir
           - tasmota32-lvgl
-          - tasmota32c3
+          - tasmota32c2
           - tasmota32c3cdc
+          - tasmota32c6cdc
           - tasmota32s2
           - tasmota32s2cdc
           - tasmota32s3

diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
@@ -91,8 +91,7 @@ jobs:
           - tasmota-sensors
           - tasmota-zbbridge
           - tasmota32
-          - tasmota32c3
-          - tasmota32c6cdc-arduino30
+          - tasmota32c2
           - tasmota32s2
           - tasmota32s3
           - tasmota32-zbbrdgpro
@@ -104,18 +103,17 @@ jobs:
           - tasmota32-ir
           - tasmota32-lvgl
           - tasmota32c3cdc
+          - tasmota32c6cdc
           - tasmota32s2cdc
           - tasmota32s3cdc
           - tasmota32solo1
           - tasmota32solo1-safeboot
-          - tasmota32c3-safeboot
-          - tasmota32c3cdc-safeboot
           - tasmota32s2-safeboot
           - tasmota32s2cdc-safeboot
           - tasmota32s3-safeboot
-          - tasmota32s3cdc-safeboot
           - tasmota32c2-safeboot
-          - tasmota32c6-safeboot
+          - tasmota32s3cdc-safeboot
+          - tasmota32c3cdc-safeboot
           - tasmota32c6cdc-safeboot
     steps:
       - uses: actions/checkout@v4

diff --git a/pio-tools/override_copy.py b/pio-tools/override_copy.py
@@ -26,9 +26,3 @@
     print(Fore.GREEN + "*** use provided platformio_tasmota_cenv.ini as planned ***")
 else:
     shutil.copy("platformio_tasmota_cenv_sample.ini", "platformio_tasmota_cenv.ini")
-
-# copy platformio_tasmota_core3_env_sample.ini to platformio_tasmota_core3_env.ini
-if os.path.isfile("platformio_tasmota_core3_env.ini"):
-    print(Fore.GREEN + "*** use provided platformio_tasmota_core3_env.ini as planned ***")
-else:
-    shutil.copy("platformio_tasmota_core3_env_sample.ini", "platformio_tasmota_core3_env.ini")
diff --git a/platformio.ini b/platformio.ini
@@ -24,7 +24,6 @@ extra_configs               = platformio_tasmota32.ini
                               platformio_tasmota_env32.ini
                               platformio_override.ini
                               platformio_tasmota_cenv.ini
-                              platformio_tasmota_core3_env.ini
 
 [common]
 platform                    = ${core.platform}
@@ -141,7 +140,7 @@ lib_ignore                  =
 [core]
 ; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4. Added Backport for PWM selection
 platform                    = https://github.com/tasmota/platform-espressif8266/releases/download/2024.01.01/platform-espressif8266.zip
-platform_packages           = tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v4.7.1/esptool.zip
+platform_packages           = tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v4.7.2/esptool.zip
 build_unflags               = ${esp_defaults.build_unflags}
 build_flags                 = ${esp82xx_defaults.build_flags}
 ; *** Use ONE of the two PWM variants. Tasmota default is Locked PWM

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
@@ -44,23 +44,9 @@ default_envs            =
 ;                          tasmota32-odroidgo
 ;                          tasmota32-core2
 ;                          tasmota32-nspanel
-;
-; *** Build/upload environments for ESP32 Arduino Core 3.0
-;
-;                          tasmota32-arduino30
-;                          tasmota32solo1-arduino30
-;                          tasmota32-psramfix_ard3
-;                          tasmota32s2-arduino30
-;                          tasmota32s2cdc-arduino30
-;                          tasmota32s3-arduino30
-;                          tasmota32s3-qio_opi-ard30
-;                          tasmota32s3cdc-qio_opi-ard30
-;                          tasmota32s3cdc-webcam3
-;                          tasmota32c2-arduino30
-;                          tasmota32c3-arduino30
-;                          tasmota32c3cdc-arduino30
-;                          tasmota32c6-arduino30
-;                          tasmota32c6cdc-arduino30
+;                          tasmota32c2
+;                          tasmota32c6
+;                          tasmota32c6cdc
 ;                          tasmota32c2-safeboot
 ;                          tasmota32c6-safeboot
 ;                          tasmota32c6cdc-safeboot

diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
@@ -41,12 +41,12 @@ lib_ignore                  =
                               USB
                               NetBIOS
                               Preferences
-                              BluetoothSerial
                               ArduinoOTA
 extra_scripts               = pre:pio-tools/add_c_flags.py
                               pre:pio-tools/gen-berry-structures.py
                               post:pio-tools/post_esp32.py
                               ${esp_defaults.extra_scripts}
+monitor_filters             = esp32_exception_decoder
 
 [safeboot_flags]
 lib_ignore                  = ${esp32_defaults.lib_ignore}
@@ -76,28 +76,8 @@ lib_ignore                  = ${esp32_defaults.lib_ignore}
                               DHT sensor library
                               ccronexpr
 
-[core32_30_flags]
-build_unflags               = ${core32_30.build_unflags}
-build_flags                 = ${core32_30.build_flags}
-extra_scripts               = ${esp32_defaults.extra_scripts}
-lib_extra_dirs              = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_audio, lib/lib_display, lib/lib_rf, lib/libesp32, lib/libesp32_div, lib/libesp32_lvgl
-lib_ignore                  =
-                              HTTPUpdateServer
-                              USB
-                              NetBIOS
-                              Preferences
-                              ArduinoOTA
-                              NimBLE-Arduino
-
-
 [core32]
-platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.00/platform-espressif32.zip
+platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.11/platform-espressif32.zip
 platform_packages           =
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}
-
-[core32_30]
-platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.11/platform-espressif32.zip
-platform_packages           =
-build_unflags               = ${core32.build_unflags}
-build_flags                 = ${core32.build_flags}
diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
@@ -100,7 +100,6 @@ build_flags                 = ${env:tasmota32_base.build_flags}
 lib_extra_dirs              = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_ssl, lib/lib_i2c
 lib_ignore                  = TTGO TWatch Library
                               Micro-RTSP
-                              epdiy
 
 [env:tasmota32-mi32]
 extends                     = env:tasmota32_base
@@ -109,11 +108,8 @@ build_flags                 = ${env:tasmota32_base.build_flags}
                               -DUSE_MI_EXT_GUI
                               -DOTA_URL='""'
 lib_extra_dirs              = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
-lib_ignore                  = ESP8266Audio
-                              ESP8266SAM
-                              TTGO TWatch Library
+lib_ignore                  = TTGO TWatch Library
                               Micro-RTSP
-                              epdiy
 
 [env:tasmota32c3-mi32]
 extends                     = env:tasmota32c3
@@ -122,11 +118,8 @@ build_flags                 = ${env:tasmota32_base.build_flags}
                               -DUSE_MI_EXT_GUI
                               -DOTA_URL='""'
 lib_extra_dirs              = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
-lib_ignore                  = ESP8266Audio
-                              ESP8266SAM
-                              TTGO TWatch Library
+lib_ignore                  = TTGO TWatch Library
                               Micro-RTSP
-                              epdiy
 
 [env:tasmota32s3-mi32]
 extends                     = env:tasmota32s3
@@ -135,11 +128,9 @@ build_flags                 = ${env:tasmota32_base.build_flags}
                               -DUSE_MI_EXT_GUI
                               -DOTA_URL='""'
 lib_extra_dirs              = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
-lib_ignore                  = ESP8266Audio
-                              ESP8266SAM
-                              TTGO TWatch Library
+lib_ignore                  = TTGO TWatch Library
                               Micro-RTSP
-                              epdiy
+
 
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]
@@ -161,8 +152,6 @@ build_flags                 = ${env:tasmota32_base.build_flags}
 check_tool                  = cppcheck
                               ;clangtidy
 check_skip_packages         = yes
-monitor_filters             = esp32_exception_decoder
-;                              -Wstack-usage=300
 
 
 ; *** JTAG Debug version, needs esp-prog or FT2232H or FT232H
@@ -178,7 +167,6 @@ debug_init_break            = tbreak setup
 build_unflags               = ${env:tasmota32_base.build_unflags}
 build_flags                 = ${env:tasmota32_base.build_flags}
                               -DOTA_URL='""'
-monitor_filters             = esp32_exception_decoder
 
 [env:tasmota32solo1-ocd]
 build_type                  = debug
@@ -190,7 +178,6 @@ debug_init_break            = tbreak setup
 build_unflags               = ${env:tasmota32_base.build_unflags}
 build_flags                 = ${env:tasmota32_base.build_flags}
                               -DOTA_URL='""'
-monitor_filters             = esp32_exception_decoder
 
 [env:tasmota32s2-ocd]
 build_type                  = debug
@@ -202,7 +189,6 @@ debug_init_break            = tbreak setup
 build_unflags               = ${env:tasmota32_base.build_unflags}
 build_flags                 = ${env:tasmota32_base.build_flags}
                               -DOTA_URL='""'
-monitor_filters             = esp32_exception_decoder
 
 ; *** JTAG Debug versions (only C3/S3), uses inbuilt CDC/jtag. No extra jtag hardware required!
 
@@ -216,7 +202,6 @@ debug_init_break            = tbreak setup
 build_unflags               = ${env:tasmota32_base.build_unflags}
 build_flags                 = ${env:tasmota32_base.build_flags}
                               -DOTA_URL='""'
-monitor_filters             = esp32_exception_decoder
 
 [env:tasmota32c3cdc-ocd]
 build_type                  = debug
@@ -228,4 +213,3 @@ debug_init_break            = tbreak setup
 build_unflags               = ${env:tasmota32c3.build_unflags}
 build_flags                 = ${env:tasmota32c3.build_flags}
                               -DOTA_URL='""'
-monitor_filters             = esp32_exception_decoder