jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-10 11:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix domoticz core 2.3.0 compilation error

Browse Source 
Fix domoticz core 2.3.0 compilation error
This commit is contained in:
Theo Arends
2019-10-02 17:39:27 +02:00
parent 51076d02d7
commit bc55237154
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sonoff/_changelog.ino
View File

@@ -8,8 +8,8 @@
* Add command to MCP230xx: sensor29 pin,0/1/2 for OFF/ON/TOGGLE * 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 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) * 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 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 (#6524) * 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) * 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 * Fix TasmotaSerial: move serial send to IRAM for high speed baud rates
* *

5
sonoff/xdrv_07_domoticz.ino
View File

@@ -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 ; 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_in_topic[] = DOMOTICZ_IN_TOPIC;
char domoticz_out_topic[] = DOMOTICZ_OUT_TOPIC;
int domoticz_update_timer = 0; int domoticz_update_timer = 0;
uint32_t domoticz_fan_debounce = 0; // iFan02 state debounce timer uint32_t domoticz_fan_debounce = 0; // iFan02 state debounce timer
@@ -166,7 +165,7 @@ void DomoticzMqttSubscribe(void)
} }
if (domoticz_subscribe) { if (domoticz_subscribe) {
char stopic[TOPSZ]; 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); MqttSubscribe(stopic);
} }
} }
@@ -201,7 +200,7 @@ bool DomoticzMqttData(void)
{ {
domoticz_update_flag = true; 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 return false; // Process unchanged data
} }