jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 21:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible exception on ESP8266 with Domoticz

Browse Source
This commit is contained in:
Theo Arends 2025-07-28 15:17:10 +02:00
parent 4a07148f37
commit 425db2274b
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino
View File

@ -141,12 +141,12 @@ void MqttPublishDomoticzFanState(void) {
} }
void DomoticzUpdateFanState(void) { void DomoticzUpdateFanState(void) {
if (Domoticz) { if (!Domoticz) { return; } // No MQTT enabled or unable to allocate memory
if (Domoticz->update_flag) {
MqttPublishDomoticzFanState(); if (Domoticz->update_flag) {
} MqttPublishDomoticzFanState();
Domoticz->update_flag = true;
} }
Domoticz->update_flag = true;
} }
#endif // USE_SONOFF_IFAN #endif // USE_SONOFF_IFAN
@ -181,12 +181,12 @@ void MqttPublishDomoticzPowerState(uint8_t device) {
} }
void DomoticzUpdatePowerState(uint8_t device) { void DomoticzUpdatePowerState(uint8_t device) {
if (Domoticz) { if (!Domoticz) { return; } // No MQTT enabled or unable to allocate memory
if (Domoticz->update_flag) {
MqttPublishDomoticzPowerState(device); if (Domoticz->update_flag) {
} MqttPublishDomoticzPowerState(device);
Domoticz->update_flag = true;
} }
Domoticz->update_flag = true;
} }
/*********************************************************************************************/ /*********************************************************************************************/
@ -402,15 +402,15 @@ void DomoticzSendSwitch(uint32_t type, uint32_t index, uint32_t state) {
} }
bool DomoticzSendKey(uint32_t key, uint32_t device, uint32_t state, uint32_t svalflg) { bool DomoticzSendKey(uint32_t key, uint32_t device, uint32_t state, uint32_t svalflg) {
bool result = false; if (!Domoticz) { return false; } // No MQTT enabled or unable to allocate memory
if (device <= MAX_DOMOTICZ_IDX) { if (device <= MAX_DOMOTICZ_IDX) {
if ((Settings->domoticz_key_idx[device -1] || Settings->domoticz_switch_idx[device -1]) && (svalflg)) { if ((Settings->domoticz_key_idx[device -1] || Settings->domoticz_switch_idx[device -1]) && (svalflg)) {
DomoticzSendSwitch(0, (key) ? Settings->domoticz_switch_idx[device -1] : Settings->domoticz_key_idx[device -1], state); DomoticzSendSwitch(0, (key) ? Settings->domoticz_switch_idx[device -1] : Settings->domoticz_key_idx[device -1], state);
result = true; return true;
} }
} }
return result; return false;
} }
/*********************************************************************************************\ /*********************************************************************************************\
@ -455,10 +455,6 @@ void DomoticzSensor(uint8_t idx, char *data) {
} }
} }
uint8_t DomoticzHumidityState(float h) {
return (!h) ? 0 : (h < 40) ? 2 : (h > 70) ? 3 : 1;
}
void DomoticzSensor(uint8_t idx, int value) { void DomoticzSensor(uint8_t idx, int value) {
char data[16]; char data[16];
snprintf_P(data, sizeof(data), PSTR("%d"), value); snprintf_P(data, sizeof(data), PSTR("%d"), value);
@ -484,6 +480,10 @@ void DomoticzFloatSensor(uint8_t idx, float value) {
DomoticzSensor(idx, data); DomoticzSensor(idx, data);
} }
uint8_t DomoticzHumidityState(float h) {
return (!h) ? 0 : (h < 40) ? 2 : (h > 70) ? 3 : 1;
}
//void DomoticzTempHumPressureSensor(float temp, float hum, float baro = -1); //void DomoticzTempHumPressureSensor(float temp, float hum, float baro = -1);
void DomoticzTempHumPressureSensor(float temp, float hum, float baro) { void DomoticzTempHumPressureSensor(float temp, float hum, float baro) {
char temperature[FLOATSZ]; char temperature[FLOATSZ];