jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 04:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix StatusRetain reset

Browse Source
This commit is contained in:
Theo Arends 2022-08-19 15:12:16 +02:00
parent 1fe39bb620
commit a919b109de
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino
View File

@ -1652,43 +1652,42 @@ void CmndInfoRetain(void) {
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
if (!XdrvMailbox.payload) { if (!XdrvMailbox.payload) {
ResponseClear(); ResponseClear();
char stemp1[10]; // STATUS11 char stemp1[10];
for (uint32_t i = 1; i <= 3; i++) { // Relates to INFO1, INFO2 and INFO3 for (uint32_t i = 1; i <= 3; i++) { // Relates to INFO1, INFO2 and INFO3
snprintf_P(stemp1, sizeof(stemp1), PSTR(D_RSLT_INFO "%d"), i); snprintf_P(stemp1, sizeof(stemp1), PSTR(D_RSLT_INFO "%d"), i);
MqttPublishPrefixTopic_P(TELE, stemp1, Settings->flag5.mqtt_info_retain); // CMND_INFORETAIN MqttPublishPrefixTopic_P(TELE, stemp1, Settings->flag5.mqtt_info_retain);
} }
} }
Settings->flag5.mqtt_info_retain = XdrvMailbox.payload; // CMND_INFORETAIN Settings->flag5.mqtt_info_retain = XdrvMailbox.payload;
} }
ResponseCmndStateText(Settings->flag5.mqtt_info_retain); // CMND_INFORETAIN ResponseCmndStateText(Settings->flag5.mqtt_info_retain);
} }
void CmndStateRetain(void) { void CmndStateRetain(void) {
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
if (!XdrvMailbox.payload) { if (!XdrvMailbox.payload) {
ResponseClear(); ResponseClear();
MqttPublishPrefixTopic_P(STAT, PSTR(D_RSLT_STATE), Settings->flag5.mqtt_state_retain); // CMND_STATERETAIN MqttPublishPrefixTopic_P(STAT, PSTR(D_RSLT_STATE), Settings->flag5.mqtt_state_retain);
} }
Settings->flag5.mqtt_state_retain = XdrvMailbox.payload; // CMND_STATERETAIN Settings->flag5.mqtt_state_retain = XdrvMailbox.payload;
} }
ResponseCmndStateText(Settings->flag5.mqtt_state_retain); // CMND_STATERETAIN ResponseCmndStateText(Settings->flag5.mqtt_state_retain);
} }
void CmndStatusRetain(void) { void CmndStatusRetain(void) {
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
if (!XdrvMailbox.payload) { if (!XdrvMailbox.payload) {
ResponseClear(); ResponseClear();
char cmnd_status[10]; // STATUS11 MqttPublishPrefixTopic_P(STAT, PSTR(D_CMND_STATUS), Settings->flag5.mqtt_status_retain); // Relates to STATUS
char number[4] = { 0 }; char stemp1[10];
for (uint32_t i = 0; i <= 13; i++) { // Relates to STATUS, STATUS1 .. STATUS13 for (uint32_t i = 0; i <= 13; i++) { // Relates to STATUS0, STATUS1 .. STATUS13
snprintf_P(cmnd_status, sizeof(cmnd_status), PSTR(D_CMND_STATUS "%s"), (i) ? itoa(i, number, 10) : ""); snprintf_P(stemp1, sizeof(stemp1), PSTR(D_CMND_STATUS "%d"), i);
MqttPublishPrefixTopic_P(STAT, cmnd_status, Settings->flag5.mqtt_status_retain); // CMND_STATUSRETAIN MqttPublishPrefixTopic_P(STAT, stemp1, Settings->flag5.mqtt_status_retain);
} }
} }
Settings->flag5.mqtt_status_retain = XdrvMailbox.payload; // CMND_STATUSRETAIN Settings->flag5.mqtt_status_retain = XdrvMailbox.payload;
} }
ResponseCmndStateText(Settings->flag5.mqtt_status_retain); // CMND_STATUSRETAIN ResponseCmndStateText(Settings->flag5.mqtt_status_retain);
} }
/*********************************************************************************************\ /*********************************************************************************************\