Fix domoticz/shutter compile error

This commit is contained in:
Theo Arends 2020-09-24 17:13:32 +02:00
parent e7db226b48
commit cac00a7efd

View File

@ -236,7 +236,7 @@ bool DomoticzMqttData(void) {
return true; return true;
} }
uint8_t svalue = svalue_tok.getUInt(); uint8_t svalue = svalue_tok.getUInt();
svalue = (nvalue == 2) ? svalue / 10 : 0; svalue = (2 == nvalue) ? svalue / 10 : 0;
if (GetFanspeed() == svalue) { if (GetFanspeed() == svalue) {
return true; // Stop loop as already set return true; // Stop loop as already set
} }
@ -249,14 +249,10 @@ bool DomoticzMqttData(void) {
} else } else
#endif // USE_SONOFF_IFAN #endif // USE_SONOFF_IFAN
#ifdef USE_SHUTTER #ifdef USE_SHUTTER
if (isShutter) if (isShutter) {
{
// TODO this code seems redundant, nvalue is already retrieved from above
nvalue = domoticz.getUInt(PSTR("nvalue", -1));
uint8_t position = domoticz.getUInt(PSTR("svalue1"), 0); uint8_t position = domoticz.getUInt(PSTR("svalue1"), 0);
if (nvalue != 2) { if (nvalue != 2) {
position = nvalue == 0 ? 0 : 100; position = (0 == nvalue) ? 0 : 100;
} }
snprintf_P(XdrvMailbox.topic, TOPSZ, PSTR("/" D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION)); snprintf_P(XdrvMailbox.topic, TOPSZ, PSTR("/" D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION));