From 750e28d13570b6a52ad970175442a24afdf8c74f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 19 Jun 2020 18:16:55 +0200 Subject: [PATCH 1/5] Better placing for -DUSE_CONFIG_OVERRIDE... update to espressif8266@2.5.3 (minor fixes) --- platformio.ini | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/platformio.ini b/platformio.ini index abb9d364d..4a1a5777d 100755 --- a/platformio.ini +++ b/platformio.ini @@ -65,11 +65,6 @@ platform = ${core_active.platform} platform_packages = ${core_active.platform_packages} build_flags = ${core_active.build_flags} -; ********************************************************************* -; *** Use custom settings from file user_config_override.h - -DUSE_CONFIG_OVERRIDE -; ********************************************************************* - ; *** Fix espressif8266@1.7.0 induced undesired all warnings build_unflags = -Wall @@ -93,6 +88,8 @@ build_flags = -D_IR_ENABLE_DEFAULT_=false -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} @@ -128,6 +125,6 @@ build_flags = ${tasmota_core.build_flags} [tasmota_core] ; *** Esp8266 Arduino core 2.7.1 -platform = espressif8266@2.5.2 +platform = espressif8266@2.5.3 platform_packages = build_flags = ${esp82xx_defaults.build_flags} From dd4642c5baf67561832579d7e5decb36a877d30b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 19 Jun 2020 18:19:47 +0200 Subject: [PATCH 2/5] remove redundant -DUSE_CONFIG_OVERRIDE since use of user_config_override.h is always enabled (by default) in platformio.ini --- platformio_override_sample.ini | 2 -- 1 file changed, 2 deletions(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 2becf05f7..2c5286a55 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -41,8 +41,6 @@ default_envs = platform = ${core_active.platform} platform_packages = ${core_active.platform_packages} build_flags = ${core_active.build_flags} -; *** Use settings from file user_config_override.h - -DUSE_CONFIG_OVERRIDE ; *** Optional Debug messages ; -DDEBUG_TASMOTA_CORE From fabb60f90543feafbaf61922b5cee6eb1f778328 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 19 Jun 2020 18:26:41 +0200 Subject: [PATCH 3/5] Fix missing build_flags entry... and prepare for possible needed build_unflags --- platformio_override_sample.ini | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 2c5286a55..81cf0dec0 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -40,6 +40,7 @@ default_envs = [common] platform = ${core_active.platform} platform_packages = ${core_active.platform_packages} +build_unflags = ${core_active.build_unflags} build_flags = ${core_active.build_flags} ; *** Optional Debug messages @@ -78,10 +79,12 @@ extra_scripts = ${scripts_defaults.extra_scripts} ;platform = ${tasmota_stage.platform} ;platform_packages = ${tasmota_stage.platform_packages} +;build_unflags = ${tasmota_stage.build_unflags} ;build_flags = ${tasmota_stage.build_flags} ;platform = ${core_stage.platform} ;platform_packages = ${core_stage.platform_packages} +;build_unflags = ${core_stage.build_unflags} ;build_flags = ${core_stage.build_flags} @@ -89,6 +92,8 @@ extra_scripts = ${scripts_defaults.extra_scripts} ; *** Esp8266 core for Arduino version Tasmota stage extends = tasmota_core platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#52b3e5b7b3ccedcede665682f7896b637b64dbf5 +build_unflags = -Wall +build_flags = ${esp82xx_defaults.build_flags} ; *********** Alternative Options, enable only if you know exactly what you do ******** ; NONOSDK221 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 @@ -122,7 +127,9 @@ platform_packages = framework-arduinoespressif8266 @ https://github.com/ ; *** Esp8266 core for Arduino version latest development version extends = tasmota_core platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git -; +build_unflags = -Wall +build_flags = ${esp82xx_defaults.build_flags} + ; *********** Alternative Options, enable only if you know exactly what you do ******** ; NONOSDK221 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 From 3d2914bf8e2d4929af06d36480696d7fc4eb3c7d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 19 Jun 2020 20:14:59 +0200 Subject: [PATCH 4/5] Refactor PlatformIO.ini Deleting uneeded entrys. Moving and adding some entrys. --- platformio.ini | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/platformio.ini b/platformio.ini index 4a1a5777d..d03de291d 100755 --- a/platformio.ini +++ b/platformio.ini @@ -61,12 +61,10 @@ board = esp01_1m board_build.flash_mode = dout board_build.ldscript = eagle.flash.1m.ld -platform = ${core_active.platform} -platform_packages = ${core_active.platform_packages} -build_flags = ${core_active.build_flags} - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall +platform = ${core.platform} +platform_packages = ${core.platform_packages} +build_unflags = ${core.build_unflags} +build_flags = ${core.build_flags} board_build.f_cpu = 80000000L board_build.f_flash = 40000000L @@ -84,12 +82,17 @@ extra_scripts = pio/strip-floats.py pio/override_copy.py [esp_defaults] +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall build_flags = -D_IR_ENABLE_DEFAULT_=false -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} @@ -118,13 +121,10 @@ build_flags = -DUSE_IR_REMOTE_FULL -U_IR_ENABLE_DEFAULT_ -DDECODE_PRONTO=false -DSEND_PRONTO=false -[core_active] -platform = ${tasmota_core.platform} -platform_packages = ${tasmota_core.platform_packages} -build_flags = ${tasmota_core.build_flags} -[tasmota_core] +[core] ; *** Esp8266 Arduino core 2.7.1 platform = espressif8266@2.5.3 platform_packages = +build_unflags = ${esp_defaults.build_unflags} build_flags = ${esp82xx_defaults.build_flags} From 34d5e8bc50f112264e288bde7972d64c54a5c76b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 19 Jun 2020 20:25:02 +0200 Subject: [PATCH 5/5] Refactor... and add missing entrys --- platformio_override_sample.ini | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 81cf0dec0..1c8745c50 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -7,8 +7,6 @@ ; ; Please visit documentation for the options and examples ; http://docs.platformio.org/en/stable/projectconf.html -; - [platformio] extra_configs = platformio_tasmota_env32.ini @@ -42,7 +40,6 @@ platform = ${core_active.platform} platform_packages = ${core_active.platform_packages} build_unflags = ${core_active.build_unflags} build_flags = ${core_active.build_flags} - ; *** Optional Debug messages ; -DDEBUG_TASMOTA_CORE ; -DDEBUG_TASMOTA_DRIVER @@ -90,10 +87,11 @@ extra_scripts = ${scripts_defaults.extra_scripts} [tasmota_stage] ; *** Esp8266 core for Arduino version Tasmota stage -extends = tasmota_core +extends = core platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#52b3e5b7b3ccedcede665682f7896b637b64dbf5 -build_unflags = -Wall +build_unflags = ${esp_defaults.build_unflags} build_flags = ${esp82xx_defaults.build_flags} + ; *********** Alternative Options, enable only if you know exactly what you do ******** ; NONOSDK221 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 @@ -125,9 +123,9 @@ build_flags = ${esp82xx_defaults.build_flags} [core_stage] ; *** Esp8266 core for Arduino version latest development version -extends = tasmota_core +extends = core platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git -build_unflags = -Wall +build_unflags = ${esp_defaults.build_unflags} build_flags = ${esp82xx_defaults.build_flags} ; *********** Alternative Options, enable only if you know exactly what you do ******** @@ -162,7 +160,10 @@ build_flags = ${esp82xx_defaults.build_flags} ; *** Debug version used for PlatformIO Home Project Inspection [env:tasmota-debug] -build_type = debug +extends = core +build_type = debug +build_unflags = ${esp_defaults.build_unflags} +build_flags = ${esp82xx_defaults.build_flags} ; *** Experimental ESP32 Tasmota version *** @@ -177,7 +178,7 @@ 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} board_build.f_cpu = ${common.board_build.f_cpu} -build_unflags = ${common.build_unflags} +build_unflags = ${esp_defaults.build_unflags} -Wpointer-arith monitor_speed = ${common.monitor_speed} upload_port = ${common.upload_port}