From dcdeb2a24a3e5f1df6c259d9070bb4aa2fee2965 Mon Sep 17 00:00:00 2001
From: gunner47 <gunner47@ukr.net>
Date: Wed, 28 Aug 2019 12:25:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D1=80=D0=B5=D0=B6?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=B0=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20esp?=
 =?UTF-8?q?=20=D0=B8=D0=B7=20android=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F;=20=D0=98=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/GyverLamp_v1.4/FavoritesManager.h | 10 ++++++++++
 firmware/GyverLamp_v1.4/effectTicker.ino   |  2 +-
 firmware/GyverLamp_v1.4/parsing.ino        |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/firmware/GyverLamp_v1.4/FavoritesManager.h b/firmware/GyverLamp_v1.4/FavoritesManager.h
index 2775cdb..8ccb15d 100644
--- a/firmware/GyverLamp_v1.4/FavoritesManager.h
+++ b/firmware/GyverLamp_v1.4/FavoritesManager.h
@@ -46,6 +46,10 @@ class FavoritesManager
     static void ConfigureFavorites(const char* statusText)  // принимает statusText, парсит его и инициализирует свойства класса значениями из statusText'а
     {
       FavoritesRunning = getFavoritesRunning(statusText);
+      if (!FavoritesRunning)
+      {
+        nextModeAt = 0;
+      }
       Interval = getInterval(statusText);
       Dispersion = getDispersion(statusText);
       for (uint8_t i = 0; i < MODE_AMOUNT; i++)
@@ -121,6 +125,12 @@ class FavoritesManager
       EEPROM.commit();
     }
 
+    static void TurnFavoritesOff()
+    {
+      FavoritesRunning = false;
+      nextModeAt = 0;
+    }
+
   private:
     static uint32_t nextModeAt;                             // ближайшее время переключения на следующий избранный эффект (millis())
 
diff --git a/firmware/GyverLamp_v1.4/effectTicker.ino b/firmware/GyverLamp_v1.4/effectTicker.ino
index c943111..07d7d5b 100644
--- a/firmware/GyverLamp_v1.4/effectTicker.ino
+++ b/firmware/GyverLamp_v1.4/effectTicker.ino
@@ -69,5 +69,5 @@ void changePower()
   TimerManager::TimerHasFired = false;
   TimerManager::TimeToFire = 0ULL;
 
-  FavoritesManager::FavoritesRunning = false;
+  FavoritesManager::TurnFavoritesOff();
 }
diff --git a/firmware/GyverLamp_v1.4/parsing.ino b/firmware/GyverLamp_v1.4/parsing.ino
index 38c9ec0..d9a7272 100644
--- a/firmware/GyverLamp_v1.4/parsing.ino
+++ b/firmware/GyverLamp_v1.4/parsing.ino
@@ -169,6 +169,8 @@ void parseUDP()
       currentMode = 16;                                     // принудительное включение режима "Матрица" для индикации перехода в режим обновления по воздуху
       FastLED.clear();
       delay(1);
+      ONflag = true;
+      changePower();
       #endif
     }