upd

AlexGyver · Jun 13, 2019 · f440172 · f440172
1 parent b93c497
commit f440172
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/firmware/GyverLamp_v1.0/button.ino b/firmware/GyverLamp_v1.0/button.ino
@@ -6,6 +6,9 @@ void buttonTick() {
     if (dawnFlag) {
       manualOff = true;
       dawnFlag = false;
+      loadingFlag = true;
+      FastLED.setBrightness(modes[currentMode].brightness);
+      changePower();
     } else {
       if (ONflag) {
         ONflag = false;

diff --git a/firmware/GyverLamp_v1.0/time.ino b/firmware/GyverLamp_v1.0/time.ino
@@ -10,7 +10,7 @@ void timeTick() {
     if (alarm[thisDay].state &&                                       // день будильника
         thisTime >= (alarm[thisDay].time - dawnOffsets[dawnMode]) &&  // позже начала
         thisTime < (alarm[thisDay].time + DAWN_TIMEOUT) ) {                      // раньше конца + минута
-      if (!manualOff && ONflag) {
+      if (!manualOff) {
         // величина рассвета 0-255
         int dawnPosition = 255 * ((float)(thisTime - (alarm[thisDay].time - dawnOffsets[dawnMode])) / dawnOffsets[dawnMode]);
         dawnPosition = constrain(dawnPosition, 0, 255);
@@ -23,9 +23,11 @@ void timeTick() {
         dawnFlag = true;
       }
     } else {
-      dawnFlag = false;
-      manualOff = false;
-      FastLED.setBrightness(modes[currentMode].brightness);
+      if (dawnFlag) {
+        dawnFlag = false;
+        manualOff = false;
+        FastLED.setBrightness(modes[currentMode].brightness);
+      }
     }
 
   }