diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h index 4bf52d560..b2aff921c 100644 --- a/tasmota/tasmota_configurations.h +++ b/tasmota/tasmota_configurations.h @@ -951,4 +951,48 @@ #endif #endif +/*********************************************************************************************\ + * Mandatory defines satisfying disabled defines +\*********************************************************************************************/ + +#ifndef ESP8266_1M +#define USE_UFILESYS +#define GUI_TRASH_FILE +#define GUI_EDIT_FILE +#define USE_PING + #ifdef USE_RULES + #define USE_EXPRESSION + #define SUPPORT_IF_STATEMENT + #define SUPPORT_MQTT_EVENT + #endif // USE_RULES +#endif // NOT ESP8266_1M + +#ifdef USE_EMULATION_HUE +#define USE_EMULATION +#endif +#ifdef USE_EMULATION_WEMO +#define USE_EMULATION +#endif + +// Convert legacy slave to client +#ifdef USE_TASMOTA_SLAVE +#define USE_TASMOTA_CLIENT +#endif +#ifdef USE_TASMOTA_SLAVE_FLASH_SPEED +#define USE_TASMOTA_CLIENT_FLASH_SPEED USE_TASMOTA_SLAVE_FLASH_SPEED +#endif +#ifdef USE_TASMOTA_SLAVE_SERIAL_SPEED +#define USE_TASMOTA_CLIENT_SERIAL_SPEED USE_TASMOTA_SLAVE_SERIAL_SPEED +#endif + +#ifdef USE_SCRIPT +#define USE_UNISHOX_COMPRESSION // Add support for string compression +#endif +#ifdef USE_ZIGBEE +#define USE_UNISHOX_COMPRESSION // Add support for string compression +#endif +#ifdef USE_EMULATION_HUE +#define USE_UNISHOX_COMPRESSION // Add support for string compression +#endif + #endif // _TASMOTA_CONFIGURATIONS_H_ diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h index 88cb81905..be3d67f96 100644 --- a/tasmota/tasmota_globals.h +++ b/tasmota/tasmota_globals.h @@ -156,50 +156,6 @@ String EthernetMacAddress(void); #endif // ESP32 -/*********************************************************************************************\ - * Mandatory defines satisfying disabled defines -\*********************************************************************************************/ - -#ifndef ESP8266_1M -#define USE_UFILESYS -#define GUI_TRASH_FILE -#define GUI_EDIT_FILE -#define USE_PING - #ifdef USE_RULES - #define USE_EXPRESSION - #define SUPPORT_IF_STATEMENT - #define SUPPORT_MQTT_EVENT - #endif // USE_RULES -#endif // NOT ESP8266_1M - -#ifdef USE_EMULATION_HUE -#define USE_EMULATION -#endif -#ifdef USE_EMULATION_WEMO -#define USE_EMULATION -#endif - -// Convert legacy slave to client -#ifdef USE_TASMOTA_SLAVE -#define USE_TASMOTA_CLIENT -#endif -#ifdef USE_TASMOTA_SLAVE_FLASH_SPEED -#define USE_TASMOTA_CLIENT_FLASH_SPEED USE_TASMOTA_SLAVE_FLASH_SPEED -#endif -#ifdef USE_TASMOTA_SLAVE_SERIAL_SPEED -#define USE_TASMOTA_CLIENT_SERIAL_SPEED USE_TASMOTA_SLAVE_SERIAL_SPEED -#endif - -#ifdef USE_SCRIPT -#define USE_UNISHOX_COMPRESSION // Add support for string compression -#endif -#ifdef USE_ZIGBEE -#define USE_UNISHOX_COMPRESSION // Add support for string compression -#endif -#ifdef USE_EMULATION_HUE -#define USE_UNISHOX_COMPRESSION // Add support for string compression -#endif - #ifdef USE_PID #define USE_TIMEPROP #endif