Merge branch 'development' into pre-release-9.1.0

platformio.ini

@@ -107,12 +107,12 @@ build_flags               = -Wno-deprecated-declarations
                             -DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true
                             -DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true
 ; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
+
 ; *********************************************************************
 ; *** Use custom settings from file user_config_override.h
                             -DUSE_CONFIG_OVERRIDE
 ; *********************************************************************
 
-
 [esp82xx_defaults]
 build_flags               = ${esp_defaults.build_flags}
                             -Wl,-Map,firmware.map
@@ -137,7 +137,6 @@ build_flags               = -DUSE_IR_REMOTE_FULL
                             -U_IR_ENABLE_DEFAULT_
                             -DDECODE_PRONTO=false -DSEND_PRONTO=false
 
-
 [core]
 ; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4
 platform                  = espressif8266@2.6.2

platformio_override_sample.ini

@@ -181,15 +181,16 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                           -lstdc++-exc
 
 [core32]
-; Activate Stage Core32 by removing ";" in next line, if you want to override the standard core32
+; Activate Stage Core32 by removing ";" in next lines, if you want to override the standard core32
 ;platform_packages       = ${core32_stage.platform_packages}
-
+;build_flags             = ${core32_stage.build_flags}
 
 [core32_stage]
 platform_packages         = tool-esptoolpy@1.20800.0
-                          ; latest working commit
+                            framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#f7fb00632e04d74a7890a77fa7dbbb8ae572e866
-                          framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#c09ec5bd3d35ba7dfc135755ab300e2b45416def
 
+build_flags               = ${esp32_defaults.build_flags}
+                            -D ESP32_STAGE=true
 
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]

platformio_tasmota32.ini

@@ -39,31 +39,40 @@ default_envs =  ${build_envs.default_envs}
 ;                tasmota32-UK
 ;                tasmota32-VN
 
-
-[core32]
-platform                = espressif32@2.0.0
-platform_packages       = tool-esptoolpy@1.20800.0
-                          platformio/framework-arduinoespressif32 @ 3.10004.201016
-
 [common32]
-platform                = ${core32.platform}
-platform_packages       = ${core32.platform_packages}
 board                     = esp32dev
+board_build.flash_mode    = ${common.board_build.flash_mode}
 board_build.ldscript      = esp32_out.ld
 board_build.partitions    = esp32_partition_app1984k_spiffs64k.csv
-board_build.flash_mode  = ${common.board_build.flash_mode}
+
-board_build.f_flash     = ${common.board_build.f_flash}
+platform                  = ${core32.platform}
-board_build.f_cpu       = ${common.board_build.f_cpu}
+platform_packages         = ${core32.platform_packages}
 build_unflags             = ${esp_defaults.build_unflags}
                             -Wpointer-arith
+build_flags               = ${core32.build_flags}
+
+board_build.f_cpu         = ${common.board_build.f_cpu}
+board_build.f_flash       = ${common.board_build.f_flash}
 monitor_speed             = ${common.monitor_speed}
 upload_port               = ${common.upload_port}
 upload_resetmethod        = ${common.upload_resetmethod}
 upload_speed              = 921600
 extra_scripts             = ${common.extra_scripts}
 
-build_flags             = ${esp_defaults.build_flags}
+lib_ldf_mode              = chain+
+shared_libdeps_dir        = lib
+lib_extra_dirs            =
+                            lib/libesp32
+                            lib/lib_basic
+                            lib/lib_i2c
+                            lib/lib_display
+                            lib/lib_ssl
+                            lib/lib_audio
+                            lib/lib_rf
+                            lib/lib_div
 
+[esp32_defaults]
+build_flags               = ${esp_defaults.build_flags}
                             -D CORE_DEBUG_LEVEL=0
                             -D BUFFER_LENGTH=128
                             -D MQTT_MAX_PACKET_SIZE=1200
@@ -76,28 +85,8 @@ build_flags             = ${esp_defaults.build_flags}
                             -D memcpy_P=memcpy
                             -D memcmp_P=memcmp
 
-lib_ldf_mode            = chain+  
+[core32]
-shared_libdeps_dir      = lib
+platform                  = espressif32@2.0.0
-; *** Library disable / enable for variant Tasmota. Disable reduces compile time
+platform_packages         = tool-esptoolpy@1.20800.0
-; *** !!! Disabling needed libs will generate compile errors !!!
+                          platformio/framework-arduinoespressif32 @ 3.10004.201016
-; *** The resulting firmware will NOT be different if you leave all libs enabled
+build_flags               = ${esp32_defaults.build_flags}
-; *** Disabling by putting a ";" in front of the lib name
-; *** If you dont know what it is all about, do not change
-lib_extra_dirs            = 
-; *** ESP32 lib. ALWAYS needed for ESP32 !!!
-                            lib/libesp32
-; *** Only disabled for Tasmota minimal and Tasmota light. For all other variants needed!
-                            lib/lib_basic
-; **** I2C devices. Most sensors. Disable only if you dont have ANY I2C device enabled
-                            lib/lib_i2c
-; *** Displays. Disable if you dont have any Display activated
-                            lib/lib_display
-; *** Bear SSL and base64. Disable if you dont have SSL or TLS activated
-                            lib/lib_ssl
-; *** Audio needs a lot of time to compile. Mostly not used functions. Recommended to disable
-                            lib/lib_audio
-; *** RF 433 stuff (not RF Bridge). Recommended to disable
-                            lib/lib_rf
-; *** Mostly not used functions. Recommended to disable
-                            lib/lib_div
-

tasmota/tasmota.ino

@@ -34,7 +34,9 @@
 \*********************************************************************************************/
 
 // Location specific includes
+#ifndef ESP32_STAGE                         // ESP32 Stage has no core_version.h file. Disable include via PlatformIO Option
 #include <core_version.h>                   // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_7_1)
+#endif
 #include "tasmota_compat.h"
 #include "tasmota_version.h"                // Tasmota version information
 #include "tasmota.h"                        // Enumeration used in my_user_config.h