5.87

.theia/launch.json

@@ -0,0 +1,6 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  "version": "0.2.0",
+  "configurations": [
+    []]]]52============================================    хъъъъ52=====================================

sunny05.ino

@@ -1,9 +1,9 @@
-#define DEBUG
+//#define DEBUG
 
 #include "FastLED.h"
 #include "GyverButton.h"
 
-#define VER "5.81"
+#define VER "5.87"
 
 #include "ESP8266WiFi.h"
 #include "PubSubClient.h"
@@ -148,7 +148,7 @@ void setup()
     FastLED.setBrightness(0);
     Serial.begin(115200);
     randomSeed(analogRead(0));
-    butt1.setDebounce(20);      // настройка антидребезга (по умолчанию 80 мс)
+    butt1.setDebounce(20);
     for(int i = 0; i < 5; i++)
         FastLED.show();
 
@@ -219,9 +219,9 @@ void setup()
 
     NTP.onError([]() 
     {
-        Serial.println(NTP.readError());
-        Serial.print("online: ");
-        Serial.println(NTP.online());
+        // Serial.println(NTP.readError());
+        // Serial.print("online: ");
+        // Serial.println(NTP.online());
         // if (NTP.online() == 0)
         // {
         //     NTP.end();
@@ -266,7 +266,15 @@ void setup()
     valTime_off.hour = EEPROM.read(2);
     valTime_off.minute = EEPROM.read(3);
     valTime_off.second = 0;
-    int ii = isworkday();
+    int ii = 0;
+    for (int i = 0; i < 5; i++)
+    {
+        ii = isworkday();
+        Serial.print(ii);
+        Serial.print(" ");
+        delay(500);
+    }
+    Serial.println();
     if(ii != -1)
     {
         iswd = ii;
@@ -345,17 +353,19 @@ void loop()
         valTime.minute = dt.minute;
         
         #ifdef DEBUG
-        // Serial.printf("%02d:%02d:%02d %02d:%02d:%02d %d\r\n", valTime_on.hour,valTime_on.minute,valTime_on.second,dt.hour,dt.minute,dt.second,_allow);
+        Serial.printf("%02d:%02d:%02d %02d:%02d:%02d %d\r\n", valTime_on.hour,valTime_on.minute,valTime_on.second,dt.hour,dt.minute,dt.second,_allow);
         #endif
         
-        if (dt.hour == valTime_on.hour && dt.minute == valTime_on.minute && dt.second == valTime_on.second && _allow)
+        // if (dt.hour == valTime_on.hour && dt.minute == valTime_on.minute && dt.second == valTime_on.second && _allow)
+        if (dt.hour == valTime_on.hour && dt.minute == valTime_on.minute && _allow && enable == false)
         {
             enable = true;
             #ifdef DEBUG
             Serial.printf("time ON test = %d ena = %d mode = %d %02d:%02d %02d:%02d %d %d %d %d\r\n",test, enable, mode, valTime_on.hour,valTime_on.minute,valTime_off.hour,valTime_off.minute,rd,vd,bri,_allow);
             #endif
         }
-        if (dt.hour == valTime_off.hour && dt.minute == valTime_off.minute && dt.second == valTime_off.second)
+        // if (dt.hour == valTime_off.hour && dt.minute == valTime_off.minute && dt.second == valTime_off.second)
+        if (dt.hour == valTime_off.hour && dt.minute == valTime_off.minute && enable == true)
         {
             enable = false;
             #ifdef DEBUG
@@ -809,7 +819,7 @@ void GP_MY_BLOCK()
 
 void build() 
 {
-    GP.BUILD_BEGIN();
+    GP.BUILD_BEGIN(F("<link rel='icon' href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAGmSURBVHgBjVNtTsJAEJ3Z1sREIXgCywnkBtgo+ldPAJxAPYFwAuAEwgnEX0bBgDfgBtYTWEETo2zHt1ts+CiGlyxMpzNvZt5siVIgD5kzGWx7yXMve0lroNKcfDrpkt5qSG/3cEZRkEEu90e+EJtUecxUiDlH7neX/a8ACR7paICINonkSThAOaGI3rk0bq4QxCQ7BVLOLbwhAu+I5QXuNk6Ak7Mnoio5vA/SgI8nHU4bwXaj+BqWR+kYItlPOpD7mWCu6yExtiP8s1zMKi+ji5GeETRyoXANgQc20GggUoiHE1qLiPZsaZEwfQSj+HQKPVQjIVwGc42PxvV1BB796C5UN52FtDyGcN2IiC49Xk3GJjQ2EQtoVthBNayTR7A9aNMhJWVynDz7YbhwkaSfKZNWA1gBgn0oXbW6GGhp4XeE2QNocEXTyN7OhECeslgbVZB4blbEpY/hrF2jQcAnkzaS0Q151iYdGq3cOBl71/KKF/6qWFIEScvaysEV10XrLn02aRNgrLeFD6ufuaFNYa72coLd0BzUvwxKQXWnNe+C8sH88y/T07ahJJUsXgAAAABJRU5ErkJggg==' type='image/x-icon' />\n"));
     GP.THEME(GP_LIGHT);
     GP.UPDATE("sw,led,bri,eff,rst,rd,vd,valTime_off,valTime_on,valTime");
     GP.TITLE("Солнышко");
@@ -894,11 +904,13 @@ void action()
         {
             Serial.print("rd: ");
             Serial.println(rd);
+            _allow = allow();
         }
         if (ui.clickBool("vd", vd)) 
         {
             Serial.print("vd: ");
             Serial.println(vd);
+            _allow = allow();
         }
         if (ui.clickInt("bri", bri)) 
         {