jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 13:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force delete of retained messages

Browse Source 
Force delete of retained messages
This commit is contained in:
Theo Arends 2022-08-19 16:43:20 +02:00
parent a919b109de
commit dc217655a0
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino
View File

@ -1625,7 +1625,7 @@ void CmndPowerRetain(void) {
for (uint32_t i = 1; i <= TasmotaGlobal.devices_present; i++) { // Clear MQTT retain in broker for (uint32_t i = 1; i <= TasmotaGlobal.devices_present; i++) { // Clear MQTT retain in broker
GetTopic_P(stemp1, STAT, TasmotaGlobal.mqtt_topic, GetPowerDevice(scommand, i, sizeof(scommand), Settings->flag.device_index_enable)); // SetOption26 - Switch between POWER or POWER1 GetTopic_P(stemp1, STAT, TasmotaGlobal.mqtt_topic, GetPowerDevice(scommand, i, sizeof(scommand), Settings->flag.device_index_enable)); // SetOption26 - Switch between POWER or POWER1
ResponseClear(); ResponseClear();
MqttPublish(stemp1, Settings->flag.mqtt_power_retain); // CMND_POWERRETAIN MqttPublish(stemp1, true);
} }
} }
Settings->flag.mqtt_power_retain = XdrvMailbox.payload; // CMND_POWERRETAIN Settings->flag.mqtt_power_retain = XdrvMailbox.payload; // CMND_POWERRETAIN
@ -1640,8 +1640,8 @@ void CmndSensorRetain(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(TELE, PSTR(D_RSLT_SENSOR), Settings->flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), true); // Remove retained SENSOR
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), Settings->flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), true); // Remove retained ENERGY
} }
Settings->flag.mqtt_sensor_retain = XdrvMailbox.payload; // CMND_SENSORRETAIN Settings->flag.mqtt_sensor_retain = XdrvMailbox.payload; // CMND_SENSORRETAIN
} }
@ -1653,41 +1653,41 @@ void CmndInfoRetain(void) {
if (!XdrvMailbox.payload) { if (!XdrvMailbox.payload) {
ResponseClear(); ResponseClear();
char stemp1[10]; 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++) { // Remove retained 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); MqttPublishPrefixTopic_P(TELE, stemp1, true);
} }
} }
Settings->flag5.mqtt_info_retain = XdrvMailbox.payload; Settings->flag5.mqtt_info_retain = XdrvMailbox.payload; // CMND_INFORETAIN
} }
ResponseCmndStateText(Settings->flag5.mqtt_info_retain); ResponseCmndStateText(Settings->flag5.mqtt_info_retain); // CMND_INFORETAIN
} }
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); MqttPublishPrefixTopic_P(STAT, PSTR(D_RSLT_STATE), true); // Remove retained STATE
} }
Settings->flag5.mqtt_state_retain = XdrvMailbox.payload; Settings->flag5.mqtt_state_retain = XdrvMailbox.payload; // CMND_STATERETAIN
} }
ResponseCmndStateText(Settings->flag5.mqtt_state_retain); ResponseCmndStateText(Settings->flag5.mqtt_state_retain); // CMND_STATERETAIN
} }
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();
MqttPublishPrefixTopic_P(STAT, PSTR(D_CMND_STATUS), Settings->flag5.mqtt_status_retain); // Relates to STATUS MqttPublishPrefixTopic_P(STAT, PSTR(D_CMND_STATUS), true); // Remove retained STATUS
char stemp1[10]; char stemp1[10];
for (uint32_t i = 0; i <= 13; i++) { // Relates to STATUS0, STATUS1 .. STATUS13 for (uint32_t i = 0; i <= MAX_STATUS; i++) { // Remove retained STATUS0, STATUS1 .. STATUS13
snprintf_P(stemp1, sizeof(stemp1), PSTR(D_CMND_STATUS "%d"), i); snprintf_P(stemp1, sizeof(stemp1), PSTR(D_CMND_STATUS "%d"), i);
MqttPublishPrefixTopic_P(STAT, stemp1, Settings->flag5.mqtt_status_retain); MqttPublishPrefixTopic_P(STAT, stemp1, true);
} }
} }
Settings->flag5.mqtt_status_retain = XdrvMailbox.payload; Settings->flag5.mqtt_status_retain = XdrvMailbox.payload; // CMND_STATUSRETAIN
} }
ResponseCmndStateText(Settings->flag5.mqtt_status_retain); ResponseCmndStateText(Settings->flag5.mqtt_status_retain); // CMND_STATUSRETAIN
} }
/*********************************************************************************************\ /*********************************************************************************************\