From 1fe39bb620bdffee245eaff3a54e0918757039ec Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 19 Aug 2022 15:03:32 +0200 Subject: [PATCH] Fix InfoRetain and StatusRetain Fix InfoRetain and StatusRetain clean up if disabled --- .../tasmota_xdrv_driver/xdrv_02_9_mqtt.ino | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino b/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino index 7430e4ca7..15bf5e16f 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino @@ -1652,11 +1652,15 @@ void CmndInfoRetain(void) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { if (!XdrvMailbox.payload) { ResponseClear(); - MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO), Settings->flag5.mqtt_info_retain); // CMND_INFORETAIN + char stemp1[10]; // STATUS11 + 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); + MqttPublishPrefixTopic_P(TELE, stemp1, Settings->flag5.mqtt_info_retain); // CMND_INFORETAIN + } } - Settings->flag5.mqtt_info_retain = XdrvMailbox.payload; // CMND_INFORETAIN + Settings->flag5.mqtt_info_retain = XdrvMailbox.payload; // CMND_INFORETAIN } - ResponseCmndStateText(Settings->flag5.mqtt_info_retain); // CMND_INFORETAIN + ResponseCmndStateText(Settings->flag5.mqtt_info_retain); // CMND_INFORETAIN } void CmndStateRetain(void) { @@ -1674,11 +1678,17 @@ void CmndStatusRetain(void) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { if (!XdrvMailbox.payload) { ResponseClear(); - MqttPublishPrefixTopic_P(STAT, PSTR(D_RSLT_STATE), Settings->flag5.mqtt_status_retain); // CMND_STATUSRETAIN + char cmnd_status[10]; // STATUS11 + char number[4] = { 0 }; + for (uint32_t i = 0; i <= 13; i++) { // Relates to STATUS, STATUS1 .. STATUS13 + snprintf_P(cmnd_status, sizeof(cmnd_status), PSTR(D_CMND_STATUS "%s"), (i) ? itoa(i, number, 10) : ""); + MqttPublishPrefixTopic_P(STAT, cmnd_status, Settings->flag5.mqtt_status_retain); // CMND_STATUSRETAIN + } + } - Settings->flag5.mqtt_status_retain = XdrvMailbox.payload; // CMND_STATUSRETAIN + Settings->flag5.mqtt_status_retain = XdrvMailbox.payload; // CMND_STATUSRETAIN } - ResponseCmndStateText(Settings->flag5.mqtt_status_retain); // CMND_STATUSRETAIN + ResponseCmndStateText(Settings->flag5.mqtt_status_retain); // CMND_STATUSRETAIN } /*********************************************************************************************\