From c3b5c3638b7bd124290ff518f5073cfda20ce681 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 1 Nov 2019 11:03:10 +0100 Subject: [PATCH 1/4] Bring setting -DUSE_CONFIG_OVERRIDE more to top... to make it easier to find. Core Selection is moved too. --- platformio.ini | 128 +++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/platformio.ini b/platformio.ini index a6e94f13d..f7837adbf 100755 --- a/platformio.ini +++ b/platformio.ini @@ -43,6 +43,72 @@ build_cache_dir = .cache ;default_envs = tasmota-TW ;default_envs = tasmota-UK +[common] +framework = arduino +board = esp01_1m +board_build.flash_mode = dout + +platform = ${core_active.platform} +build_flags = ${core_active.build_flags} + +; ********************************************************************* +; *** Uncomment to use custom settings from file user_config_override.h +; -DUSE_CONFIG_OVERRIDE +; ********************************************************************* + +; *** Optional Debug messages +; -DDEBUG_TASMOTA_CORE +; -DDEBUG_TASMOTA_DRIVER +; -DDEBUG_TASMOTA_SENSOR + +; *** Optional Firmware configurations +; -DFIRMWARE_MINIMAL +; -DFIRMWARE_SENSORS +; -DFIRMWARE_BASIC +; -DFIRMWARE_KNX_NO_EMULATION +; -DFIRMWARE_DISPLAYS +; -DFIRMWARE_IR +; -DFIRMWARE_IR_CUSTOM + +; *** Fix espressif8266@1.7.0 induced undesired all warnings +build_unflags = -Wall + +; set CPU frequency to 80MHz (default) or 160MHz +board_build.f_cpu = 80000000L +;board_build.f_cpu = 160000000L + +monitor_speed = 115200 +upload_speed = 115200 +upload_resetmethod = nodemcu + +; *** Upload Serial reset method for Wemos and NodeMCU +upload_port = COM5 +extra_scripts = pio/strip-floats.py + pio/obj-dump.py + +; *** Upload file to OTA server using SCP +;upload_port = user@host:/path +;extra_scripts = pio/strip-floats.py, pio/sftp-uploader.py + +; *** Upload file to OTA server in folder api/arduino using HTTP +;upload_port = domus1:80/api/upload-arduino.php +;extra_scripts = pio/strip-floats.py, pio/http-uploader.py + +[core_active] +; Select one core set for platform and build_flags +;platform = ${core_2_3_0.platform} +;build_flags = ${core_2_3_0.build_flags} +;platform = ${core_2_4_2.platform} +;build_flags = ${core_2_4_2.build_flags} +platform = ${core_pre.platform} +build_flags = ${core_pre.build_flags} +;platform = ${core_pre_ipv6.platform} +;build_flags = ${core_pre_ipv6.build_flags} +;platform = ${core_stage.platform} +;build_flags = ${core_stage.build_flags} + +; ********************************************************************* + [esp82xx_defaults] build_flags = -D NDEBUG -mtarget-align @@ -188,68 +254,6 @@ build_flags = ${esp82xx_defaults.build_flags} ; -fexceptions ; -lstdc++-exc -[core_active] -; Select one core set for platform and build_flags -;platform = ${core_2_3_0.platform} -;build_flags = ${core_2_3_0.build_flags} -;platform = ${core_2_4_2.platform} -;build_flags = ${core_2_4_2.build_flags} -platform = ${core_pre.platform} -build_flags = ${core_pre.build_flags} -;platform = ${core_pre_ipv6.platform} -;build_flags = ${core_pre_ipv6.build_flags} -;platform = ${core_stage.platform} -;build_flags = ${core_stage.build_flags} - -[common] -framework = arduino -board = esp01_1m -board_build.flash_mode = dout - -platform = ${core_active.platform} -build_flags = ${core_active.build_flags} - -; *** Optional Debug messages -; -DDEBUG_TASMOTA_CORE -; -DDEBUG_TASMOTA_DRIVER -; -DDEBUG_TASMOTA_SENSOR - -; *** Optional Firmware configurations -; -DFIRMWARE_MINIMAL -; -DFIRMWARE_SENSORS -; -DFIRMWARE_BASIC -; -DFIRMWARE_KNX_NO_EMULATION -; -DFIRMWARE_DISPLAYS -; -DFIRMWARE_IR -; -DFIRMWARE_IR_CUSTOM -; -DUSE_CONFIG_OVERRIDE - -; *** Fix espressif8266@1.7.0 induced undesired all warnings -build_unflags = -Wall - -; set CPU frequency to 80MHz (default) or 160MHz -board_build.f_cpu = 80000000L -;board_build.f_cpu = 160000000L - -monitor_speed = 115200 -upload_speed = 115200 -upload_resetmethod = nodemcu - -; *** Upload Serial reset method for Wemos and NodeMCU -upload_port = COM5 -extra_scripts = pio/strip-floats.py - pio/obj-dump.py - -; *** Upload file to OTA server using SCP -;upload_port = user@host:/path -;extra_scripts = pio/strip-floats.py, pio/sftp-uploader.py - -; *** Upload file to OTA server in folder api/arduino using HTTP -;upload_port = domus1:80/api/upload-arduino.php -;extra_scripts = pio/strip-floats.py, pio/http-uploader.py - -; ********************************************************************* - [env:tasmota] platform = ${common.platform} framework = ${common.framework} From 6a6d829c27c05edc43d00c7da1541a848b06494e Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 1 Nov 2019 11:25:08 +0100 Subject: [PATCH 2/4] Update platformio.ini --- platformio.ini | 62 ++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/platformio.ini b/platformio.ini index f7837adbf..cae9f6b78 100755 --- a/platformio.ini +++ b/platformio.ini @@ -12,36 +12,38 @@ src_dir = tasmota build_dir = .pioenvs build_cache_dir = .cache -; *** Uncomment one of the lines below to build/upload only one environment -;default_envs = tasmota -;default_envs = tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big -;default_envs = tasmota-minimal -;default_envs = tasmota-basic -;default_envs = tasmota-knx -;default_envs = tasmota-sensors -;default_envs = tasmota-display -;default_envs = tasmota-ir -;default_envs = tasmota-BG -;default_envs = tasmota-BR -;default_envs = tasmota-CN -;default_envs = tasmota-CZ -;default_envs = tasmota-DE -;default_envs = tasmota-ES -;default_envs = tasmota-FR -;default_envs = tasmota-GR -;default_envs = tasmota-HE -;default_envs = tasmota-HU -;default_envs = tasmota-IT -;default_envs = tasmota-KO -;default_envs = tasmota-NL -;default_envs = tasmota-PL -;default_envs = tasmota-PT -;default_envs = tasmota-RU -;default_envs = tasmota-SE -;default_envs = tasmota-SK -;default_envs = tasmota-TR -;default_envs = tasmota-TW -;default_envs = tasmota-UK +; *** Build/upload environment +default_envs = +; *** Uncomment the line(s) below to select version(s) +; tasmota +; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big +; tasmota-minimal +; tasmota-basic +; tasmota-knx +; tasmota-sensors +; tasmota-display +; tasmota-ir +; tasmota-BG +; tasmota-BR +; tasmota-CN +; tasmota-CZ +; tasmota-DE +; tasmota-ES +; tasmota-FR +; tasmota-GR +; tasmota-HE +; tasmota-HU +; tasmota-IT +; tasmota-KO +; tasmota-NL +; tasmota-PL +; tasmota-PT +; tasmota-RU +; tasmota-SE +; tasmota-SK +; tasmota-TR +; tasmota-TW +; tasmota-UK [common] framework = arduino From fa854b7bfbfab508f9a9567499e89f2ef61ff997 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 1 Nov 2019 11:44:18 +0100 Subject: [PATCH 3/4] Update platformio.ini --- platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index cae9f6b78..2ed7415c3 100755 --- a/platformio.ini +++ b/platformio.ini @@ -14,7 +14,7 @@ build_cache_dir = .cache ; *** Build/upload environment default_envs = -; *** Uncomment the line(s) below to select version(s) +; *** Uncomment by deleting ";" in the line(s) below to select version(s) ; tasmota ; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big ; tasmota-minimal @@ -54,7 +54,7 @@ platform = ${core_active.platform} build_flags = ${core_active.build_flags} ; ********************************************************************* -; *** Uncomment to use custom settings from file user_config_override.h +; *** Uncomment by deleting ";" to use custom settings from file user_config_override.h ; -DUSE_CONFIG_OVERRIDE ; ********************************************************************* From 66d0ee34a3921b3c411bb90629debf1ba8281bf2 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Fri, 1 Nov 2019 11:48:11 +0100 Subject: [PATCH 4/4] Update platformio.ini --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 2ed7415c3..3d2ef5aea 100755 --- a/platformio.ini +++ b/platformio.ini @@ -54,7 +54,7 @@ platform = ${core_active.platform} build_flags = ${core_active.build_flags} ; ********************************************************************* -; *** Uncomment by deleting ";" to use custom settings from file user_config_override.h +; *** Uncomment, by deleting ";" in line below, to use custom settings from file user_config_override.h ; -DUSE_CONFIG_OVERRIDE ; *********************************************************************