diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino index 98b13e80e..ac8e7a1b0 100644 --- a/sonoff/_changelog.ino +++ b/sonoff/_changelog.ino @@ -8,8 +8,8 @@ * Add command to MCP230xx: sensor29 pin,0/1/2 for OFF/ON/TOGGLE * Add initial support for PCF8574 I2C I/O Expander (currently output only) by Stefan Bode * Add command SetOption71 0/1 to switch between different Modbus Active Energy registers on DDS238-2 energy meters (#6531) - * Change command SetOption43 to make it more general. Now supports PS_16_DZ driver too (#6547) - * Change command handling by moving buffers up in chain solving MQTTlog support (#6524) + * Change command SetOption43 to make it more general. Now supports PS_16_DZ driver too (#6544) + * Change command handling by moving buffers up in chain solving MQTTlog support (#6529) * Change detection of non-MQTT commands by allowing non-space characters as delimiter (#6540) * Fix TasmotaSerial: move serial send to IRAM for high speed baud rates * diff --git a/sonoff/xdrv_07_domoticz.ino b/sonoff/xdrv_07_domoticz.ino index 0bdc22b83..e4f1b5ca1 100644 --- a/sonoff/xdrv_07_domoticz.ino +++ b/sonoff/xdrv_07_domoticz.ino @@ -45,7 +45,6 @@ const char kDomoticzSensors[] PROGMEM = D_DOMOTICZ_COUNT "|" D_DOMOTICZ_VOLTAGE "|" D_DOMOTICZ_CURRENT "|" D_DOMOTICZ_AIRQUALITY "|" D_DOMOTICZ_P1_SMART_METER "|" D_DOMOTICZ_SHUTTER ; char domoticz_in_topic[] = DOMOTICZ_IN_TOPIC; -char domoticz_out_topic[] = DOMOTICZ_OUT_TOPIC; int domoticz_update_timer = 0; uint32_t domoticz_fan_debounce = 0; // iFan02 state debounce timer @@ -166,7 +165,7 @@ void DomoticzMqttSubscribe(void) } if (domoticz_subscribe) { char stopic[TOPSZ]; - snprintf_P(stopic, sizeof(stopic), PSTR("%s/#"), domoticz_out_topic); // domoticz topic + snprintf_P(stopic, sizeof(stopic), PSTR(DOMOTICZ_OUT_TOPIC "/#")); // domoticz topic MqttSubscribe(stopic); } } @@ -201,7 +200,7 @@ bool DomoticzMqttData(void) { domoticz_update_flag = true; - if (strncasecmp(XdrvMailbox.topic, domoticz_out_topic, strlen(domoticz_out_topic)) != 0) { + if (strncasecmp_P(XdrvMailbox.topic, PSTR(DOMOTICZ_OUT_TOPIC), strlen(DOMOTICZ_OUT_TOPIC)) != 0) { return false; // Process unchanged data }