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

Update Hass discovery

This commit is contained in:
Erik 2018-12-08 09:43:48 +01:00
parent a65041fee5
commit ebf74ab424
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sonoff/xdrv_12_home_assistant.ino
View File

@ -345,9 +345,10 @@ void HAssAnnounceSwitches(void)
// Check if MQTT message will be ON/OFF or TOGGLE // Check if MQTT message will be ON/OFF or TOGGLE
if (Settings.switchmode[switch_index] == FOLLOW || Settings.switchmode[switch_index] == FOLLOW_INV || if (Settings.switchmode[switch_index] == FOLLOW || Settings.switchmode[switch_index] == FOLLOW_INV ||
Settings.flag3.button_switch_force_local ||
!strcmp(mqtt_topic, sw_topic) || !strcmp(Settings.mqtt_grptopic, sw_topic)) !strcmp(mqtt_topic, sw_topic) || !strcmp(Settings.mqtt_grptopic, sw_topic))
{ {
toggle = 0; toggle = 0; // MQTT message will be ON/OFF
} }
HAssAnnounceButtonSwitch(switch_index, sw_topic, switch_present, 0, toggle); HAssAnnounceButtonSwitch(switch_index, sw_topic, switch_present, 0, toggle);
@ -377,9 +378,10 @@ void HAssAnnounceButtons(void)
} }
// Check if MQTT message will be ON/OFF or TOGGLE // Check if MQTT message will be ON/OFF or TOGGLE
if (!strcmp(mqtt_topic, key_topic) || !strcmp(Settings.mqtt_grptopic, key_topic)) if (Settings.flag3.button_switch_force_local ||
!strcmp(mqtt_topic, key_topic) || !strcmp(Settings.mqtt_grptopic, key_topic))
{ {
toggle = 0; toggle = 0; // MQTT message will be ON/OFF
} }
HAssAnnounceButtonSwitch(button_index, key_topic, button_present, 1, toggle); HAssAnnounceButtonSwitch(button_index, key_topic, button_present, 1, toggle);