Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-16 10:45:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix duplicate defines and restore alphabetical order (#2352)

Browse Source
This commit is contained in:
Oxan van Leeuwen 2021-09-21 06:52:01 +02:00 committed by GitHub
parent 24f445dade
commit 71fc61117b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
esphome/core/defines.h
View File

@ -12,10 +12,9 @@
// Feature flags // Feature flags
#define USE_API #define USE_API
#define USE_API_NOISE
#define USE_API_PLAINTEXT
#define USE_BINARY_SENSOR #define USE_BINARY_SENSOR
#ifdef USE_ARDUINO
#define USE_CAPTIVE_PORTAL
#endif
#define USE_CLIMATE #define USE_CLIMATE
#define USE_COVER #define USE_COVER
#define USE_DEEP_SLEEP #define USE_DEEP_SLEEP
@ -23,14 +22,6 @@
#define USE_FAN #define USE_FAN
#define USE_GRAPH #define USE_GRAPH
#define USE_HOMEASSISTANT_TIME #define USE_HOMEASSISTANT_TIME
#ifdef USE_ARDUINO
#define USE_JSON
#define USE_NEXTION_TFT_UPLOAD
#define USE_MQTT
#define USE_CAPTIVE_PORTAL
#endif // USE_ARDUINO
#define USE_LIGHT #define USE_LIGHT
#define USE_LOGGER #define USE_LOGGER
#define USE_MDNS #define USE_MDNS
@ -43,39 +34,36 @@
#define USE_STATUS_LED #define USE_STATUS_LED
#define USE_SWITCH #define USE_SWITCH
#define USE_TEXT_SENSOR #define USE_TEXT_SENSOR
#define USE_TIME #define USE_TIME
#define USE_WIFI #define USE_WIFI
// Arduino-specific feature flags
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
#define USE_CAPTIVE_PORTAL
#define USE_JSON
#define USE_NEXTION_TFT_UPLOAD
#define USE_MQTT
#define USE_WIFI_WPA2_EAP #define USE_WIFI_WPA2_EAP
#endif #endif
// ESP32-specific feature flags
#ifdef USE_ESP32 #ifdef USE_ESP32
#define USE_ESP32_BLE_SERVER #define USE_ESP32_BLE_SERVER
#define USE_ESP32_CAMERA #define USE_ESP32_CAMERA
#define USE_IMPROV
#define USE_SOCKET_IMPL_BSD_SOCKETS
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
#define USE_ETHERNET #define USE_ETHERNET
#endif // USE_ARDUINO #endif
#define USE_IMPROV
#define USE_SOCKET_IMPL_BSD_SOCKETS
#endif // USE_ESP32
#ifdef USE_ESP8266
#define USE_ADC_SENSOR_VCC
#define USE_SOCKET_IMPL_LWIP_TCP
#define USE_HTTP_REQUEST_ESP8266_HTTPS
#endif #endif
#define USE_API_PLAINTEXT // ESP8266-specific feature flags
#define USE_API_NOISE #ifdef USE_ESP8266
#define USE_ADC_SENSOR_VCC
#define USE_HTTP_REQUEST_ESP8266_HTTPS
#define USE_SOCKET_IMPL_LWIP_TCP
#endif
// Disabled feature flags // Disabled feature flags
//#define USE_BSEC // Requires a library with proprietary license. //#define USE_BSEC // Requires a library with proprietary license.
#define USE_TIME
#define USE_DEEP_SLEEP
#define ESPHOME_BOARD "dummy_board"
#define USE_MDNS
#define USE_API_NOISE
#define USE_API_PLAINTEXT