jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14514 from ascillato/patch-1

Browse Source 
Move Post Processing Macros after user_config_override.h
This commit is contained in:
Adrian Scillato 2022-01-19 12:47:55 -03:00 committed by GitHub
commit abf5aa2f79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasmota/my_user_config.h
View File

@ -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 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) //#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_ETHERNET // Add support for ethernet (Currently fixed for Olimex ESP32-PoE)
// #define USE_WT32_ETH01 // Add support for Wireless-Tag WT32-ETH01 // #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 //#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)) #if defined(USE_DISCOVERY) && (defined(USE_MQTT_AWS_IOT) || defined(USE_MQTT_AWS_IOT_LIGHT))
@ -1107,7 +1112,7 @@
#endif #endif
/*********************************************************************************************\ /*********************************************************************************************\
* Post-process compile options for Autoconf * Post-process compile options for Autoconf and others
\*********************************************************************************************/ \*********************************************************************************************/
#if defined(USE_AUTOCONF) #if defined(USE_AUTOCONF)
@ -1122,6 +1127,10 @@
#endif #endif
#endif // USE_AUTOCONF #endif // USE_AUTOCONF
#ifdef USE_SONOFF_SPM
#define USE_ETHERNET
#endif
/*********************************************************************************************\ /*********************************************************************************************\
* Post-process compile options for TLS * Post-process compile options for TLS
\*********************************************************************************************/ \*********************************************************************************************/
@ -1130,10 +1139,6 @@
#define USE_TLS // flag indicates we need to include TLS code #define USE_TLS // flag indicates we need to include TLS code
#endif #endif
#ifdef USE_CONFIG_OVERRIDE
#include "user_config_override.h" // Configuration overrides for my_user_config.h
#endif
/*********************************************************************************************\ /*********************************************************************************************\
* Post-process stack size adjustment * Post-process stack size adjustment
\*********************************************************************************************/ \*********************************************************************************************/

4
tasmota/tasmota_configurations.h
View File

@ -1045,8 +1045,8 @@
#define USE_UNISHOX_COMPRESSION // Add support for string compression #define USE_UNISHOX_COMPRESSION // Add support for string compression
#endif #endif
#if defined(USE_MQTT_TLS) || defined(USE_TELEGRAM) // Enable TLS if required: #if defined(USE_MQTT_TLS) // Enable TLS if required:
#define USE_TLS // flag indicates we need to include TLS code #define USE_TLS // flag indicates we need to include TLS code
#endif // USE_MQTT_TLS || USE_TELEGRAM #endif // USE_MQTT_TLS
#endif // _TASMOTA_CONFIGURATIONS_H_ #endif // _TASMOTA_CONFIGURATIONS_H_