jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 20:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Breaking: ESP32 Core 3.0.0 only support (#21180)

Browse Source 
* Core 3.0.0 only

* rm Arduino30 settings

* rm lib ignore `NimBLE-Arduino`

* rm obsolete or duplicate env entrys
This commit is contained in:
Jason2866 2024-04-15 11:39:48 +02:00 committed by GitHub
parent a006e5fc53
commit 951fba99b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 83 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -7,7 +7,7 @@
- [ ] Only relevant files were touched - [ ] Only relevant files were touched
- [ ] Only one feature/fix was added per PR and the code change compiles without warnings - [ ] 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 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). - [ ] 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**_ _NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_

11
.github/workflows/Tasmota_build_devel.yml vendored
View File

@ -96,14 +96,13 @@ jobs:
variant: variant:
- tasmota32solo1-safeboot - tasmota32solo1-safeboot
- tasmota32-safeboot - tasmota32-safeboot
- tasmota32c3-safeboot - tasmota32c2-safeboot
- tasmota32c3cdc-safeboot - tasmota32c3cdc-safeboot
- tasmota32s2-safeboot - tasmota32s2-safeboot
- tasmota32s2cdc-safeboot - tasmota32s2cdc-safeboot
- tasmota32s3-safeboot - tasmota32s3-safeboot
- tasmota32s3cdc-safeboot - tasmota32s3cdc-safeboot
- tasmota32c2-safeboot - tasmota32c2-safeboot
- tasmota32c6-safeboot
- tasmota32c6cdc-safeboot - tasmota32c6cdc-safeboot
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -117,7 +116,6 @@ jobs:
run: | run: |
pip install wheel pip install wheel
pip install -U platformio pip install -U platformio
cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
cp ./platformio_override_sample.ini ./platformio_override.ini cp ./platformio_override_sample.ini ./platformio_override.ini
- name: Add SHA to footer - name: Add SHA to footer
run: | run: |
@ -191,15 +189,14 @@ jobs:
- tasmota32-display - tasmota32-display
- tasmota32-ir - tasmota32-ir
- tasmota32-lvgl - tasmota32-lvgl
- tasmota32c3 - tasmota32c2
- tasmota32c3cdc - tasmota32c3cdc
- tasmota32c6cdc
- tasmota32s2 - tasmota32s2
- tasmota32s2cdc - tasmota32s2cdc
- tasmota32s3 - tasmota32s3
- tasmota32s3cdc - tasmota32s3cdc
- tasmota32solo1 - tasmota32solo1
- tasmota32c2-arduino30
- tasmota32c6cdc-arduino30
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -212,7 +209,6 @@ jobs:
run: | run: |
pip install wheel pip install wheel
pip install -U platformio pip install -U platformio
cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
cp ./platformio_override_sample.ini ./platformio_override.ini cp ./platformio_override_sample.ini ./platformio_override.ini
- name: Download safeboot firmwares - name: Download safeboot firmwares
uses: jason2866/download-artifact@v3.0.4 uses: jason2866/download-artifact@v3.0.4
@ -253,7 +249,6 @@ jobs:
run: | run: |
pip install wheel pip install wheel
pip install -U platformio pip install -U platformio
cp ./platformio_tasmota_core3_env_sample.ini ./platformio_tasmota_core3_env.ini
cp ./platformio_override_sample.ini ./platformio_override.ini cp ./platformio_override_sample.ini ./platformio_override.ini
- name: Download safeboot firmwares - name: Download safeboot firmwares
uses: jason2866/download-artifact@v3.0.4 uses: jason2866/download-artifact@v3.0.4

7
.github/workflows/Tasmota_build_master.yml vendored
View File

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

10
.github/workflows/build_all_the_things.yml vendored
View File

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

6
pio-tools/override_copy.py
View File

@ -26,9 +26,3 @@ if os.path.isfile("platformio_tasmota_cenv.ini"):
print(Fore.GREEN + "*** use provided platformio_tasmota_cenv.ini as planned ***") print(Fore.GREEN + "*** use provided platformio_tasmota_cenv.ini as planned ***")
else: else:
shutil.copy("platformio_tasmota_cenv_sample.ini", "platformio_tasmota_cenv.ini") 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")

3
platformio.ini
View File

@ -24,7 +24,6 @@ extra_configs = platformio_tasmota32.ini
platformio_tasmota_env32.ini platformio_tasmota_env32.ini
platformio_override.ini platformio_override.ini
platformio_tasmota_cenv.ini platformio_tasmota_cenv.ini
platformio_tasmota_core3_env.ini
[common] [common]
platform = ${core.platform} platform = ${core.platform}
@ -141,7 +140,7 @@ lib_ignore =
[core] [core]
; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4. Added Backport for PWM selection ; *** 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 = 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_unflags = ${esp_defaults.build_unflags}
build_flags = ${esp82xx_defaults.build_flags} build_flags = ${esp82xx_defaults.build_flags}
; *** Use ONE of the two PWM variants. Tasmota default is Locked PWM ; *** Use ONE of the two PWM variants. Tasmota default is Locked PWM

20
platformio_override_sample.ini
View File

@ -44,23 +44,9 @@ default_envs =
; tasmota32-odroidgo ; tasmota32-odroidgo
; tasmota32-core2 ; tasmota32-core2
; tasmota32-nspanel ; tasmota32-nspanel
; ; tasmota32c2
; *** Build/upload environments for ESP32 Arduino Core 3.0 ; tasmota32c6
; ; tasmota32c6cdc
; 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-safeboot ; tasmota32c2-safeboot
; tasmota32c6-safeboot ; tasmota32c6-safeboot
; tasmota32c6cdc-safeboot ; tasmota32c6cdc-safeboot

24
platformio_tasmota32.ini
View File

@ -41,12 +41,12 @@ lib_ignore =
USB USB
NetBIOS NetBIOS
Preferences Preferences
BluetoothSerial
ArduinoOTA ArduinoOTA
extra_scripts = pre:pio-tools/add_c_flags.py extra_scripts = pre:pio-tools/add_c_flags.py
pre:pio-tools/gen-berry-structures.py pre:pio-tools/gen-berry-structures.py
post:pio-tools/post_esp32.py post:pio-tools/post_esp32.py
${esp_defaults.extra_scripts} ${esp_defaults.extra_scripts}
monitor_filters = esp32_exception_decoder
[safeboot_flags] [safeboot_flags]
lib_ignore = ${esp32_defaults.lib_ignore} lib_ignore = ${esp32_defaults.lib_ignore}
@ -76,28 +76,8 @@ lib_ignore = ${esp32_defaults.lib_ignore}
DHT sensor library DHT sensor library
ccronexpr 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] [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 = platform_packages =
build_unflags = ${esp32_defaults.build_unflags} build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${esp32_defaults.build_flags} 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}

24
platformio_tasmota_cenv_sample.ini
View File

@ -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_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_ssl, lib/lib_i2c
lib_ignore = TTGO TWatch Library lib_ignore = TTGO TWatch Library
Micro-RTSP Micro-RTSP
epdiy
[env:tasmota32-mi32] [env:tasmota32-mi32]
extends = env:tasmota32_base extends = env:tasmota32_base
@ -109,11 +108,8 @@ build_flags = ${env:tasmota32_base.build_flags}
-DUSE_MI_EXT_GUI -DUSE_MI_EXT_GUI
-DOTA_URL='""' -DOTA_URL='""'
lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
lib_ignore = ESP8266Audio lib_ignore = TTGO TWatch Library
ESP8266SAM
TTGO TWatch Library
Micro-RTSP Micro-RTSP
epdiy
[env:tasmota32c3-mi32] [env:tasmota32c3-mi32]
extends = env:tasmota32c3 extends = env:tasmota32c3
@ -122,11 +118,8 @@ build_flags = ${env:tasmota32_base.build_flags}
-DUSE_MI_EXT_GUI -DUSE_MI_EXT_GUI
-DOTA_URL='""' -DOTA_URL='""'
lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
lib_ignore = ESP8266Audio lib_ignore = TTGO TWatch Library
ESP8266SAM
TTGO TWatch Library
Micro-RTSP Micro-RTSP
epdiy
[env:tasmota32s3-mi32] [env:tasmota32s3-mi32]
extends = env:tasmota32s3 extends = env:tasmota32s3
@ -135,11 +128,9 @@ build_flags = ${env:tasmota32_base.build_flags}
-DUSE_MI_EXT_GUI -DUSE_MI_EXT_GUI
-DOTA_URL='""' -DOTA_URL='""'
lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl
lib_ignore = ESP8266Audio lib_ignore = TTGO TWatch Library
ESP8266SAM
TTGO TWatch Library
Micro-RTSP Micro-RTSP
epdiy
; *** Debug version used for PlatformIO Home Project Inspection ; *** Debug version used for PlatformIO Home Project Inspection
[env:tasmota-debug] [env:tasmota-debug]
@ -161,8 +152,6 @@ build_flags = ${env:tasmota32_base.build_flags}
check_tool = cppcheck check_tool = cppcheck
;clangtidy ;clangtidy
check_skip_packages = yes check_skip_packages = yes
monitor_filters = esp32_exception_decoder
; -Wstack-usage=300
; *** JTAG Debug version, needs esp-prog or FT2232H or FT232H ; *** 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_unflags = ${env:tasmota32_base.build_unflags}
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder
[env:tasmota32solo1-ocd] [env:tasmota32solo1-ocd]
build_type = debug build_type = debug
@ -190,7 +178,6 @@ debug_init_break = tbreak setup
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder
[env:tasmota32s2-ocd] [env:tasmota32s2-ocd]
build_type = debug build_type = debug
@ -202,7 +189,6 @@ debug_init_break = tbreak setup
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder
; *** JTAG Debug versions (only C3/S3), uses inbuilt CDC/jtag. No extra jtag hardware required! ; *** 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_unflags = ${env:tasmota32_base.build_unflags}
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder
[env:tasmota32c3cdc-ocd] [env:tasmota32c3cdc-ocd]
build_type = debug build_type = debug
@ -228,4 +213,3 @@ debug_init_break = tbreak setup
build_unflags = ${env:tasmota32c3.build_unflags} build_unflags = ${env:tasmota32c3.build_unflags}
build_flags = ${env:tasmota32c3.build_flags} build_flags = ${env:tasmota32c3.build_flags}
-DOTA_URL='""' -DOTA_URL='""'
monitor_filters = esp32_exception_decoder

219
platformio_tasmota_core3_env_sample.ini
View File

@ -1,219 +0,0 @@
[tasmota]
; *** Global build / unbuild compile time flags for ALL Tasmota / Tasmota32 [env]
;build_unflags =
build_flags = -DUSE_BERRY_PARTITION_WIZARD
[env:arduino30]
framework = ${common.framework}
platform = ${core32_30.platform}
platform_packages = ${core32_30.platform_packages}
board_build.filesystem = ${common.board_build.filesystem}
board_build.variants_dir = variants/tasmota_ard3
custom_unpack_dir = ${common.custom_unpack_dir}
board = esp32
monitor_speed = 115200
upload_resetmethod = ${common.upload_resetmethod}
extra_scripts = ${core32_30_flags.extra_scripts}
build_unflags = ${core32_30_flags.build_unflags}
build_flags = ${core32_30_flags.build_flags}
lib_ldf_mode = ${common.lib_ldf_mode}
lib_compat_mode = ${common.lib_compat_mode}
lib_extra_dirs = ${core32_30_flags.lib_extra_dirs}
lib_ignore = ${core32_30_flags.lib_ignore}
[env:tasmota32-arduino30]
extends = env:arduino30
board = esp32
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32solo1-arduino30]
extends = env:arduino30
board = esp32_solo1
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
; *** ESP32 rev.0/1 with PSRAM needs a fix for faulty PSRAM ROM code
[env:tasmota32-psramfix_ard3]
extends = env:arduino30
board = esp32-fix
board_build.f_cpu = 240000000L
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32s2-arduino30]
extends = env:arduino30
board = esp32s2
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32s2cdc-arduino30]
extends = env:arduino30
board = esp32s2cdc
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32s3-qio_opi-ard30]
extends = env:arduino30
board = esp32s3-qio_opi
board_build.f_cpu = 240000000L
board_build.f_flash = 80000000L
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32s3cdc-qio_opi-ard30]
extends = env:arduino30
board = esp32s3cdc-qio_opi
board_build.f_cpu = 240000000L
board_build.f_flash = 80000000L
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32s3-arduino30]
extends = env:arduino30
board = esp32s3-qio_qspi
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32s3cdc-webcam3]
extends = env:arduino30
board = esp32s3cdc-qio_opi
board_build.f_cpu = 240000000L
board_build.f_flash = 80000000L
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
-DUSE_WEBCAM
-DUSE_WEBCAM_V2
-DENABLE_RTSPSERVER
-DCODE_IMAGE_STR='"webcam-v2"'
-DOTA_URL='""'
[env:tasmota32c2_2M-arduino30]
extends = env:arduino30
board = esp32c2_2M
build_unflags = ${env:arduino30.build_unflags}
-DUSE_IPV6
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DOTA_URL='""'
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32c2-arduino30]
extends = env:arduino30
board = esp32c2
build_unflags = ${env:arduino30.build_unflags}
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
-DOTA_URL='""'
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32c3-arduino30]
extends = env:arduino30
board = esp32c3
build_unflags = ${env:arduino30.build_unflags}
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32c3cdc-arduino30]
extends = env:arduino30
board = esp32c3cdc
build_unflags = ${env:arduino30.build_unflags}
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32c6-arduino30]
extends = env:arduino30
board = esp32c6
build_unflags = ${env:arduino30.build_unflags}
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
-DOTA_URL='""'
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32c6cdc-arduino30]
extends = env:arduino30
board = esp32c6cdc
build_unflags = ${env:arduino30.build_unflags}
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
-DOTA_URL='""'
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32c6cdc-mi32_ard3]
extends = env:arduino30
board = esp32c6cdc
build_unflags = ${env:arduino30.build_unflags}
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_BLUETOOTH
-DUSE_MI_EXT_GUI
-DOTA_URL='""'
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}
[env:tasmota32c2-safeboot]
extends = env:tasmota32c2-arduino30
build_unflags = ${env:tasmota32c2-arduino30.build_unflags}
-DFIRMWARE_ARDUINO30
build_flags = ${env:tasmota32c2-arduino30.build_flags}
-DFIRMWARE_SAFEBOOT
lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c6-safeboot]
extends = env:tasmota32c6-arduino30
build_unflags = ${env:tasmota32c6-arduino30.build_unflags}
-DFIRMWARE_ARDUINO30
build_flags = ${env:tasmota32c6-arduino30.build_flags}
-DFIRMWARE_SAFEBOOT
lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c6cdc-safeboot]
extends = env:tasmota32c6-arduino30
board = esp32c6cdc
build_unflags = ${env:tasmota32c6-arduino30.build_unflags}
-DFIRMWARE_ARDUINO30
build_flags = ${env:tasmota32c6-arduino30.build_flags}
-DFIRMWARE_SAFEBOOT
lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore}

130
platformio_tasmota_env32.ini
View File

@ -10,6 +10,7 @@ monitor_speed = ${common.monitor_speed}
monitor_echo = ${common.monitor_echo} monitor_echo = ${common.monitor_echo}
upload_resetmethod = ${common.upload_resetmethod} upload_resetmethod = ${common.upload_resetmethod}
extra_scripts = ${esp32_defaults.extra_scripts} extra_scripts = ${esp32_defaults.extra_scripts}
monitor_filters = ${esp32_defaults.monitor_filters}
build_unflags = ${core32.build_unflags} build_unflags = ${core32.build_unflags}
build_flags = ${core32.build_flags} build_flags = ${core32.build_flags}
lib_ldf_mode = ${common.lib_ldf_mode} lib_ldf_mode = ${common.lib_ldf_mode}
@ -49,29 +50,6 @@ build_flags = ${env:tasmota32_base.build_flags}
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-webcam.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-webcam.bin"'
lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_extra_dirs = lib/lib_ssl, lib/libesp32
[env:tasmota32-odroidgo]
extends = env:tasmota32-lvgl
board = esp32-fix
board_build.f_cpu = 240000000L
build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_TASMOTA32
-DARDUINO_ODROID_ESP32
-DCODE_IMAGE_STR='"odroid"'
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-lvgl.bin"'
[env:tasmota32-core2]
extends = env:tasmota32-lvgl
board_build.flash_mode = qio
board_build.f_cpu = 240000000L
board_build.f_flash = 80000000L
build_flags = ${env:tasmota32-lvgl.build_flags}
-DUSE_I2S_SAY_TIME
-DUSE_I2S_WEBRADIO
-DUSE_SENDMAIL
-DCODE_IMAGE_STR='"core2"'
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-lvgl.bin"'
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]
extends = env:tasmota32_base extends = env:tasmota32_base
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
@ -140,45 +118,22 @@ build_flags = ${env:tasmota32_base.build_flags}
-DFRAMEWORK_ARDUINO_ITEAD -DFRAMEWORK_ARDUINO_ITEAD
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin"'
[env:tasmota32c3-safeboot] [env:tasmota32c3cdc-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c3 board = esp32c3cdc
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
-flto
-mtarget-align -mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc-safeboot.bin"'
-fno-lto
lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore} lib_ignore = ${safeboot_flags.lib_ignore}
[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
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3.bin"'
-fno-lto
lib_ignore = ${env:tasmota32_base.lib_ignore}
TTGO TWatch Library
Micro-RTSP
epdiy
[env:tasmota32c3cdc-safeboot]
extends = env:tasmota32c3-safeboot
board = esp32c3cdc
build_flags = ${env:tasmota32_base.build_flags}
-fno-lto
-DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc-safeboot.bin"'
[env:tasmota32c3cdc] [env:tasmota32c3cdc]
extends = env:tasmota32c3 extends = env:tasmota32_base
board = esp32c3cdc board = esp32c3cdc
build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_TASMOTA32 -DFIRMWARE_TASMOTA32
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc.bin"'
@ -210,6 +165,8 @@ board = esp32s2cdc
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc-safeboot.bin"'
lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32s2cdc] [env:tasmota32s2cdc]
extends = env:tasmota32s2 extends = env:tasmota32s2
@ -218,39 +175,76 @@ build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_TASMOTA32 -DFIRMWARE_TASMOTA32
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc.bin"'
[env:tasmota32s3-safeboot] [env:tasmota32s3cdc-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s3-qio_qspi board = esp32s3cdc-qio_qspi
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3cdc-safeboot.bin"'
lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore} lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32s3] [env:tasmota32s3cdc]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s3-qio_qspi board = esp32s3cdc-qio_qspi
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_TASMOTA32 -DFIRMWARE_TASMOTA32
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3cdc.bin"'
lib_ignore = ${env:tasmota32_base.lib_ignore} lib_ignore = ${env:tasmota32_base.lib_ignore}
TTGO TWatch Library TTGO TWatch Library
Micro-RTSP Micro-RTSP
epdiy epdiy
[env:tasmota32s3cdc-safeboot] [env:tasmota32c2]
extends = env:tasmota32s3-safeboot extends = env:tasmota32_base
board = esp32s3cdc-qio_qspi board = esp32c2
build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align
build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_TASMOTA32
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c2.bin"'
[env:tasmota32c6cdc]
extends = env:tasmota32_base
board = esp32c6cdc
build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align
build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_TASMOTA32
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6cdc.bin"'
[env:tasmota32c6cdc-mi32]
extends = env:tasmota32_base
board = esp32c6cdc
build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align
build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_BLUETOOTH
-DUSE_MI_EXT_GUI
-DOTA_URL='""'
[env:tasmota32c2-safeboot]
extends = env:tasmota32_base
board = esp32c2
build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c2-safeboot.bin"'
lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c6cdc-safeboot]
extends = env:tasmota32_base
board = esp32c6cdc
build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align
build_flags = ${env:tasmota32c6cdc.build_flags}
-DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6cdc-safeboot.bin"'
lib_extra_dirs = lib/lib_ssl, lib/libesp32
lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32s3cdc]
extends = env:tasmota32s3
board = esp32s3cdc-qio_qspi
build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_TASMOTA32
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3cdc.bin"'
[env:tasmota32-AD] [env:tasmota32-AD]
extends = env:tasmota32_base extends = env:tasmota32_base

16
tasmota/include/tasmota_configurations_ESP32.h
View File

@ -193,22 +193,6 @@
#endif // FIRMWARE_SAFEBOOT #endif // FIRMWARE_SAFEBOOT
/*********************************************************************************************\
* FIRMWARE_ARDUINO30
* Provide an image which compiles with WiP Arduino 3.0.x
\*********************************************************************************************/
#ifdef FIRMWARE_ARDUINO30
#ifndef CODE_IMAGE_STR
#define CODE_IMAGE_STR "arduino30"
#endif
#define FIRMWARE_TASMOTA32
#endif // FIRMWARE_ARDUINO30
/*********************************************************************************************\ /*********************************************************************************************\
* [tasmota32-webcam.bin] * [tasmota32-webcam.bin]
* Provide an image with useful supported sensors enabled * Provide an image with useful supported sensors enabled