From 501c07acef471347450c67e9bc66b049797b2dde Mon Sep 17 00:00:00 2001 From: Adrian Scillato Date: Wed, 19 Jan 2022 12:28:53 -0300 Subject: [PATCH 1/2] Move Post Processing Macros after user_config_override.h --- tasmota/my_user_config.h | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 88e95d94b..d25806717 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -980,9 +980,6 @@ #define SET_ESP32_STACK_SIZE (8 * 1024) // Set the stack size for Tasmota. The default value is 8192 for Arduino, some builds might need to increase it //#define USE_SONOFF_SPM // Add support for ESP32 based Sonoff Smart Stackable Power Meter(+6k3 code) -#ifdef USE_SONOFF_SPM -#define USE_ETHERNET -#endif //#define USE_ETHERNET // Add support for ethernet (Currently fixed for Olimex ESP32-PoE) // #define USE_WT32_ETH01 // Add support for Wireless-Tag WT32-ETH01 @@ -1095,7 +1092,15 @@ //#define FIRMWARE_MINIMAL // Create tasmota-minimal as intermediate firmware for OTA-MAGIC /*********************************************************************************************\ - * No user configurable items below + * User configurable items override * +\*********************************************************************************************/ + +#ifdef USE_CONFIG_OVERRIDE + #include "user_config_override.h" // Configuration overrides for my_user_config.h +#endif + +/*********************************************************************************************\ + * Mutual exclude options \*********************************************************************************************/ #if defined(USE_DISCOVERY) && (defined(USE_MQTT_AWS_IOT) || defined(USE_MQTT_AWS_IOT_LIGHT)) @@ -1107,7 +1112,7 @@ #endif /*********************************************************************************************\ - * Post-process compile options for Autoconf + * Post-process compile options for Autoconf and others \*********************************************************************************************/ #if defined(USE_AUTOCONF) @@ -1122,6 +1127,10 @@ #endif #endif // USE_AUTOCONF +#ifdef USE_SONOFF_SPM + #define USE_ETHERNET +#endif + /*********************************************************************************************\ * Post-process compile options for TLS \*********************************************************************************************/ @@ -1130,10 +1139,6 @@ #define USE_TLS // flag indicates we need to include TLS code #endif -#ifdef USE_CONFIG_OVERRIDE - #include "user_config_override.h" // Configuration overrides for my_user_config.h -#endif - /*********************************************************************************************\ * Post-process stack size adjustment \*********************************************************************************************/ From a596a406ba11bba12f44a5d109e3318e82738abb Mon Sep 17 00:00:00 2001 From: Adrian Scillato Date: Wed, 19 Jan 2022 12:32:38 -0300 Subject: [PATCH 2/2] Move post processing macros after user_config_override.h --- tasmota/tasmota_configurations.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h index 18b39deaa..add1cbebc 100644 --- a/tasmota/tasmota_configurations.h +++ b/tasmota/tasmota_configurations.h @@ -1045,8 +1045,8 @@ #define USE_UNISHOX_COMPRESSION // Add support for string compression #endif -#if defined(USE_MQTT_TLS) || defined(USE_TELEGRAM) // Enable TLS if required: - #define USE_TLS // flag indicates we need to include TLS code -#endif // USE_MQTT_TLS || USE_TELEGRAM +#if defined(USE_MQTT_TLS) // Enable TLS if required: + #define USE_TLS // flag indicates we need to include TLS code +#endif // USE_MQTT_TLS #endif // _TASMOTA_CONFIGURATIONS_H_