| "), + snprintf_P(line, sizeof(line), PSTR(" | "), 100 / Maxdevice, idx, (Maxdevice > 1) ? stemp : ""); page += line; } @@ -416,7 +431,14 @@ void handleRoot() void handleAjax2() { + char svalue[16]; + if (strlen(webServer->arg("o").c_str())) do_cmnd_power(atoi(webServer->arg("o").c_str()), 2); + if (strlen(webServer->arg("d").c_str())) { + snprintf_P(svalue, sizeof(svalue), PSTR("dimmer %s"), webServer->arg("d").c_str()); + do_cmnd(svalue); + } + String tpage = ""; if (hlw_flg) tpage += hlw_webPresent(); #ifdef USE_DS18B20 @@ -445,18 +467,20 @@ void handleAjax2() if (Maxdevice) { page += F(" |
{3 | ");
- page.replace("{1", String(100 / Maxdevice));
- page.replace("{2", String(70 - (Maxdevice * 8)));
- page.replace("{3", (power & (0x01 << (idx -1))) ? "ON" : "OFF");
-*/
snprintf_P(line, sizeof(line), PSTR("%s | "),
100 / Maxdevice, 70 - (Maxdevice * 8), (power & (0x01 << (idx -1))) ? "ON" : "OFF");
page += line;
}
page += F("
| Program version | "); page += Version; page += F(" |
|---|---|
| Build Date/Time | "); page += __DATE__; - page += F("/"); page += __TIME__ ; page += F(" |
| Build Date & Time | "); page += getBuildDateTime(); page += F(" |
| Core/SDK version | "); page += ESP.getCoreVersion(); page += F("/"); page += String(ESP.getSdkVersion()); page += F(" |
| Boot version | "); page += String(ESP.getBootVersion()); page += F(" |
| Uptime | "); page += String(uptime); page += F(" Hours |
| MQTT Host | "); page += sysCfg.mqtt_host; page += F(" |
| MQTT Port | "); page += String(sysCfg.mqtt_port); page += F(" |
| MQTT Client and Fallback Topic | "); page += MQTTClient; page += F(" |
| MQTT Client & Fallback Topic | "); page += MQTTClient; page += F(" |
| MQTT User | "); page += sysCfg.mqtt_user; page += F(" |
| MQTT Password | "); page += sysCfg.mqtt_pwd; page += F(" |
| MQTT Topic | "); page += sysCfg.mqtt_topic; page += F(" |
| mDNS Webserver Advertise | "); + page += F(" |
| mDNS Advertise | "); #ifdef WEBSERVER_ADVERTISE - page += F("Enabled"); + page += F("Webserver"); #else page += F("Disabled"); #endif // WEBSERVER_ADVERTISE @@ -1355,7 +1380,7 @@ void handleNotFound() /* Redirect to captive portal if we got a request for another domain. Return true in that case so the page handler do not try to handle the request again. */ boolean captivePortal() { - if (!isIp(webServer->hostHeader())) { + if ((_httpflag == HTTP_MANAGER) && !isIp(webServer->hostHeader())) { addLog_P(LOG_LEVEL_DEBUG, PSTR("HTTP: Request redirected to captive portal")); webServer->sendHeader("Location", String("http://") + webServer->client().localIP().toString(), true); diff --git a/sonoff/xdrv_snfled.ino b/sonoff/xdrv_snfled.ino index 7d740a0f5a73..e77bb373c37e 100644 --- a/sonoff/xdrv_snfled.ino +++ b/sonoff/xdrv_snfled.ino @@ -99,12 +99,11 @@ void sl_init(void) } void sl_blank(byte state) -/* - * Called by interrupt disabling routines like OTA or web upload - * state = 0: No blank - * 1: Blank led to solve flicker - */ { +// Called by interrupt disabling routines like OTA or web upload +// state = 0: No blank +// 1: Blank led to solve flicker + if (sysCfg.module == SONOFF_LED) { sl_blankv = state; sl_wakeupActive = 0; diff --git a/sonoff/xdrv_wemohue.ino b/sonoff/xdrv_wemohue.ino index 0c3a03731fe9..f9f31ab9901f 100644 --- a/sonoff/xdrv_wemohue.ino +++ b/sonoff/xdrv_wemohue.ino @@ -394,16 +394,12 @@ void hue_todo(String *path) 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}", buffer); + response->replace("{dt}", getDateTime()); } void hue_global_cfg(String *path) diff --git a/sonoff/xsns_ds18x20.ino b/sonoff/xsns_ds18x20.ino index 6088b33ceeab..ab264dc058a2 100644 --- a/sonoff/xsns_ds18x20.ino +++ b/sonoff/xsns_ds18x20.ino @@ -107,7 +107,7 @@ float ds18x20_convertCtoF(float c) boolean ds18x20_read(uint8_t sensor, bool S, float &t) { byte data[12]; - uint8_t sign = 1; + int8_t sign = 1; uint8_t i = 0; float temp9 = 0.0; uint8_t present = 0; @@ -122,7 +122,24 @@ boolean ds18x20_read(uint8_t sensor, bool S, float &t) if (OneWire::crc8(data, 8) == data[8]) { switch(ds18x20_addr[ds18x20_idx[sensor]][0]) { case 0x10: // DS18S20 - if (data[1] > 0x80) sign = -1; // App-Note fix possible sign error +/* +// App_note AN162.pdf page 9 + int temp_lsb, temp_msb; + temp_msb = data[1]; // Sign byte + lsbit + temp_lsb = data[0]; // Temp data plus lsb + if (temp_msb <= 0x80) temp_lsb = (temp_lsb/2); // Shift to get whole degree + temp_msb = temp_msb & 0x80; // Mask all but the sign bit + if (temp_msb >= 0x80) { // Negative temperature + temp_lsb = (~temp_lsb)+1; // Twos complement + temp_lsb = (temp_lsb/2); // Shift to get whole degree + temp_lsb = ((-1)*temp_lsb); // Add sign bit + } + t = (int)temp_lsb; // Temperature in whole degree +*/ + if (data[1] > 0x80) { + data[0] = (~data[0]) +1; + sign = -1; // App-Note fix possible sign error + } if (data[0] & 1) { temp9 = ((data[0] >> 1) + 0.5) * sign; } else { diff --git a/sonoff/xsns_hlw8012.ino b/sonoff/xsns_hlw8012.ino index 629e02a2796b..5deaada5f19d 100644 --- a/sonoff/xsns_hlw8012.ino +++ b/sonoff/xsns_hlw8012.ino @@ -546,8 +546,7 @@ void hlw_mqttPresent() // {"Time":"2017-03-04T13:37:24", "Yesterday":0.013, "Today":0.000, "Period":0, "Power":0, "Factor":0.00, "Voltage":0, "Current":0.000} char svalue[200]; // was MESSZ - snprintf_P(svalue, sizeof(svalue), PSTR("{\"Time\":\"%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\", "), getDateTime().c_str()); hlw_mqttStat(1, svalue, sizeof(svalue)); // snprintf_P(stopic, sizeof(stopic), PSTR("%s/%s/ENERGY"), PUB_PREFIX2, sysCfg.mqtt_topic); |