From 52ddcc4d6d057928c5e2672e409527fdaf46f026 Mon Sep 17 00:00:00 2001 From: alexeypetrov Date: Thu, 27 Jun 2019 15:20:47 +0300 Subject: [PATCH] fix WiFiManager in autoConnect and timeClient update in timer timeout --- firmware/GyverLamp_v1.2/time.ino | 4 ++-- libraries/WiFiManager/WiFiManager.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/GyverLamp_v1.2/time.ino b/firmware/GyverLamp_v1.2/time.ino index cd86bb1b..f6961ea3 100644 --- a/firmware/GyverLamp_v1.2/time.ino +++ b/firmware/GyverLamp_v1.2/time.ino @@ -1,6 +1,6 @@ -void timeTick() { - timeClient.update(); +void timeTick() { if (timeTimer.isReady()) { + timeClient.update(); byte thisDay = timeClient.getDay(); if (thisDay == 0) thisDay = 7; // воскресенье это 0 thisDay--; diff --git a/libraries/WiFiManager/WiFiManager.cpp b/libraries/WiFiManager/WiFiManager.cpp index 2e7884d3..921c14e9 100644 --- a/libraries/WiFiManager/WiFiManager.cpp +++ b/libraries/WiFiManager/WiFiManager.cpp @@ -173,7 +173,7 @@ boolean WiFiManager::autoConnect(char const *apName, char const *apPassword) { // attempt to connect; should it fail, fall back to AP WiFi.mode(WIFI_STA); - if (connectWifi("", "") == WL_CONNECTED) { + if (connectWifi(String(apName),String(apPassword)) == WL_CONNECTED) { DEBUG_WM(F("IP Address:")); DEBUG_WM(WiFi.localIP()); //connected