Skip to content

Commit b7eee1b

Browse files
Merge remote-tracking branch 'Tasmota/development' into work
2 parents 9f6bde1 + 227e5f2 commit b7eee1b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tasmota/include/tasmota_configurations.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,7 @@
702702
#define USE_TASMOTA_DISCOVERY // Enable Tasmota Discovery support (+2k code)
703703
#undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set
704704
#undef USE_KNX // Disable KNX IP Protocol Support
705+
#undef USE_DALI // Disable support for DALI gateway (+5k code)
705706
//#undef USE_WEBSERVER // Disable Webserver
706707
#undef USE_ENHANCED_GUI_WIFI_SCAN // Disable wifi scan output with BSSID (+0k5 code)
707708
#undef USE_WEBSEND_RESPONSE // Disable command WebSend response message (+1k code)
@@ -867,6 +868,7 @@
867868
#undef USE_TELEGRAM // Disable support for Telegram protocol (+49k code, +7.0k mem and +4.8k additional during connection handshake)
868869
//#undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set
869870
#undef USE_KNX // Disable KNX IP Protocol Support
871+
#undef USE_DALI // Disable support for DALI gateway (+5k code)
870872
//#undef USE_WEBSERVER // Disable Webserver
871873
#undef USE_GPIO_VIEWER // Disable GPIO Viewer to see realtime GPIO states (+5k6 code)
872874
#undef USE_ENHANCED_GUI_WIFI_SCAN // Disable wifi scan output with BSSID (+0k5 code)

tasmota/include/tasmota_configurations_ESP32.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
#undef USE_TELEGRAM // Disable support for Telegram protocol (+49k code, +7.0k mem and +4.8k additional during connection handshake)
6161
//#undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set
6262
#undef USE_KNX // Disable KNX IP Protocol Support
63+
#undef USE_DALI // Disable support for DALI gateway (+5k code)
6364
//#undef USE_WEBSERVER // Disable Webserver
6465
#undef USE_GPIO_VIEWER // Enable GPIO Viewer to see realtime GPIO states (+5k6 code)
6566
#undef USE_ENHANCED_GUI_WIFI_SCAN // Disable wifi scan output with BSSID (+0k5 code)
@@ -800,6 +801,7 @@
800801
#ifndef USE_KNX
801802
#define USE_KNX // Enable KNX IP Protocol Support (+23k code, +3k3 mem)
802803
#endif
804+
#define USE_DALI // Add support for DALI gateway (+5k code)
803805

804806
#endif // FIRMWARE_TASMOTA32
805807

tasmota/my_user_config.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -880,13 +880,13 @@
880880
//#define USE_VINDRIKTNING // Add support for IKEA VINDRIKTNING particle concentration sensor (+0k6 code)
881881
// #define VINDRIKTNING_SHOW_PM1 // Display undocumented/supposed PM1.0 values
882882
// #define VINDRIKTNING_SHOW_PM10 // Display undocumented/supposed PM10 values
883-
//#define USE_LD2410 // Add support for HLK-LD2410 24GHz smart wave motion sensor (+3k7 code)
884-
//#define USE_LD2410S // Add support for HLK-LD2410S 24GHz smart wave motion sensor (+4k6 code)
883+
//#define USE_LD2410 // Add support for HLK-LD2410 24GHz smart wave motion sensor (+2k8 code)
885884
//#define USE_LOX_O2 // Add support for LuminOx LOX O2 Sensor (+0k8 code)
886885
//#define USE_GM861 // Add support for GM861 1D and 2D Bar Code Reader (+1k3 code)
887886
// #define GM861_DECODE_AIM // Decode AIM-id (+0k3 code)
888887
// #define GM861_HEARTBEAT // Enable heartbeat (+0k2 code)
889888
//#define USE_WOOLIIS // Add support for Wooliis Hall Effect Coulometer or Battery capacity monitor (+1k6 code)
889+
//#define USE_DALI // Add support for DALI gateway (+5k code)
890890

891891
// -- Power monitoring sensors --------------------
892892
#define USE_ENERGY_SENSOR // Add support for Energy Monitors (+14k code)
@@ -1079,10 +1079,6 @@
10791079

10801080
//#define USE_FLOWRATEMETER // Add support for water flow meter YF-DN50 and similary (+1k7 code)
10811081

1082-
// #define USE_DALI // Add support for DALI 1 bridge (+2k1 code)
1083-
#define DALI_IN_INVERT 0 // DALI RX inverted
1084-
#define DALI_OUT_INVERT 0 // DALI TX inverted
1085-
10861082
// -- Thermostat control ----------------------------
10871083
//#define USE_THERMOSTAT // Add support for Thermostat
10881084
#define THERMOSTAT_CONTROLLER_OUTPUTS 1 // Number of outputs to be controlled independently

0 commit comments

Comments
 (0)