From 4eeb944b599405c30a61029039f43360f41ff527 Mon Sep 17 00:00:00 2001 From: krycha88 Date: Sat, 14 Nov 2020 20:46:15 +0100 Subject: [PATCH 1/6] =?UTF-8?q?restart=20wifi=20je=C5=BCeli=20modu=C5=82?= =?UTF-8?q?=20nie=20mo=C5=BCe=20si=C4=99=20po=C5=82=C4=85czy=C4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/klew/arduino/commit/7f2ad3b67da24e05b6a0dda08898a89cd7338c45 --- SuplaGuiWiFi.h | 68 +++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/SuplaGuiWiFi.h b/SuplaGuiWiFi.h index 14160f60..7194892c 100644 --- a/SuplaGuiWiFi.h +++ b/SuplaGuiWiFi.h @@ -59,36 +59,46 @@ class GUIESPWifi : public Supla::ESPWifi { void setup() { if (ConfigESP->configModeESP == NORMAL_MODE) { - gotIpEventHandler = WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) { - Serial.print(F("local IP: ")); - Serial.println(WiFi.localIP()); - Serial.print(F("subnetMask: ")); - Serial.println(WiFi.subnetMask()); - Serial.print(F("gatewayIP: ")); - Serial.println(WiFi.gatewayIP()); - long rssi = WiFi.RSSI(); - Serial.print(F("Signal strength (RSSI): ")); - Serial.print(rssi); - Serial.println(F(" dBm")); - }); - disconnectedEventHandler = - WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected &event) { Serial.println(F("WiFi station disconnected")); }); - - Serial.print(F("WiFi: establishing connection with SSID: \"")); - Serial.print(ssid); - Serial.println(F("\"")); - WiFi.hostname(hostname); - Serial.print(F("Host name: ")); - Serial.println(WiFi.hostname()); - - WiFi.softAPdisconnect(true); - WiFi.setAutoConnect(false); - WiFi.mode(WIFI_STA); - - if (!isReady()) { - WiFi.begin(ssid, password); + if (!wifiConfigured) { + wifiConfigured = true; + gotIpEventHandler = WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) { + Serial.print(F("local IP: ")); + Serial.println(WiFi.localIP()); + Serial.print(F("subnetMask: ")); + Serial.println(WiFi.subnetMask()); + Serial.print(F("gatewayIP: ")); + Serial.println(WiFi.gatewayIP()); + long rssi = WiFi.RSSI(); + Serial.print(F("Signal strength (RSSI): ")); + Serial.print(rssi); + Serial.println(F(" dBm")); + }); + disconnectedEventHandler = + WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected &event) { Serial.println(F("WiFi station disconnected")); }); + + Serial.print(F("WiFi: establishing connection with SSID: \"")); + Serial.print(ssid); + Serial.println(F("\"")); + WiFi.hostname(hostname); + Serial.print(F("Host name: ")); + Serial.println(WiFi.hostname()); + + WiFi.softAPdisconnect(true); + WiFi.setAutoConnect(false); + WiFi.mode(WIFI_STA); + + if (!isReady()) { + WiFi.begin(ssid, password); + } + } + else { + Serial.println(F("WiFi: resetting WiFi connection")); + if (client) { + delete client; + client = nullptr; + } + WiFi.reconnect(); } - yield(); } } From 04158db8b199a2596d7e745ede115d3af73da307 Mon Sep 17 00:00:00 2001 From: krycha88 Date: Sat, 14 Nov 2020 20:47:40 +0100 Subject: [PATCH 2/6] CONFIG_MODE Presses 10 --- SuplaConfigESP.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuplaConfigESP.cpp b/SuplaConfigESP.cpp index 1ad49d41..e4e50c0b 100644 --- a/SuplaConfigESP.cpp +++ b/SuplaConfigESP.cpp @@ -90,7 +90,7 @@ void SuplaConfigESP::runAction(int event, int action) { } countPresses++; - if (countPresses == 3) { + if (countPresses == 10) { // Serial.println(F("CONFIG_MODE_3_PRESSES")); configModeInit(); countPresses = 0; From 4683b9835f4f637f508edda20a165567684c0141 Mon Sep 17 00:00:00 2001 From: krycha88 Date: Sat, 14 Nov 2020 20:48:22 +0100 Subject: [PATCH 3/6] Poprawa nazewnictwa MONOSTABILNY BISTABILNY --- SuplaCommonPROGMEM.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/SuplaCommonPROGMEM.h b/SuplaCommonPROGMEM.h index 2d2cab9f..c58d94a8 100644 --- a/SuplaCommonPROGMEM.h +++ b/SuplaCommonPROGMEM.h @@ -44,14 +44,13 @@ const char ODWROCONE[] PROGMEM = "LOW"; const char NORMALNE[] PROGMEM = "HIGH"; const char* const LEVEL_P[] PROGMEM = {ODWROCONE, NORMALNE}; -//const char WYLACZONY[] PROGMEM = "WYŁĄCZONY"; const char PAMIETAJSTAN[] PROGMEM = "PAMIĘTAJ STAN"; const char* const MEMORY_P[] PROGMEM = {OFF, ON, PAMIETAJSTAN}; -const char WCISNIECIE[] PROGMEM = "WCIŚNIĘCIE"; -const char ZWOLNIENIE[] PROGMEM = "ZWOLNIENIE"; -const char ZMIANASTANU[] PROGMEM = "ZMIANA STANU"; -const char* const TRIGGER_P[] PROGMEM = {WCISNIECIE, ZWOLNIENIE, ZMIANASTANU}; +const char ON_PRESS[] PROGMEM = "MONOSTABILNY"; +const char ON_RELEASE[] PROGMEM = "ZWOLNIENIE"; +const char ON_CHANGE[] PROGMEM = "BISTABILNY"; +const char* const TRIGGER_P[] PROGMEM = {ON_PRESS, ON_RELEASE, ON_CHANGE}; String GIPOString(uint8_t gpio); String BME280String(uint8_t adr); From c0252414b36bb73edbcac5fc03aafc871392ef1a Mon Sep 17 00:00:00 2001 From: krycha88 Date: Sat, 14 Nov 2020 20:49:12 +0100 Subject: [PATCH 4/6] =?UTF-8?q?Poprawa=20szabl=C3=B3w=20p=C5=82ytek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SuplaTemplateBoard.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SuplaTemplateBoard.cpp b/SuplaTemplateBoard.cpp index 5d051ca0..a2757201 100644 --- a/SuplaTemplateBoard.cpp +++ b/SuplaTemplateBoard.cpp @@ -9,7 +9,7 @@ void chooseTemplateBoard(uint8_t board) { ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH); ConfigManager->set(KEY_MAX_BUTTON, "1"); - ConfigESP->setGpio(14, 1, FUNCTION_BUTTON, Supla::ON_CHANGE); + ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS); ConfigManager->set(KEY_MAX_RELAY, "1"); ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE); @@ -19,7 +19,7 @@ void chooseTemplateBoard(uint8_t board) { ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH); ConfigManager->set(KEY_MAX_BUTTON, "1"); - ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE); + ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS); ConfigManager->set(KEY_MAX_RELAY, "1"); ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE); @@ -31,7 +31,7 @@ void chooseTemplateBoard(uint8_t board) { ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH); ConfigManager->set(KEY_MAX_BUTTON, "1"); - ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE); + ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS); ConfigManager->set(KEY_MAX_RELAY, "1"); ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE); @@ -41,8 +41,8 @@ void chooseTemplateBoard(uint8_t board) { ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH); ConfigManager->set(KEY_MAX_BUTTON, "2"); - ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE); - ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_CHANGE); + ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS); + ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_PRESS); ConfigManager->set(KEY_MAX_RELAY, "2"); ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE); @@ -53,9 +53,9 @@ void chooseTemplateBoard(uint8_t board) { ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH); ConfigManager->set(KEY_MAX_BUTTON, "3"); - ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_CHANGE); - ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_CHANGE); - ConfigESP->setGpio(10, 3, FUNCTION_BUTTON, Supla::ON_CHANGE); + ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS); + ConfigESP->setGpio(9, 2, FUNCTION_BUTTON, Supla::ON_PRESS); + ConfigESP->setGpio(10, 3, FUNCTION_BUTTON, Supla::ON_PRESS); ConfigManager->set(KEY_MAX_RELAY, "3"); ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE); From a5fa69cb73fc3ad23b09501a1d4fe16bc111f7c8 Mon Sep 17 00:00:00 2001 From: krycha88 Date: Sat, 14 Nov 2020 20:49:31 +0100 Subject: [PATCH 5/6] delay(25) --- GUI-Generic.ino | 1 + 1 file changed, 1 insertion(+) diff --git a/GUI-Generic.ino b/GUI-Generic.ino index 5c9b201a..eeed7c91 100644 --- a/GUI-Generic.ino +++ b/GUI-Generic.ino @@ -199,5 +199,6 @@ void setup() { void loop() { SuplaDevice.iterate(); + delay(25); drd.loop(); } From acee3adeafa55c0102b3b7272a2da8db420f78a5 Mon Sep 17 00:00:00 2001 From: krycha88 Date: Sun, 15 Nov 2020 18:58:48 +0100 Subject: [PATCH 6/6] Update SuplaWebPageRelay.h --- SuplaWebPageRelay.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SuplaWebPageRelay.h b/SuplaWebPageRelay.h index b1d8b89d..dfeeaad4 100644 --- a/SuplaWebPageRelay.h +++ b/SuplaWebPageRelay.h @@ -15,14 +15,14 @@ #define INPUT_RELAY_DURATION "ird" #define INPUT_ROLLERSHUTTER "irsr" -#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER) - enum _memory_relay { MEMORY_RELAY_OFF, MEMORY_RELAY_ON, MEMORY_RELAY_RESTORE }; +#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER) + class SuplaWebPageRelay { public: SuplaWebPageRelay();