mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12602 from s-hadinger/move_defines 

Moving defines post-config
This commit is contained in:
Theo Arends 2021-07-09 16:36:58 +02:00 committed by GitHub
parent 65150432bc da6846207c
commit a5c0b0d2b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tasmota/tasmota_configurations.h
View File

@ -951,4 +951,48 @@
#endif #endif
#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_ #endif // _TASMOTA_CONFIGURATIONS_H_

44
tasmota/tasmota_globals.h
View File

@ -156,50 +156,6 @@ String EthernetMacAddress(void);
#endif // ESP32 #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 #ifdef USE_PID
#define USE_TIMEPROP #define USE_TIMEPROP
#endif #endif