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

Check GroupTopic index, Fix response to include other groups

This commit is contained in:
Paul C Diem 2020-03-16 17:06:41 -05:00
parent fe4614581c
commit 52b3739614
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/xdrv_02_mqtt.ino
View File

@ -882,7 +882,8 @@ void CmndPublish(void)
void CmndGroupTopic(void) void CmndGroupTopic(void)
{ {
#ifdef USE_DEVICE_GROUPS #ifdef USE_DEVICE_GROUPS
uint32_t settings_text_index = (XdrvMailbox.index <= 1 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + XdrvMailbox.index - 2); if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
uint32_t settings_text_index = (XdrvMailbox.index <= 1 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + XdrvMailbox.index - 2);
#endif // USE_DEVICE_GROUPS #endif // USE_DEVICE_GROUPS
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0) {
MakeValidMqtt(0, XdrvMailbox.data); MakeValidMqtt(0, XdrvMailbox.data);
@ -894,7 +895,12 @@ void CmndGroupTopic(void)
#endif // USE_DEVICE_GROUPS #endif // USE_DEVICE_GROUPS
restart_flag = 2; restart_flag = 2;
} }
#ifdef USE_DEVICE_GROUPS
ResponseCmndChar(SettingsText(settings_text_index));
}
#else // USE_DEVICE_GROUPS
ResponseCmndChar(SettingsText(SET_MQTT_GRP_TOPIC)); ResponseCmndChar(SettingsText(SET_MQTT_GRP_TOPIC));
#endif // USE_DEVICE_GROUPS
} }
void CmndTopic(void) void CmndTopic(void)