From ee514f23df4f7bc8753fb5ba7c0abb5353a80744 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 16 Oct 2020 15:46:42 +0200 Subject: [PATCH 1/3] No changes needed for override use --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 385a1bfd0..bf5f66ef1 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ If you want to compile Tasmota yourself keep in mind the following: - Only Flash Mode **DOUT** is supported. Do not use Flash Mode DIO / QIO / QOUT as it might seem to brick your device. - Tasmota uses a 1M linker script WITHOUT spiffs **1M (no SPIFFS)** for optimal code space. -- To make compile time changes to Tasmota use the `user_config_override.h` file. It assures keeping your custom settings when you download and compile a new version. You have to make a copy from the provided `user_config_override_sample.h` file and add your setting overrides. To enable the override you have to set a compile define as documented in the `user_config_override_sample.h` file. +- To make compile time changes to Tasmota use the `user_config_override.h` file. It assures keeping your custom settings when you download and compile a new version. You have to make a copy from the provided `user_config_override_sample.h` file and add your setting overrides. ## Configuration Information From 3c4002dfdd26b6eb0f650e566486d58dc0702c04 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 16 Oct 2020 15:49:30 +0200 Subject: [PATCH 2/3] No Arduino IDE --- tasmota/user_config_override_sample.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tasmota/user_config_override_sample.h b/tasmota/user_config_override_sample.h index 227006776..b04b979fe 100644 --- a/tasmota/user_config_override_sample.h +++ b/tasmota/user_config_override_sample.h @@ -28,10 +28,7 @@ * To modify the stock configuration without changing the my_user_config.h file: * (1) copy this file to "user_config_override.h" (It will be ignored by Git) * (2) define your own settings below - * (3) for platformio: - * All done. - * for Arduino IDE: - * enable define USE_CONFIG_OVERRIDE in my_user_config.h + * ****************************************************************************************************** * ATTENTION: * - Changes to SECTION1 PARAMETER defines will only override flash settings if you change define CFG_HOLDER. From ae098f7e3d219780fc86073149330f0b89332a8f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 16 Oct 2020 15:52:28 +0200 Subject: [PATCH 3/3] Remove not needed Arduino-IDE setting --- tasmota/my_user_config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 2f1d5b668..883d3ca46 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -36,8 +36,6 @@ * Users are advised to use the user_config_override.h file for most changes. \*********************************************************************************************/ -//#define USE_CONFIG_OVERRIDE // Uncomment to use user_config_override.h file. See README.md - /*********************************************************************************************\ * SECTION 1 * - After initial load any change here only take effect if CFG_HOLDER is changed too