|
|
|
|
@ -3,7 +3,7 @@
@@ -3,7 +3,7 @@
|
|
|
|
|
#include "FastLED.h" |
|
|
|
|
#include "GyverButton.h" |
|
|
|
|
|
|
|
|
|
#define VER "5.81" |
|
|
|
|
#define VER "5.78" |
|
|
|
|
|
|
|
|
|
#include "ESP8266WiFi.h" |
|
|
|
|
#include "PubSubClient.h" |
|
|
|
|
@ -222,13 +222,10 @@ void setup()
@@ -222,13 +222,10 @@ void setup()
|
|
|
|
|
Serial.println(NTP.readError()); |
|
|
|
|
Serial.print("online: "); |
|
|
|
|
Serial.println(NTP.online()); |
|
|
|
|
// if (NTP.online() == 0)
|
|
|
|
|
// {
|
|
|
|
|
// NTP.end();
|
|
|
|
|
// NTP.setHost("192.168.121.9");
|
|
|
|
|
// NTP.begin(3);
|
|
|
|
|
// NTP.updateNow();
|
|
|
|
|
// }
|
|
|
|
|
if (NTP.online() == 0) |
|
|
|
|
{ |
|
|
|
|
NTP.setHost("192.168.121.9"); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
NTP.onSecond([]()
|
|
|
|
|
{ |
|
|
|
|
@ -849,7 +846,6 @@ void action()
@@ -849,7 +846,6 @@ void action()
|
|
|
|
|
ui.updateBool("sw", enable); |
|
|
|
|
ui.updateString("eff", valStr); |
|
|
|
|
ui.updateTime("valTime", valTime); |
|
|
|
|
ui.updateTime("valTime_off", valTime_off); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (ui.click())
|
|
|
|
|
@ -883,11 +879,10 @@ void action()
@@ -883,11 +879,10 @@ void action()
|
|
|
|
|
d_off.minute = valTime_off.minute; |
|
|
|
|
if(d_off < d_on) |
|
|
|
|
{ |
|
|
|
|
d_on.addMinutes(15); |
|
|
|
|
valTime_off.hour = d_on.hour; |
|
|
|
|
valTime_off.minute = d_on.minute; |
|
|
|
|
d_off.addMinutes(15); |
|
|
|
|
valTime_off.hour = d_off.hour; |
|
|
|
|
valTime_off.minute = d_off.minute; |
|
|
|
|
Serial.printf("on %02d:%02d off %02d:%02d\r\n",valTime_on.hour,valTime_on.minute,valTime_off.hour,valTime_off.minute); |
|
|
|
|
ui.updateTime("valTime_off", valTime_off); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (ui.clickBool("rd", rd))
|
|
|
|
|
|
