From b5b8123a5f5f6d65117cde664a763135612dfe15 Mon Sep 17 00:00:00 2001
From: gunner47 <gunner47@ukr.net>
Date: Tue, 16 Jul 2019 23:00:06 +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=D1=81=D0=B1=D1=80=D0=BE=D1=81=20WiFi=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=B5=20=D1=81=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B0=D1=82=D0=BE=D0=B9=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino b/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
index 3719a9c..57c1997 100644
--- a/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
+++ b/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
@@ -176,9 +176,26 @@ unsigned char matrixValue[8][16];
 
 void setup()
 {
+  Serial.begin(115200);
+  Serial.println();
+
   ESP.wdtDisable();
   //ESP.wdtEnable(WDTO_8S);
 
+  #ifdef ESP_USE_BUTTON
+  touch.setStepTimeout(100);
+  touch.setClickTimeout(500);
+  buttonTick();
+  if(touch.state())                                         // сброс сохранённых SSID и пароля при старте с зажатой кнопкой
+  {
+    wifiManager.resetSettings();
+
+    #ifdef GENERAL_DEBUG
+    Serial.println("Настройки WiFiManager сброшены");
+    #endif
+  }
+  #endif
+
   // ЛЕНТА
   FastLED.addLeds<WS2812B, LED_PIN, COLOR_ORDER>(leds, NUM_LEDS)/*.setCorrection( TypicalLEDStrip )*/;
   FastLED.setBrightness(BRIGHTNESS);
@@ -186,14 +203,6 @@ void setup()
   FastLED.clear();
   FastLED.show();
 
-  #ifdef ESP_USE_BUTTON
-  touch.setStepTimeout(100);
-  touch.setClickTimeout(500);
-  #endif
-
-  Serial.begin(115200);
-  Serial.println();
-
   // WI-FI
   wifiManager.setDebugOutput(WIFIMAN_DEBUG);                // вывод отладочных сообщений
   if (ESP_MODE == 0)                                        // режим WiFi точки доступа
@@ -224,8 +233,6 @@ void setup()
       Serial.println("WiFi сеть не определена, запуск WiFi точки доступа для настройки параметров подключения к WiFi сети...");
     }
     
-    //wifiManager.resetSettings();
-
     if (STA_STATIC_IP)
     {
       wifiManager.setSTAStaticIPConfig(