From f8600c048dc526261327b5f84377a0559b58cec8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 6 May 2020 16:18:29 +0200 Subject: [PATCH 1/3] Create override_copy.py --- pio/override_copy.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pio/override_copy.py diff --git a/pio/override_copy.py b/pio/override_copy.py new file mode 100644 index 000000000..885dcd463 --- /dev/null +++ b/pio/override_copy.py @@ -0,0 +1,9 @@ +Import('env') +import os +import shutil + +# copy tasmota/user_config_override_sample.h to tasmota/user_config_override.h +if os.path.isfile("tasmota/user_config_override.h"): + print ("*** use provided user_config_override.h as planned ***") +else: + shutil.copy("tasmota/user_config_override_sample.h", "tasmota/user_config_override.h") From 82ec017b3b056c3875f58df091c8174df53e3854 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 6 May 2020 16:22:27 +0200 Subject: [PATCH 2/3] enable user_config_override.h by default --- platformio.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 7688d3974..23ebbaa12 100755 --- a/platformio.ini +++ b/platformio.ini @@ -8,8 +8,10 @@ ; http://docs.platformio.org/en/stable/projectconf.html [platformio] +description = Provide ESP8266 based devices with Web, MQTT and OTA firmware src_dir = tasmota build_dir = .pioenvs +workspace_dir = .pioenvs build_cache_dir = .cache extra_configs = platformio_tasmota_env.ini platformio_override.ini @@ -64,11 +66,8 @@ platform_packages = ${core_active.platform_packages} build_flags = ${core_active.build_flags} ; ********************************************************************* -; *** Uncomment, by deleting ";" in line below, to use custom settings from file user_config_override.h -; -DUSE_CONFIG_OVERRIDE -; -; *** alternatively can be done in: platformio_override.ini -; *** See example: platformio_override_sample.ini +; *** Use custom settings from file user_config_override.h + -DUSE_CONFIG_OVERRIDE ; ********************************************************************* ; *** Fix espressif8266@1.7.0 induced undesired all warnings @@ -86,6 +85,7 @@ extra_scripts = ${scripts_defaults.extra_scripts} extra_scripts = pio/strip-floats.py pio/name-firmware.py pio/gzip-firmware.py + pio/override_copy.py [esp_defaults] build_flags = -D_IR_ENABLE_DEFAULT_=false From 02c304f9e536a63d209dac7d8fa0d361232e6ac8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 6 May 2020 16:23:29 +0200 Subject: [PATCH 3/3] Add files via upload --- pio/override_copy.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pio/override_copy.py b/pio/override_copy.py index 885dcd463..1cb6c991b 100644 --- a/pio/override_copy.py +++ b/pio/override_copy.py @@ -1,9 +1,9 @@ -Import('env') -import os -import shutil - -# copy tasmota/user_config_override_sample.h to tasmota/user_config_override.h -if os.path.isfile("tasmota/user_config_override.h"): - print ("*** use provided user_config_override.h as planned ***") -else: - shutil.copy("tasmota/user_config_override_sample.h", "tasmota/user_config_override.h") +Import('env') +import os +import shutil + +# copy tasmota/user_config_override_sample.h to tasmota/user_config_override.h +if os.path.isfile("tasmota/user_config_override.h"): + print ("*** use provided user_config_override.h as planned ***") +else: + shutil.copy("tasmota/user_config_override_sample.h", "tasmota/user_config_override.h")