mirror of https://github.com/arendst/Tasmota.git
Check GroupTopic index, Fix response to include other groups
This commit is contained in:
parent
fe4614581c
commit
52b3739614
|
@ -882,6 +882,7 @@ void CmndPublish(void)
|
||||||
void CmndGroupTopic(void)
|
void CmndGroupTopic(void)
|
||||||
{
|
{
|
||||||
#ifdef USE_DEVICE_GROUPS
|
#ifdef USE_DEVICE_GROUPS
|
||||||
|
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);
|
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) {
|
||||||
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue