Upload ");
if (_uploaderror) {
- page += F("failed");
+ page += F("
failed");
if (_uploaderror == 1) {
- page += F("
No file selected");
+ page += F("No file selected");
} else if (_uploaderror == 2) {
- page += F("
File size is larger than available free space");
+ page += F("File size is larger than available free space");
} else if (_uploaderror == 3) {
- page += F("
File magic header does not start with 0xE9");
+ page += F("File magic header does not start with 0xE9");
} else if (_uploaderror == 4) {
- page += F("
File flash size is larger than device flash size");
+ page += F("File flash size is larger than device flash size");
} else if (_uploaderror == 5) {
- page += F("
File upload buffer miscompare");
+ page += F("File upload buffer miscompare");
} else if (_uploaderror == 6) {
- page += F("
Upload failed. Enable logging option 3 for more information");
+ page += F("Upload failed. Enable logging option 3 for more information");
} else if (_uploaderror == 7) {
- page += F("
Upload aborted");
+ page += F("Upload aborted");
} else {
- page += F("
Upload error code ");
+ page += F("Upload error code ");
page += String(_uploaderror);
}
if (Update.hasError()) {
@@ -1205,52 +1227,86 @@ void handleInfo()
// page += F("
");
page += FPSTR(HTTP_BTN_MAIN);
@@ -1286,8 +1342,8 @@ void handleUPnPevent()
addLog_P(LOG_LEVEL_DEBUG, PSTR("HTTP: Handle WeMo basic event"));
String request = webServer->arg(0);
- if(request.indexOf("State>1 0) do_cmnd_power(1, 1);
- if(request.indexOf("State>0 0) do_cmnd_power(1, 0);
+ if (request.indexOf("State>1 0) do_cmnd_power(1, 1);
+ if (request.indexOf("State>0 0) do_cmnd_power(1, 0);
webServer->send(200, "text/plain", "");
}
@@ -1304,7 +1360,6 @@ void handleUPnPsetupWemo()
addLog_P(LOG_LEVEL_DEBUG, PSTR("HTTP: Handle WeMo setup"));
String setup_xml = FPSTR(WEMO_SETUP_XML);
-// setup_xml.replace("{x1}", String(MQTTClient));
setup_xml.replace("{x1}", String(sysCfg.friendlyname[0]));
setup_xml.replace("{x2}", wemo_UUID());
setup_xml.replace("{x3}", wemo_serial());
@@ -1339,6 +1394,76 @@ void hue_todo(String *path)
addLog(LOG_LEVEL_DEBUG_MORE, log);
}
+void hue_config_response(String *response)
+{
+ char buffer[21];
+
+ *response += FPSTR(HUE_CONFIG_RESPONSE_JSON);
+ response->replace("{mac}", WiFi.macAddress());
+ response->replace("{ip}", WiFi.localIP().toString());
+ response->replace("{mask}", WiFi.subnetMask().toString());
+ response->replace("{gw}", WiFi.gatewayIP().toString());
+ snprintf_P(buffer, sizeof(buffer), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
+ rtcTime.Year, rtcTime.Month, rtcTime.Day, rtcTime.Hour, rtcTime.Minute, rtcTime.Second);
+ response->replace("{dt}", String(buffer));
+}
+
+void hue_global_cfg(String *path)
+{
+ String response;
+
+ path->remove(0,1); // cut leading / to get
+ response = "{\"lights\":{\"";
+ for (uint8_t i = 1; i <= Maxdevice; i++)
+ {
+ response += i;
+ response += "\":";
+ response += FPSTR(HUE_LIGHT_STATUS_JSON);
+ if (i < Maxdevice) response += ",\"";
+ response.replace("{state}", (power & (0x01 << (i-1))) ? "true" : "false");
+ response.replace("{j1}", sysCfg.friendlyname[i-1]);
+ response.replace("{j2}", hue_deviceId(i));
+ if (pin[GPIO_WS2812] < 99) {
+#ifdef USE_WS2812
+ ws2812_replaceHSB(&response);
+#endif // USE_WS2812
+ } else
+ {
+ response.replace("{h}", "0");
+ response.replace("{s}", "0");
+ response.replace("{b}", "0");
+ }
+ }
+ response += F("},\"groups\":{},\"schedules\":{},\"config\":");
+
+ hue_config_response(&response);
+ response.replace("{id}", *path);
+ response += "}";
+ webServer->send(200, "application/json", response);
+}
+
+void hue_auth(String *path)
+{
+ String response;
+ char uid[7];
+
+ snprintf_P(uid, sizeof(uid), PSTR("%03x"), ESP.getChipId());
+ response="[{\"success\":{\"username\":\"";
+ response+=String(uid);
+ response+="\"}}]";
+ webServer->send(200, "application/json", response);
+}
+
+void hue_config(String *path)
+{
+ String response = "";
+
+ path->remove(0,1); // cut leading / to get
+ hue_config_response(&response);
+ response.replace("{id}", *path);
+ webServer->send(200, "application/json", response);
+}
+
void hue_lights(String *path)
{
String response;
@@ -1347,7 +1472,7 @@ void hue_lights(String *path)
uint8_t bri = 0;
char id[4];
- path->remove(0,path->indexOf("/lights")); // Remove until /lights
+ path->remove(0,path->indexOf("/lights")); // Remove until /lights
if (path->endsWith("/lights")) // Got /lights
{
response = "{\"";
@@ -1388,7 +1513,8 @@ void hue_lights(String *path)
if (webServer->args() == 1)
{
String json = webServer->arg(0);
-// Serial.print("HUE API: POST "); Serial.println(json.c_str());
+ json.replace(" ",""); // remove blanks
+
if (json.indexOf("\"on\":") >= 0) // Got "on" command
{
if (json.indexOf("false") >= 0) // false -> turn device off
@@ -1408,7 +1534,7 @@ void hue_lights(String *path)
}
#ifdef USE_WS2812
if ((pin[GPIO_WS2812] < 99) && ((pos=json.indexOf("\"bri\":")) >= 0)) {
- bri=atoi(json.substring(pos+6).c_str());
+ bri = atoi(json.substring(pos+6).c_str());
ws2812_changeBrightness(bri);
response += ",";
response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
@@ -1456,22 +1582,34 @@ void handle_hue_api(String *path)
*/
char log[LOGSZ];
+ uint8_t args = 0;
path->remove(0, 4); // remove /api
+ snprintf_P(log, sizeof(log), PSTR("HTTP: Handle Hue API (%s)"), path->c_str());
+ addLog(LOG_LEVEL_DEBUG_MORE, log);
+ for (args = 0; args < webServer->args(); args++) {
+ String json = webServer->arg(args);
+ snprintf_P(log, sizeof(log), PSTR("HTTP: Hue POST args (%s)"), json.c_str());
+ addLog(LOG_LEVEL_DEBUG_MORE, log);
+ }
+
if (path->endsWith("/invalid/")) {} // Just ignore
- else if (path->endsWith("/config")) hue_todo(path);
- else if(path->indexOf("/lights") >= 0) hue_lights(path);
- else if(path->endsWith("/groups")) hue_todo(path);
- else if(path->endsWith("/schedules")) hue_todo(path);
- else if(path->endsWith("/sensors")) hue_todo(path);
- else if(path->endsWith("/scenes")) hue_todo(path);
- else if(path->endsWith("/rules")) hue_todo(path);
- else
+ else if (path->endsWith("/")) hue_auth(path); // New HUE App setup
+ else if (path->endsWith("/config")) hue_config(path);
+ else if (path->indexOf("/lights") >= 0) hue_lights(path);
+ else if (path->endsWith("/groups")) hue_todo(path);
+ else if (path->endsWith("/schedules")) hue_todo(path);
+ else if (path->endsWith("/sensors")) hue_todo(path);
+ else if (path->endsWith("/scenes")) hue_todo(path);
+ else if (path->endsWith("/rules")) hue_todo(path);
+ else hue_global_cfg(path);
+/*
{
snprintf_P(log, sizeof(log), PSTR("HTTP: Handle Hue API (%s)"),path->c_str());
addLog(LOG_LEVEL_DEBUG_MORE, log);
webServer->send(406, "application/json", "{}");
}
+*/
}
#endif // USE_EMULATION
diff --git a/sonoff/xdrv_domoticz.ino b/sonoff/xdrv_domoticz.ino
index 259313798c02..ce1743da071a 100644
--- a/sonoff/xdrv_domoticz.ino
+++ b/sonoff/xdrv_domoticz.ino
@@ -239,7 +239,7 @@ boolean domoticz_command(char *type, uint16_t index, char *dataBuf, uint16_t dat
void domoticz_commands(char *svalue, uint16_t ssvalue)
{
- snprintf_P(svalue, ssvalue, PSTR("{\"Commands\":\"DomoticzInTopic, DomoticzOutTopic, DomoticzIdx, DomoticzKeyIdx, DomoticzSwitchIdx, DomoticzSensorIdx, DomoticzUpdateTimer\"}"));
+ snprintf_P(svalue, ssvalue, PSTR("{\"Commands4\":\"DomoticzInTopic, DomoticzOutTopic, DomoticzIdx, DomoticzKeyIdx, DomoticzSwitchIdx, DomoticzSensorIdx, DomoticzUpdateTimer\"}"));
}
boolean domoticz_button(byte key, byte device, byte state, byte svalflg)
diff --git a/sonoff/xdrv_wemohue.ino b/sonoff/xdrv_wemohue.ino
index 38d379c488d1..2a4472133fd5 100644
--- a/sonoff/xdrv_wemohue.ino
+++ b/sonoff/xdrv_wemohue.ino
@@ -52,14 +52,14 @@ const char WEMO_MSEARCH[] PROGMEM =
String wemo_serial()
{
- char serial[15];
- snprintf_P(serial, sizeof(serial), PSTR("201612K%07d"), ESP.getChipId());
+ char serial[16];
+ snprintf_P(serial, sizeof(serial), PSTR("201612K%08X"), ESP.getChipId());
return String(serial);
}
String wemo_UUID()
{
- char uuid[26];
+ char uuid[27];
snprintf_P(uuid, sizeof(uuid), PSTR("Socket-1_0-%s"), wemo_serial().c_str());
return String(uuid);
}
@@ -138,7 +138,6 @@ void hue_respondToMSearch()
response.replace("{r3}", hue_UUID());
portUDP.write(response.c_str());
portUDP.endPacket();
- snprintf_P(message, sizeof(message), PSTR("Response1 sent"));
// addLog(LOG_LEVEL_DEBUG_MORE, response.c_str());
response = FPSTR(HUE_RESPONSE);
@@ -150,7 +149,6 @@ void hue_respondToMSearch()
response.replace("{r3}", hue_UUID());
portUDP.write(response.c_str());
portUDP.endPacket();
- snprintf_P(message, sizeof(message), PSTR("Response2 sent"));
// addLog(LOG_LEVEL_DEBUG_MORE, response.c_str());
response = FPSTR(HUE_RESPONSE);
@@ -161,7 +159,8 @@ void hue_respondToMSearch()
response.replace("{r3}", hue_UUID());
portUDP.write(response.c_str());
portUDP.endPacket();
- snprintf_P(message, sizeof(message), PSTR("Response3 sent"));
+
+ snprintf_P(message, sizeof(message), PSTR("3 response packets sent"));
// addLog(LOG_LEVEL_DEBUG_MORE, response.c_str());
} else {
diff --git a/sonoff/xdrv_ws2812.ino b/sonoff/xdrv_ws2812.ino
index d56cfb7d29c4..da64bde0db41 100644
--- a/sonoff/xdrv_ws2812.ino
+++ b/sonoff/xdrv_ws2812.ino
@@ -31,9 +31,17 @@ POSSIBILITY OF SUCH DAMAGE.
#include
#ifdef USE_WS2812_DMA
+#if (USE_WS2812_CTYPE == 1)
NeoPixelBus *strip = NULL;
-#else
+#else // USE_WS2812_CTYPE
+ NeoPixelBus *strip = NULL;
+#endif // USE_WS2812_CTYPE
+#else // USE_WS2812_DMA
+#if (USE_WS2812_CTYPE == 1)
NeoPixelBus *strip = NULL;
+#else // USE_WS2812_CTYPE
+ NeoPixelBus *strip = NULL;
+#endif // USE_WS2812_CTYPE
#endif // USE_WS2812_DMA
#define COLOR_SATURATION 254.0f
@@ -457,9 +465,17 @@ void ws2812_pixels()
void ws2812_init()
{
#ifdef USE_WS2812_DMA
+#if (USE_WS2812_CTYPE == 1)
strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use.
-#else
+#else // USE_WS2812_CTYPE
+ strip = new NeoPixelBus(WS2812_MAX_LEDS); // For Esp8266, the Pin is omitted and it uses GPIO3 due to DMA hardware use.
+#endif // USE_WS2812_CTYPE
+#else // USE_WS2812_DMA
+#if (USE_WS2812_CTYPE == 1)
strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
+#else // USE_WS2812_CTYPE
+ strip = new NeoPixelBus(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
+#endif // USE_WS2812_CTYPE
#endif // USE_WS2812_DMA
strip->Begin();
ws2812_pixels();
diff --git a/sonoff/xsns_bh1750.ino b/sonoff/xsns_bh1750.ino
index 405e4a1f17cb..603fd98050ea 100644
--- a/sonoff/xsns_bh1750.ino
+++ b/sonoff/xsns_bh1750.ino
@@ -82,7 +82,7 @@ boolean bh1750_detect()
* Presentation
\*********************************************************************************************/
-void bh1750_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson, uint8_t domidx)
+void bh1750_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
{
if (!bh1750type) return;
diff --git a/sonoff/xsns_bmp.ino b/sonoff/xsns_bmp.ino
index 91f00eb55bcb..6475895b6d09 100644
--- a/sonoff/xsns_bmp.ino
+++ b/sonoff/xsns_bmp.ino
@@ -424,7 +424,7 @@ boolean bmp_detect()
* Presentation
\*********************************************************************************************/
-void bmp_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson, uint8_t domidx)
+void bmp_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
{
if (!bmptype) return;
diff --git a/sonoff/xsns_dht.ino b/sonoff/xsns_dht.ino
index 4809c83acee5..8168195677c6 100644
--- a/sonoff/xsns_dht.ino
+++ b/sonoff/xsns_dht.ino
@@ -178,7 +178,7 @@ void dht_init()
* Presentation
\*********************************************************************************************/
-void dht_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson, uint8_t domidx)
+void dht_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
{
char stemp1[10], stemp2[10];
float t, h;
diff --git a/sonoff/xsns_dht2.ino b/sonoff/xsns_dht2.ino
index 9239182a8b17..5b885625ae95 100644
--- a/sonoff/xsns_dht2.ino
+++ b/sonoff/xsns_dht2.ino
@@ -57,7 +57,7 @@ void dht_init()
* Presentation
\*********************************************************************************************/
-void dht_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson, uint8_t domidx)
+void dht_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
{
char stemp1[10], stemp2[10];
float t, h;
diff --git a/sonoff/xsns_ds18b20.ino b/sonoff/xsns_ds18b20.ino
index eec7d5cb20b5..b77d89f69616 100644
--- a/sonoff/xsns_ds18b20.ino
+++ b/sonoff/xsns_ds18b20.ino
@@ -172,7 +172,7 @@ boolean dsb_readTemp(bool S, float &t)
* Presentation
\*********************************************************************************************/
-void dsb_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson, uint8_t domidx)
+void dsb_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
{
char stemp1[10];
float t;
diff --git a/sonoff/xsns_ds18x20.ino b/sonoff/xsns_ds18x20.ino
index 1205d76eada6..334c3c9447ce 100644
--- a/sonoff/xsns_ds18x20.ino
+++ b/sonoff/xsns_ds18x20.ino
@@ -155,7 +155,7 @@ boolean ds18x20_read(uint8_t sensor, bool S, float &t)
* Presentation
\*********************************************************************************************/
-void ds18x20_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson, uint8_t domidx)
+void ds18x20_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
{
char stemp1[10], stemp2[10];
float t;
diff --git a/sonoff/xsns_hlw8012.ino b/sonoff/xsns_hlw8012.ino
index a15b62dedcf3..097969e7ab77 100644
--- a/sonoff/xsns_hlw8012.ino
+++ b/sonoff/xsns_hlw8012.ino
@@ -279,7 +279,7 @@ void hlw_setPowerSteadyCounter(byte value)
void hlw_margin_chk()
{
- char log[LOGSZ], stopic[TOPSZ], svalue[MESSZ];
+ char log[LOGSZ], svalue[MESSZ];
float ped, pi, pc;
uint16_t uped, piv, pe, pw, pu;
byte flag, jsonflg;
@@ -296,7 +296,6 @@ void hlw_margin_chk()
// snprintf_P(log, sizeof(log), PSTR("HLW: W %d, U %d, I %d"), pw, pu, piv);
// addLog(LOG_LEVEL_DEBUG, log);
- snprintf_P(stopic, sizeof(stopic), PSTR("%s/%s/TELEMETRY"), PUB_PREFIX2, sysCfg.mqtt_topic);
snprintf_P(svalue, sizeof(svalue), PSTR("{"));
jsonflg = 0;
if (hlw_margin(0, sysCfg.hlw_pmin, pw, flag, hlw_pminflg)) {
@@ -325,12 +324,11 @@ void hlw_margin_chk()
}
if (jsonflg) {
snprintf_P(svalue, sizeof(svalue), PSTR("%s}"), svalue);
- mqtt_publish(stopic, svalue);
+ mqtt_publish_topic_P(1, PSTR("MARGINS"), svalue);
}
}
#if FEATURE_POWER_LIMIT
- snprintf_P(stopic, sizeof(stopic), PSTR("%s/%s/RESULT"), PUB_PREFIX, sysCfg.mqtt_topic);
// Max Power
if (sysCfg.hlw_mpl) {
if (pw > sysCfg.hlw_mpl) {
@@ -340,7 +338,7 @@ void hlw_margin_chk()
hlw_mplh_counter--;
if (!hlw_mplh_counter) {
snprintf_P(svalue, sizeof(svalue), PSTR("{\"MaxPowerReached\":\"%d%s\"}"), pw, (sysCfg.value_units) ? " W" : "");
- mqtt_publish(stopic, svalue);
+ mqtt_publish_topic_P(0, PSTR("WARNING"), svalue);
do_cmnd_power(1, 0);
if (!hlw_mplr_counter) hlw_mplr_counter = MAX_POWER_RETRY +1;
hlw_mplw_counter = sysCfg.hlw_mplw;
@@ -359,12 +357,12 @@ void hlw_margin_chk()
if (hlw_mplr_counter) {
hlw_mplr_counter--;
if (hlw_mplr_counter) {
- snprintf_P(svalue, sizeof(stopic), PSTR("{\"PowerMonitor\":\"%s\"}"), MQTT_STATUS_ON);
- mqtt_publish(stopic, svalue);
+ snprintf_P(svalue, sizeof(svalue), PSTR("{\"PowerMonitor\":\"%s\"}"), MQTT_STATUS_ON);
+ mqtt_publish_topic_P(0, PSTR("RESULT"), svalue);
do_cmnd_power(1, 1);
} else {
- snprintf_P(svalue, sizeof(stopic), PSTR("{\"MaxPowerReachedRetry\":\"%s\"}"), MQTT_STATUS_OFF);
- mqtt_publish(stopic, svalue);
+ snprintf_P(svalue, sizeof(svalue), PSTR("{\"MaxPowerReachedRetry\":\"%s\"}"), MQTT_STATUS_OFF);
+ mqtt_publish_topic_P(0, PSTR("WARNING"), svalue);
}
}
}
@@ -376,15 +374,15 @@ void hlw_margin_chk()
uped = (uint16_t)(ped * 1000);
if (!hlw_mkwh_state && (rtcTime.Hour == sysCfg.hlw_mkwhs)) {
hlw_mkwh_state = 1;
- snprintf_P(svalue, sizeof(stopic), PSTR("{\"EnergyMonitor\":\"%s\"}"), MQTT_STATUS_ON);
- mqtt_publish(stopic, svalue);
+ snprintf_P(svalue, sizeof(svalue), PSTR("{\"EnergyMonitor\":\"%s\"}"), MQTT_STATUS_ON);
+ mqtt_publish_topic_P(0, PSTR("RESULT"), svalue);
do_cmnd_power(1, 1);
}
else if ((hlw_mkwh_state == 1) && (uped >= sysCfg.hlw_mkwh)) {
hlw_mkwh_state = 2;
dtostrf(ped, 1, 3, svalue);
snprintf_P(svalue, sizeof(svalue), PSTR("{\"MaxEnergyReached\":\"%s%s\"}"), svalue, (sysCfg.value_units) ? " kWh" : "");
- mqtt_publish(stopic, svalue);
+ mqtt_publish_topic_P(0, PSTR("WARNING"), svalue);
do_cmnd_power(1, 0);
}
}
@@ -512,7 +510,7 @@ boolean hlw_command(char *type, uint16_t index, char *dataBuf, uint16_t data_len
void hlw_commands(char *svalue, uint16_t ssvalue)
{
- snprintf_P(svalue, ssvalue, PSTR("{\"Commands\":\"PowerLow, PowerHigh, VoltageLow, VoltageHigh, CurrentLow, CurrentHigh, HlwPcal, HlwUcal, HlwIcal%s\"}"),
+ snprintf_P(svalue, ssvalue, PSTR("{\"Commands5\":\"PowerLow, PowerHigh, VoltageLow, VoltageHigh, CurrentLow, CurrentHigh, HlwPcal, HlwUcal, HlwIcal%s\"}"),
(FEATURE_POWER_LIMIT)?", SafePower, SafePowerHold, SafePowerWindow, MaxPower, MaxPowerHold, MaxPowerWindow, MaxEnergy, MaxEnergyStart":"");
}
@@ -520,29 +518,50 @@ void hlw_commands(char *svalue, uint16_t ssvalue)
* Presentation
\*********************************************************************************************/
-void hlw_mqttPresent(uint8_t domidx)
+void hlw_mqttStat(byte option, char* svalue, uint16_t ssvalue)
{
- char stopic[TOPSZ], svalue[MESSZ], stime[21], stemp0[10], stemp1[10], stemp2[10], stemp3[10];
+ char stemp0[10], stemp1[10], stemp2[10], stemp3[10], speriod[20];
float ped, pi, pc;
uint16_t pe, pw, pu;
- snprintf_P(stime, sizeof(stime), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
- rtcTime.Year, rtcTime.Month, rtcTime.Day, rtcTime.Hour, rtcTime.Minute, rtcTime.Second);
- hlw_readEnergy(1, ped, pe, pw, pu, pi, pc);
+ hlw_readEnergy(option, ped, pe, pw, pu, pi, pc);
dtostrf((float)sysCfg.hlw_kWhyesterday / 100000000, 1, 3, stemp0);
dtostrf(ped, 1, 3, stemp1);
dtostrf(pc, 1, 2, stemp2);
dtostrf(pi, 1, 3, stemp3);
- snprintf_P(stopic, sizeof(stopic), PSTR("%s/%s/TELEMETRY"), PUB_PREFIX2, sysCfg.mqtt_topic);
- snprintf_P(svalue, sizeof(svalue), PSTR("{\"Time\":\"%s\", \"Energy\":{\"Yesterday\":\"%s\", \"Today\":\"%s\", \"Period\":%d, \"Power\":%d, \"Factor\":\"%s\", \"Voltage\":%d, \"Current\":\"%s\"}}"),
- stime, stemp0, stemp1, pe, pw, stemp2, pu, stemp3);
- mqtt_publish(stopic, svalue);
+ snprintf_P(speriod, sizeof(speriod), PSTR(", \"Period\":%d"), pe);
+ snprintf_P(svalue, ssvalue, PSTR("%s\"Yesterday\":\"%s\", \"Today\":\"%s\"%s, \"Power\":%d, \"Factor\":\"%s\", \"Voltage\":%d, \"Current\":\"%s\"}"),
+ svalue, stemp0, stemp1, (option) ? speriod : "", pw, stemp2, pu, stemp3);
#ifdef USE_DOMOTICZ
dtostrf(ped * 1000, 1, 1, stemp1);
domoticz_sensor4(pw, stemp1);
#endif // USE_DOMOTICZ
}
+void hlw_mqttPresent()
+{
+// char stopic[TOPSZ], svalue[MESSZ], stime[21];
+ char svalue[MESSZ], stime[21];
+
+ snprintf_P(stime, sizeof(stime), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
+ rtcTime.Year, rtcTime.Month, rtcTime.Day, rtcTime.Hour, rtcTime.Minute, rtcTime.Second);
+ snprintf_P(svalue, sizeof(svalue), PSTR("{\"Time\":\"%s\", "), stime);
+ hlw_mqttStat(1, svalue, sizeof(svalue));
+
+// snprintf_P(stopic, sizeof(stopic), PSTR("%s/%s/ENERGY"), PUB_PREFIX2, sysCfg.mqtt_topic);
+// mqtt_publish(stopic, svalue);
+
+ mqtt_publish_topic_P(1, PSTR("ENERGY"), svalue);
+
+}
+
+void hlw_mqttStatus(char* svalue, uint16_t ssvalue)
+{
+ snprintf_P(svalue, ssvalue, PSTR("{\"StatusPWR\":{"));
+ hlw_mqttStat(0, svalue, ssvalue);
+ snprintf_P(svalue, ssvalue, PSTR("%s}"), svalue);
+}
+
#ifdef USE_WEBSERVER
String hlw_webPresent()
{
diff --git a/sonoff/xsns_htu21.ino b/sonoff/xsns_htu21.ino
index ddb9cc6bccc2..36e26f8beec8 100644
--- a/sonoff/xsns_htu21.ino
+++ b/sonoff/xsns_htu21.ino
@@ -229,7 +229,7 @@ uint8_t htu_detect()
* Presentation
\*********************************************************************************************/
-void htu_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson, uint8_t domidx)
+void htu_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
{
if (!htutype) return;