From 2147865ba5b86b403e9558c9c04c529c980b2139 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 12 Nov 2020 06:31:27 +0100
Subject: [PATCH 01/12] fix KEY_ALTITUDE_BME280

https://forum.supla.org/viewtopic.php?p=80180#p80180
---
 SuplaConfigManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SuplaConfigManager.cpp b/SuplaConfigManager.cpp
index e70f7d80..ce40aff3 100644
--- a/SuplaConfigManager.cpp
+++ b/SuplaConfigManager.cpp
@@ -156,6 +156,7 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_MAX_DHT22, "1", 2);
   this->addKey(KEY_MAX_DHT11, "1", 2);
   this->addKey(KEY_MULTI_MAX_DS18B20, "1", 2);
+  this->addKey(KEY_ALTITUDE_BME280, "0", 4);
   
   int nr;
   String key;

From 85cef8ceffcdb190097df64d91310d68525c618d Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 12 Nov 2020 06:31:52 +0100
Subject: [PATCH 02/12] =?UTF-8?q?MAX=5FMODULE=20dla=20szablon=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SuplaTemplateBoard.h | 4 +++-
 SuplaWebServer.cpp   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SuplaTemplateBoard.h b/SuplaTemplateBoard.h
index 0c6f6939..ec30648c 100644
--- a/SuplaTemplateBoard.h
+++ b/SuplaTemplateBoard.h
@@ -3,6 +3,8 @@
 
 #include <pgmspace.h>
 
+#define MAX_MODULE 9
+
 enum _board
 {
   BOARD_SONOFF_BASIC = 1,
@@ -24,7 +26,7 @@ const char SONOFF_TOUCH_3CH[] PROGMEM = "SONOFF TOUCH TRIPLE";
 const char SONOFF_4CH[] PROGMEM = "SONOFF 4CH";
 const char YUNSHA[] PROGMEM = "Yunshan";
 const char INCAN3[] PROGMEM = "inCan3";
-const char* const BOARD_P[] PROGMEM = {BOARD_NULL, SONOFF_BASIC, SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHA, INCAN3};
+const char* const BOARD_P[MAX_MODULE] PROGMEM = {BOARD_NULL, SONOFF_BASIC, SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHA, INCAN3};
 
 void chooseTemplateBoard(uint8_t board);
 
diff --git a/SuplaWebServer.cpp b/SuplaWebServer.cpp
index 4b746205..d72a4093 100644
--- a/SuplaWebServer.cpp
+++ b/SuplaWebServer.cpp
@@ -321,7 +321,7 @@ String SuplaWebServer::deviceSettings(int save) {
   content += INPUT_BOARD;
   content += F("'>");
   uint8_t selected = ConfigManager->get(KEY_BOARD)->getValueInt();
-  for (uint8_t suported = 0; suported < 9; suported++) {
+  for (uint8_t suported = 0; suported < MAX_MODULE; suported++) {
     content += F("<option value='");
     content += suported;
     if (selected == suported) {

From 4eeb944b599405c30a61029039f43360f41ff527 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 14 Nov 2020 20:46:15 +0100
Subject: [PATCH 03/12] =?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 <krystian.franieczek@gmail.com>
Date: Sat, 14 Nov 2020 20:47:40 +0100
Subject: [PATCH 04/12] 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 <krystian.franieczek@gmail.com>
Date: Sat, 14 Nov 2020 20:48:22 +0100
Subject: [PATCH 05/12] 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 <krystian.franieczek@gmail.com>
Date: Sat, 14 Nov 2020 20:49:12 +0100
Subject: [PATCH 06/12] =?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 <krystian.franieczek@gmail.com>
Date: Sat, 14 Nov 2020 20:49:31 +0100
Subject: [PATCH 07/12] 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 <krystian.franieczek@gmail.com>
Date: Sun, 15 Nov 2020 18:58:48 +0100
Subject: [PATCH 08/12] 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();

From 26e9c6fca7c6e59e6dd321e0676c86f467bf7660 Mon Sep 17 00:00:00 2001
From: Espablo <espablo@o2.pl>
Date: Sun, 15 Nov 2020 19:57:46 +0100
Subject: [PATCH 09/12] nowe szablony

---
 SuplaTemplateBoard.cpp | 114 ++++++++++++++++++++++++++++++++++++-----
 SuplaTemplateBoard.h   |  33 +++++++++---
 2 files changed, 127 insertions(+), 20 deletions(-)

diff --git a/SuplaTemplateBoard.cpp b/SuplaTemplateBoard.cpp
index a2757201..59c22ba3 100644
--- a/SuplaTemplateBoard.cpp
+++ b/SuplaTemplateBoard.cpp
@@ -4,6 +4,74 @@
 
 void chooseTemplateBoard(uint8_t board) {
   switch (board) {
+    case BOARD_ELECTRODRAGON:
+      ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(16, FUNCTION_CFG_LED, HIGH);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "2");
+      ConfigESP->setGpio(0, 1, FUNCTION_BUTTON, Supla::ON_PRESS);
+      ConfigESP->setGpio(2, 2, FUNCTION_BUTTON, Supla::ON_PRESS);
+
+      ConfigManager->set(KEY_MAX_RELAY, "2");
+      ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      ConfigESP->setGpio(13, 2, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      break;
+    case BOARD_INCAN3:
+      ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(2, FUNCTION_CFG_LED, HIGH);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "2");
+      ConfigESP->setGpio(14, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
+      ConfigESP->setGpio(12, 2, FUNCTION_BUTTON, Supla::ON_CHANGE);
+
+      ConfigManager->set(KEY_MAX_RELAY, "2");
+      ConfigESP->setGpio(5, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      ConfigESP->setGpio(13, 2, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+
+      ConfigManager->set(KEY_MAX_LIMIT_SWITCH, "2");
+      ConfigESP->setGpio(4, 1, FUNCTION_LIMIT_SWITCH, 0);
+      ConfigESP->setGpio(16, 2, FUNCTION_LIMIT_SWITCH, 0);
+      break;
+    case BOARD_MELINK:
+      ConfigESP->setGpio(5, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(12, FUNCTION_CFG_LED, HIGH);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "1");
+      ConfigESP->setGpio(5, 1, FUNCTION_BUTTON, Supla::ON_PRESS);
+
+      ConfigManager->set(KEY_MAX_RELAY, "1");
+      ConfigESP->setGpio(4, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      break;
+    case BOARD_NEO_COOLCAM:
+      ConfigESP->setGpio(13, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(4, FUNCTION_CFG_LED, HIGH);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "1");
+      ConfigESP->setGpio(13, 1, FUNCTION_BUTTON, Supla::ON_PRESS);
+
+      ConfigManager->set(KEY_MAX_RELAY, "1");
+      ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      break;
+    case BOARD_SHELLY1:
+      ConfigESP->setGpio(5, FUNCTION_CFG_BUTTON);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "1");
+      ConfigESP->setGpio(5, 1, FUNCTION_BUTTON, Supla::ON_PRESS);
+
+      ConfigManager->set(KEY_MAX_RELAY, "1");
+      ConfigESP->setGpio(4, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      break;
+    case BOARD_SHELLY2:
+      ConfigESP->setGpio(12, FUNCTION_CFG_BUTTON);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "2");
+      ConfigESP->setGpio(12, 1, FUNCTION_BUTTON, Supla::ON_PRESS);
+      ConfigESP->setGpio(14, 2, FUNCTION_BUTTON, Supla::ON_PRESS);
+
+      ConfigManager->set(KEY_MAX_RELAY, "2");
+      ConfigESP->setGpio(4, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      ConfigESP->setGpio(5, 2, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      break;
     case BOARD_SONOFF_BASIC:
       ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
       ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);
@@ -14,6 +82,30 @@ void chooseTemplateBoard(uint8_t board) {
       ConfigManager->set(KEY_MAX_RELAY, "1");
       ConfigESP->setGpio(12, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
       break;
+    case BOARD_SONOFF_DUAL_R2:
+      ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "2");
+      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);
+      ConfigESP->setGpio(5, 2, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      break;
+    case BOARD_SONOFF_S2X:
+      ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);
+
+      ConfigManager->set(KEY_MAX_BUTTON, "1");
+      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);
+
+      ConfigESP->setGpio(14, FUNCTION_SI7021_SONOFF);
+      break;
     case BOARD_SONOFF_TH:
       ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
       ConfigESP->setGpio(13, FUNCTION_CFG_LED, HIGH);
@@ -79,7 +171,7 @@ void chooseTemplateBoard(uint8_t board) {
       ConfigESP->setGpio(15, 4, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
 
       break;
-    case BOARD_YUNSHA:
+    case BOARD_YUNSHAN:
       ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
       ConfigESP->setGpio(2, FUNCTION_CFG_LED, HIGH);
 
@@ -89,22 +181,18 @@ void chooseTemplateBoard(uint8_t board) {
       ConfigManager->set(KEY_MAX_RELAY, "1");
       ConfigESP->setGpio(4, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
       break;
-    case BOARD_INCAN3:
-      ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
-      ConfigESP->setGpio(2, FUNCTION_CFG_LED, HIGH);
 
-      ConfigManager->set(KEY_MAX_BUTTON, "2");
-      ConfigESP->setGpio(14, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
-      ConfigESP->setGpio(12, 2, FUNCTION_BUTTON, Supla::ON_CHANGE);
+    case BOARD_YUNTONG_SMART:
+      ConfigESP->setGpio(12, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(15, FUNCTION_CFG_LED, HIGH);
 
-      ConfigManager->set(KEY_MAX_RELAY, "2");
-      ConfigESP->setGpio(5, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
-      ConfigESP->setGpio(13, 2, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
+      ConfigManager->set(KEY_MAX_BUTTON, "1");
+      ConfigESP->setGpio(12, 1, FUNCTION_BUTTON, Supla::ON_CHANGE);
 
-      ConfigManager->set(KEY_MAX_LIMIT_SWITCH, "2");
-      ConfigESP->setGpio(4, 1, FUNCTION_LIMIT_SWITCH, 0);
-      ConfigESP->setGpio(16, 2, FUNCTION_LIMIT_SWITCH, 0);
+      ConfigManager->set(KEY_MAX_RELAY, "1");
+      ConfigESP->setGpio(4, 1, FUNCTION_RELAY, HIGH, MEMORY_RELAY_RESTORE);
       break;
+
     default:
       ConfigManager->set(KEY_MAX_BUTTON, "1");
       ConfigManager->set(KEY_MAX_RELAY, "1");
diff --git a/SuplaTemplateBoard.h b/SuplaTemplateBoard.h
index ec30648c..b44f9409 100644
--- a/SuplaTemplateBoard.h
+++ b/SuplaTemplateBoard.h
@@ -3,30 +3,49 @@
 
 #include <pgmspace.h>
 
-#define MAX_MODULE 9
 
 enum _board
 {
-  BOARD_SONOFF_BASIC = 1,
+  BOARD_ELECTRODRAGON = 1,
+  BOARD_INCAN3,
+  BOARD_MELINK,
+  BOARD_NEO_COOLCAM,
+  BOARD_SHELLY1,
+  BOARD_SHELLY2,
+  BOARD_SONOFF_BASIC,
+  BOARD_SONOFF_DUAL_R2,
+  BOARD_SONOFF_S2X,
   BOARD_SONOFF_TH,
   BOARD_SONOFF_TOUCH,
   BOARD_SONOFF_TOUCH_2CH,
   BOARD_SONOFF_TOUCH_3CH,
   BOARD_SONOFF_4CH,
-  BOARD_YUNSHA,
-  BOARD_INCAN3
+  BOARD_YUNSHAN,
+  BOARD_YUNTONG_SMART,
+  MAX_MODULE
 };
 
 const char BOARD_NULL[] PROGMEM = "BRAK";
+const char ELECTRODRAGON[] PROGMEM = "ElectroDragon";
+const char INCAN3[] PROGMEM = "inCan3";
+const char MELINK[] PROGMEM = "Melink";
+const char NEO_COOLCAM[] PROGMEM = "Neo Coolcam";
+const char SHELLY1[] PROGMEM = "Shelly 1";
+const char SHELLY2[] PROGMEM = "Shelly 2";
 const char SONOFF_BASIC[] PROGMEM = "SONOFF BASIC";
+const char SONOFF_DUAL_R2[] PROGMEM = "SONOFF DUAL R2";
+const char SONOFF_S2X[] PROGMEM = "SONOFF S2X";
 const char SONOFF_TH[] PROGMEM = "SONOFF TH";
 const char SONOFF_TOUCH[] PROGMEM = "SONOFF TOUCH";
 const char SONOFF_TOUCH_2CH[] PROGMEM = "SONOFF TOUCH DUAL";
 const char SONOFF_TOUCH_3CH[] PROGMEM = "SONOFF TOUCH TRIPLE";
 const char SONOFF_4CH[] PROGMEM = "SONOFF 4CH";
-const char YUNSHA[] PROGMEM = "Yunshan";
-const char INCAN3[] PROGMEM = "inCan3";
-const char* const BOARD_P[MAX_MODULE] PROGMEM = {BOARD_NULL, SONOFF_BASIC, SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHA, INCAN3};
+const char YUNSHAN[] PROGMEM = "Yunshan";
+const char YUNTONG_SMART[] PROGMEM = "YUNTONG Smart";
+
+const char* const BOARD_P[MAX_MODULE] PROGMEM = {BOARD_NULL,       ELECTRODRAGON,    INCAN3,         MELINK,     NEO_COOLCAM,  SHELLY1,
+                                                 SHELLY2,          SONOFF_BASIC,     SONOFF_DUAL_R2, SONOFF_S2X, SONOFF_TH,    SONOFF_TOUCH,
+                                                 SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH,     YUNSHAN,    YUNTONG_SMART};
 
 void chooseTemplateBoard(uint8_t board);
 

From 8f28013ba6bdda4b9d585e258ba034e4eb8fca0e Mon Sep 17 00:00:00 2001
From: Espablo <espablo@o2.pl>
Date: Sun, 15 Nov 2020 20:37:43 +0100
Subject: [PATCH 10/12] =?UTF-8?q?liter=C3=B3wka?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SuplaConfigManager.h | 134 ++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 66 deletions(-)

diff --git a/SuplaConfigManager.h b/SuplaConfigManager.h
index 793af3bc..a728d9d5 100644
--- a/SuplaConfigManager.h
+++ b/SuplaConfigManager.h
@@ -17,46 +17,47 @@
 #ifndef SuplaConfigManager_h
 #define SuplaConfigManager_h
 
-#define  DEFAULT_HOSTNAME      "GUI Generic"  
-  
-#define  DEFAULT_LOGIN         "admin"
-#define  DEFAULT_LOGIN_PASS    "pass"
-
-#define  DEFAULT_SERVER         "svrX.supla.org"
-#define  DEFAULT_EMAIL          "email@address.com"
-
-#define KEY_SUPLA_GUID          "GUID"
-#define KEY_SUPLA_AUTHKEY       "AUTHKEY"
-#define KEY_WIFI_SSID           "wifiSSID"
-#define KEY_WIFI_PASS           "wifiPass"
-#define KEY_LOGIN               "login"
-#define KEY_LOGIN_PASS          "loginPass"
-#define KEY_HOST_NAME           "hostName"
-#define KEY_SUPLA_SERVER        "suplaServer"
-#define KEY_SUPLA_EMAIL         "suplaEmail"
-#define KEY_DS                  "ds"
-#define KEY_DS_NAME             "dsName"
-#define KEY_MULTI_MAX_DS18B20   "multiMaxDs"
-#define KEY_SUPLA_FUNCTION      "function"
-#define KEY_MAX_RELAY           "maxRelay"
-#define KEY_MAX_BUTTON          "maxButton"
-#define KEY_MAX_LIMIT_SWITCH    "maxLimitSwitch"
-#define KEY_MAX_DHT11           "maxDht11"
-#define KEY_MAX_DHT22           "maxDht22"
-#define KEY_MAX_ROLLERSHUTTER   "maxRollerShutter"
-#define KEY_ALTITUDE_BME280     "altbme280"
-#define KEY_ACTIVE_SENSOR       "senor"
-#define KEY_BOARD			    "board"
-
-#define GPIO                      "GPIO"
-#define SEPARATOR                 ','
-
-enum _settings {
-	NR,
-	FUNCTION,
-	LEVEL,
-	MEMORY,
-	CFG
+#define DEFAULT_HOSTNAME "GUI Generic"
+
+#define DEFAULT_LOGIN      "admin"
+#define DEFAULT_LOGIN_PASS "pass"
+
+#define DEFAULT_SERVER "svrX.supla.org"
+#define DEFAULT_EMAIL  "email@address.com"
+
+#define KEY_SUPLA_GUID        "GUID"
+#define KEY_SUPLA_AUTHKEY     "AUTHKEY"
+#define KEY_WIFI_SSID         "wifiSSID"
+#define KEY_WIFI_PASS         "wifiPass"
+#define KEY_LOGIN             "login"
+#define KEY_LOGIN_PASS        "loginPass"
+#define KEY_HOST_NAME         "hostName"
+#define KEY_SUPLA_SERVER      "suplaServer"
+#define KEY_SUPLA_EMAIL       "suplaEmail"
+#define KEY_DS                "ds"
+#define KEY_DS_NAME           "dsName"
+#define KEY_MULTI_MAX_DS18B20 "multiMaxDs"
+#define KEY_SUPLA_FUNCTION    "function"
+#define KEY_MAX_RELAY         "maxRelay"
+#define KEY_MAX_BUTTON        "maxButton"
+#define KEY_MAX_LIMIT_SWITCH  "maxLimitSwitch"
+#define KEY_MAX_DHT11         "maxDht11"
+#define KEY_MAX_DHT22         "maxDht22"
+#define KEY_MAX_ROLLERSHUTTER "maxRollerShutter"
+#define KEY_ALTITUDE_BME280   "altbme280"
+#define KEY_ACTIVE_SENSOR     "sensor"
+#define KEY_BOARD             "board"
+
+#define GPIO      "GPIO"
+#define SEPARATOR ','
+
+enum _settings
+{
+  NR,
+  FUNCTION,
+  LEVEL,
+  MEMORY,
+  CFG
 };
 
 enum _function
@@ -80,34 +81,35 @@ enum _function
   FUNCTION_D0
 };
 
-#define  MAX_GUID                 SUPLA_GUID_SIZE
-#define  MAX_AUTHKEY              SUPLA_GUID_SIZE
-#define  MAX_SSID                 32
-#define  MAX_PASSWORD             64
-#define  MIN_PASSWORD             8
-#define  MAX_MLOGIN               32
-#define  MAX_MPASSWORD            64
-#define  MAX_HOSTNAME             32
-#define  MAX_SUPLA_SERVER         SUPLA_SERVER_NAME_MAXSIZE
-#define  MAX_EMAIL                SUPLA_EMAIL_MAXSIZE
-#define  MAX_DS18B20_ADDRESS_HEX  16
-#define  MAX_DS18B20_ADDRESS      8
-#define  MAX_DS18B20_NAME         8
-#define  MAX_TYPE_BUTTON          4
-#define  MAX_MONOSTABLE_TRIGGER   1
-#define  MAX_FUNCTION             1
-#define  MAX_DS18B20          	  10
-
-enum _e_onfig {
-	E_CONFIG_OK,
-	E_CONFIG_FS_ACCESS,
-	E_CONFIG_FILE_NOT_FOUND,
-	E_CONFIG_FILE_OPEN,
-	E_CONFIG_PARSE_ERROR,
-	E_CONFIG_MAX
+#define MAX_GUID                SUPLA_GUID_SIZE
+#define MAX_AUTHKEY             SUPLA_GUID_SIZE
+#define MAX_SSID                32
+#define MAX_PASSWORD            64
+#define MIN_PASSWORD            8
+#define MAX_MLOGIN              32
+#define MAX_MPASSWORD           64
+#define MAX_HOSTNAME            32
+#define MAX_SUPLA_SERVER        SUPLA_SERVER_NAME_MAXSIZE
+#define MAX_EMAIL               SUPLA_EMAIL_MAXSIZE
+#define MAX_DS18B20_ADDRESS_HEX 16
+#define MAX_DS18B20_ADDRESS     8
+#define MAX_DS18B20_NAME        8
+#define MAX_TYPE_BUTTON         4
+#define MAX_MONOSTABLE_TRIGGER  1
+#define MAX_FUNCTION            1
+#define MAX_DS18B20             10
+
+enum _e_onfig
+{
+  E_CONFIG_OK,
+  E_CONFIG_FS_ACCESS,
+  E_CONFIG_FILE_NOT_FOUND,
+  E_CONFIG_FILE_OPEN,
+  E_CONFIG_PARSE_ERROR,
+  E_CONFIG_MAX
 };
 
-#define CONFIG_MAX_OPTIONS        88
+#define CONFIG_MAX_OPTIONS 88
 
 class ConfigOption {
  public:

From fba0c3b4a8ffe01865ea47c90457ccad94269f2e Mon Sep 17 00:00:00 2001
From: Espablo <espablo@o2.pl>
Date: Sun, 15 Nov 2020 20:58:09 +0100
Subject: [PATCH 11/12] zmiana nazw reakcji przycisku na...

---
 SuplaCommonPROGMEM.h | 59 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/SuplaCommonPROGMEM.h b/SuplaCommonPROGMEM.h
index c58d94a8..f997582a 100644
--- a/SuplaCommonPROGMEM.h
+++ b/SuplaCommonPROGMEM.h
@@ -3,11 +3,51 @@
 #include <pgmspace.h>
 #include "SuplaDeviceGUI.h"
 
-const char HTTP_META[] PROGMEM = "<!DOCTYPE HTML><meta http-equiv='content-type' content='text/html; charset=UTF-8'><meta name='viewport' content='width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no'>\n";
-const char HTTP_STYLE[] PROGMEM = "<style>body{font-size:14px;font-family:HelveticaNeue,'Helvetica Neue',HelveticaNeueRoman,HelveticaNeue-Roman,'Helvetica Neue Roman',TeXGyreHerosRegular,Helvetica,Tahoma,Geneva,Arial,sans-serif;font-weight:400;font-stretch:normal;background:#00d151;color:#fff;line-height:20px;padding:0}.s{width:460px;margin:0 auto;margin-top:calc(50vh - 340px);border:solid 3px #fff;padding:0 10px 10px;border-radius:3px}#l{display:block;max-width:150px;height:155px;margin:-80px auto 20px;background:#00d151;padding-right:5px}#l path{fill:#000}.w{margin:3px 0 16px;padding:5px 0;border-radius:3px;background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.3)}h1,h3{margin:10px 8px;font-family:HelveticaNeueLight,HelveticaNeue-Light,'Helvetica Neue Light',HelveticaNeue,'Helvetica Neue',TeXGyreHerosRegular,Helvetica,Tahoma,Geneva,Arial,sans-serif;font-weight:300;font-stretch:normal;color:#000;font-size:23px}h1{margin-bottom:14px;color:#fff}span{display:block;margin:10px 7px 14px}i{display:block;font-style:normal;position:relative;border-bottom:solid 1px #00d151;height:42px}i:last-child{border:none}label{position:absolute;display:inline-block;top:0;left:8px;color:#00d151;line-height:41px;}input,select{width:calc(100% - 145px);border:none;font-size:16px;line-height:40px;border-radius:0;letter-spacing:-.5px;background:#fff;color:#000;padding-left:143px;-webkit-appearance:none;-moz-appearance:none;appearance:none;outline:0!important;height:40px}select{padding:0;float:right;margin:1px 3px 1px 2px}button{width:100%;border:0;background:#000;padding:5px 10px;font-size:16px;line-height:40px;color:#fff;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.3);cursor:pointer}.c{background:#ffe836;position:fixed;width:100%;line-height:80px;color:#000;top:0;left:0;box-shadow:0 1px 3px rgba(0,0,0,.3);text-align:center;font-size:26px;z-index:100}@media all and (max-height:920px){.s{margin-top:80px}}@media all and (max-width:900px){.s{width:calc(100% - 20px);margin-top:40px;border:none;padding:0 8px;border-radius:0}#l{max-width:80px;height:auto;margin:10px auto 20px}h1,h3{font-size:19px}i{border:none;height:auto}label{display:block;margin:4px 0 12px;color:#00d151;font-size:13px;position:relative;line-height:18px}input,select{width:calc(100% - 10px);font-size:16px;line-height:28px;padding:0 5px;border-bottom:solid 1px #00d151}select{width:100%;float:none;margin:0}}</style>";
-const char HTTP_LOGO[] PROGMEM = "<div class='s'><a href='/'><svg version='1.1' id='l' x='0' y='0' viewBox='0 0 200 200' xml:space='preserve'><path d='M59.3,2.5c18.1,0.6,31.8,8,40.2,23.5c3.1,5.7,4.3,11.9,4.1,18.3c-0.1,3.6-0.7,7.1-1.9,10.6c-0.2,0.7-0.1,1.1,0.6,1.5c12.8,7.7,25.5,15.4,38.3,23c2.9,1.7,5.8,3.4,8.7,5.3c1,0.6,1.6,0.6,2.5-0.1c4.5-3.6,9.8-5.3,15.7-5.4c12.5-0.1,22.9,7.9,25.2,19c1.9,9.2-2.9,19.2-11.8,23.9c-8.4,4.5-16.9,4.5-25.5,0.2c-0.7-0.3-1-0.2-1.5,0.3c-4.8,4.9-9.7,9.8-14.5,14.6c-5.3,5.3-10.6,10.7-15.9,16c-1.8,1.8-3.6,3.7-5.4,5.4c-0.7,0.6-0.6,1,0,1.6c3.6,3.4,5.8,7.5,6.2,12.2c0.7,7.7-2.2,14-8.8,18.5c-12.3,8.6-30.3,3.5-35-10.4c-2.8-8.4,0.6-17.7,8.6-22.8c0.9-0.6,1.1-1,0.8-2c-2-6.2-4.4-12.4-6.6-18.6c-6.3-17.6-12.7-35.1-19-52.7c-0.2-0.7-0.5-1-1.4-0.9c-12.5,0.7-23.6-2.6-33-10.4c-8-6.6-12.9-15-14.2-25c-1.5-11.5,1.7-21.9,9.6-30.7C32.5,8.9,42.2,4.2,53.7,2.7c0.7-0.1,1.5-0.2,2.2-0.2C57,2.4,58.2,2.5,59.3,2.5z M76.5,81c0,0.1,0.1,0.3,0.1,0.6c1.6,6.3,3.2,12.6,4.7,18.9c4.5,17.7,8.9,35.5,13.3,53.2c0.2,0.9,0.6,1.1,1.6,0.9c5.4-1.2,10.7-0.8,15.7,1.6c0.8,0.4,1.2,0.3,1.7-0.4c11.2-12.9,22.5-25.7,33.4-38.7c0.5-0.6,0.4-1,0-1.6c-5.6-7.9-6.1-16.1-1.3-24.5c0.5-0.8,0.3-1.1-0.5-1.6c-9.1-4.7-18.1-9.3-27.2-14c-6.8-3.5-13.5-7-20.3-10.5c-0.7-0.4-1.1-0.3-1.6,0.4c-1.3,1.8-2.7,3.5-4.3,5.1c-4.2,4.2-9.1,7.4-14.7,9.7C76.9,80.3,76.4,80.3,76.5,81z M89,42.6c0.1-2.5-0.4-5.4-1.5-8.1C83,23.1,74.2,16.9,61.7,15.8c-10-0.9-18.6,2.4-25.3,9.7c-8.4,9-9.3,22.4-2.2,32.4c6.8,9.6,19.1,14.2,31.4,11.9C79.2,67.1,89,55.9,89,42.6z M102.1,188.6c0.6,0.1,1.5-0.1,2.4-0.2c9.5-1.4,15.3-10.9,11.6-19.2c-2.6-5.9-9.4-9.6-16.8-8.6c-8.3,1.2-14.1,8.9-12.4,16.6C88.2,183.9,94.4,188.6,102.1,188.6z M167.7,88.5c-1,0-2.1,0.1-3.1,0.3c-9,1.7-14.2,10.6-10.8,18.6c2.9,6.8,11.4,10.3,19,7.8c7.1-2.3,11.1-9.1,9.6-15.9C180.9,93,174.8,88.5,167.7,88.5z'/></a></svg>";
+const char HTTP_META[] PROGMEM =
+    "<!DOCTYPE HTML><meta http-equiv='content-type' content='text/html; charset=UTF-8'><meta name='viewport' "
+    "content='width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no'>\n";
+const char HTTP_STYLE[] PROGMEM =
+    "<style>body{font-size:14px;font-family:HelveticaNeue,'Helvetica Neue',HelveticaNeueRoman,HelveticaNeue-Roman,'Helvetica Neue "
+    "Roman',TeXGyreHerosRegular,Helvetica,Tahoma,Geneva,Arial,sans-serif;font-weight:400;font-stretch:normal;background:#00d151;color:#fff;line-"
+    "height:20px;padding:0}.s{width:460px;margin:0 auto;margin-top:calc(50vh - 340px);border:solid 3px #fff;padding:0 10px "
+    "10px;border-radius:3px}#l{display:block;max-width:150px;height:155px;margin:-80px auto 20px;background:#00d151;padding-right:5px}#l "
+    "path{fill:#000}.w{margin:3px 0 16px;padding:5px 0;border-radius:3px;background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.3)}h1,h3{margin:10px "
+    "8px;font-family:HelveticaNeueLight,HelveticaNeue-Light,'Helvetica Neue Light',HelveticaNeue,'Helvetica "
+    "Neue',TeXGyreHerosRegular,Helvetica,Tahoma,Geneva,Arial,sans-serif;font-weight:300;font-stretch:normal;color:#000;font-size:23px}h1{margin-"
+    "bottom:14px;color:#fff}span{display:block;margin:10px 7px 14px}i{display:block;font-style:normal;position:relative;border-bottom:solid 1px "
+    "#00d151;height:42px}i:last-child{border:none}label{position:absolute;display:inline-block;top:0;left:8px;color:#00d151;line-height:41px;}input,"
+    "select{width:calc(100% - "
+    "145px);border:none;font-size:16px;line-height:40px;border-radius:0;letter-spacing:-.5px;background:#fff;color:#000;padding-left:143px;-webkit-"
+    "appearance:none;-moz-appearance:none;appearance:none;outline:0!important;height:40px}select{padding:0;float:right;margin:1px 3px 1px "
+    "2px}button{width:100%;border:0;background:#000;padding:5px 10px;font-size:16px;line-height:40px;color:#fff;border-radius:3px;box-shadow:0 1px "
+    "3px rgba(0,0,0,.3);cursor:pointer}.c{background:#ffe836;position:fixed;width:100%;line-height:80px;color:#000;top:0;left:0;box-shadow:0 1px 3px "
+    "rgba(0,0,0,.3);text-align:center;font-size:26px;z-index:100}@media all and (max-height:920px){.s{margin-top:80px}}@media all and "
+    "(max-width:900px){.s{width:calc(100% - 20px);margin-top:40px;border:none;padding:0 "
+    "8px;border-radius:0}#l{max-width:80px;height:auto;margin:10px auto "
+    "20px}h1,h3{font-size:19px}i{border:none;height:auto}label{display:block;margin:4px 0 "
+    "12px;color:#00d151;font-size:13px;position:relative;line-height:18px}input,select{width:calc(100% - "
+    "10px);font-size:16px;line-height:28px;padding:0 5px;border-bottom:solid 1px #00d151}select{width:100%;float:none;margin:0}}</style>";
+const char HTTP_LOGO[] PROGMEM =
+    "<div class='s'><a href='/'><svg version='1.1' id='l' x='0' y='0' viewBox='0 0 200 200' xml:space='preserve'><path "
+    "d='M59.3,2.5c18.1,0.6,31.8,8,40.2,23.5c3.1,5.7,4.3,11.9,4.1,18.3c-0.1,3.6-0.7,7.1-1.9,10.6c-0.2,0.7-0.1,1.1,0.6,1.5c12.8,7.7,25.5,15.4,38.3,"
+    "23c2.9,1.7,5.8,3.4,8.7,5.3c1,0.6,1.6,0.6,2.5-0.1c4.5-3.6,9.8-5.3,15.7-5.4c12.5-0.1,22.9,7.9,25.2,19c1.9,9.2-2.9,19.2-11.8,23.9c-8.4,4.5-16.9,4."
+    "5-25.5,0.2c-0.7-0.3-1-0.2-1.5,0.3c-4.8,4.9-9.7,9.8-14.5,14.6c-5.3,5.3-10.6,10.7-15.9,16c-1.8,1.8-3.6,3.7-5.4,5.4c-0.7,0.6-0.6,1,0,1.6c3.6,3.4,5."
+    "8,7.5,6.2,12.2c0.7,7.7-2.2,14-8.8,18.5c-12.3,8.6-30.3,3.5-35-10.4c-2.8-8.4,0.6-17.7,8.6-22.8c0.9-0.6,1.1-1,0.8-2c-2-6.2-4.4-12.4-6.6-18.6c-6.3-"
+    "17.6-12.7-35.1-19-52.7c-0.2-0.7-0.5-1-1.4-0.9c-12.5,0.7-23.6-2.6-33-10.4c-8-6.6-12.9-15-14.2-25c-1.5-11.5,1.7-21.9,9.6-30.7C32.5,8.9,42.2,4.2,"
+    "53.7,2.7c0.7-0.1,1.5-0.2,2.2-0.2C57,2.4,58.2,2.5,59.3,2.5z "
+    "M76.5,81c0,0.1,0.1,0.3,0.1,0.6c1.6,6.3,3.2,12.6,4.7,18.9c4.5,17.7,8.9,35.5,13.3,53.2c0.2,0.9,0.6,1.1,1.6,0.9c5.4-1.2,10.7-0.8,15.7,1.6c0.8,0.4,"
+    "1.2,0.3,1.7-0.4c11.2-12.9,22.5-25.7,33.4-38.7c0.5-0.6,0.4-1,0-1.6c-5.6-7.9-6.1-16.1-1.3-24.5c0.5-0.8,0.3-1.1-0.5-1.6c-9.1-4.7-18.1-9.3-27.2-14c-"
+    "6.8-3.5-13.5-7-20.3-10.5c-0.7-0.4-1.1-0.3-1.6,0.4c-1.3,1.8-2.7,3.5-4.3,5.1c-4.2,4.2-9.1,7.4-14.7,9.7C76.9,80.3,76.4,80.3,76.5,81z "
+    "M89,42.6c0.1-2.5-0.4-5.4-1.5-8.1C83,23.1,74.2,16.9,61.7,15.8c-10-0.9-18.6,2.4-25.3,9.7c-8.4,9-9.3,22.4-2.2,32.4c6.8,9.6,19.1,14.2,31.4,11.9C79."
+    "2,67.1,89,55.9,89,42.6z "
+    "M102.1,188.6c0.6,0.1,1.5-0.1,2.4-0.2c9.5-1.4,15.3-10.9,11.6-19.2c-2.6-5.9-9.4-9.6-16.8-8.6c-8.3,1.2-14.1,8.9-12.4,16.6C88.2,183.9,94.4,188.6,"
+    "102.1,188.6z "
+    "M167.7,88.5c-1,0-2.1,0.1-3.1,0.3c-9,1.7-14.2,10.6-10.8,18.6c2.9,6.8,11.4,10.3,19,7.8c7.1-2.3,11.1-9.1,9.6-15.9C180.9,93,174.8,88.5,167.7,88.5z'/"
+    "></a></svg>";
 const char HTTP_SUMMARY[] PROGMEM = "<h1>{h}</h1><span>LAST STATE: {s}<br>Firmware: SuplaDevice {v}<br>GUID: {g}<br>MAC: {m}</span>\n";
-const char HTTP_COPYRIGHT[] PROGMEM = "<a target='_blank' rel='noopener noreferrer' href='https://forum.supla.org/viewtopic.php?f=11&t=7133'><span style='color: #ffffff !important;'>https://forum.supla.org/</span></a>\n";
+const char HTTP_COPYRIGHT[] PROGMEM =
+    "<a target='_blank' rel='noopener noreferrer' href='https://forum.supla.org/viewtopic.php?f=11&t=7133'><span style='color: #ffffff "
+    "!important;'>https://forum.supla.org/</span></a>\n";
 
 const char GPIO0[] PROGMEM = "GPIO0-D3";
 const char GPIO1[] PROGMEM = "GPIO1-TX";
@@ -26,7 +66,8 @@ const char OFF[] PROGMEM = "OFF";
 const char ON[] PROGMEM = "ON";
 const char GPIONULL[] PROGMEM = "";
 
-const char* const GPIO_P[] PROGMEM = {GPIO0, GPIO1, GPIO2, GPIO3, GPIO4,  GPIO5, GPIONULL, GPIONULL, GPIONULL, GPIO9, GPIO10, GPIONULL, GPIO12, GPIO13, GPIO14, GPIO15, GPIO16, OFF};
+const char* const GPIO_P[] PROGMEM = {GPIO0, GPIO1,  GPIO2,    GPIO3,  GPIO4,  GPIO5,  GPIONULL, GPIONULL, GPIONULL,
+                                      GPIO9, GPIO10, GPIONULL, GPIO12, GPIO13, GPIO14, GPIO15,   GPIO16,   OFF};
 
 const char ADR44[] PROGMEM = "0x44";
 const char ADR45[] PROGMEM = "0x45";
@@ -47,10 +88,10 @@ const char* const LEVEL_P[] PROGMEM = {ODWROCONE, NORMALNE};
 const char PAMIETAJSTAN[] PROGMEM = "PAMIĘTAJ STAN";
 const char* const MEMORY_P[] PROGMEM = {OFF, ON, PAMIETAJSTAN};
 
-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};
+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};
 
 String GIPOString(uint8_t gpio);
 String BME280String(uint8_t adr);

From 092ea2e3e0fa71341b92ae9ee611030e925316d5 Mon Sep 17 00:00:00 2001
From: Espablo <espablo@o2.pl>
Date: Mon, 16 Nov 2020 00:39:45 +0100
Subject: [PATCH 12/12] language english/polish

---
 GUI-Generic_Config.h    |   3 +
 GUIGenericCommon.h      |  13 ++++
 SuplaWebPageConfig.cpp  |  26 ++++---
 SuplaWebPageControl.cpp |  51 +++++++++----
 SuplaWebPageRelay.cpp   |  42 ++++++++---
 SuplaWebPageSensor.cpp  | 108 ++++++++++++++++++++-------
 SuplaWebServer.cpp      | 162 +++++++++++++++++++++++++++-------------
 language/en.h           |  59 +++++++++++++++
 language/pl.h           |  59 +++++++++++++++
 9 files changed, 410 insertions(+), 113 deletions(-)
 create mode 100644 GUIGenericCommon.h
 create mode 100644 language/en.h
 create mode 100644 language/pl.h

diff --git a/GUI-Generic_Config.h b/GUI-Generic_Config.h
index 2fbdc715..c7c456f4 100644
--- a/GUI-Generic_Config.h
+++ b/GUI-Generic_Config.h
@@ -3,6 +3,9 @@
 
 // #define DEBUG_MODE
 
+// Language en - english, pl - polish (default if not defined UI_LANGUAGE)
+// #define UI_LANGUAGE en
+
 #define SUPLA_RELAY
 #define SUPLA_BUTTON
 #define SUPLA_LIMIT_SWITCH
diff --git a/GUIGenericCommon.h b/GUIGenericCommon.h
new file mode 100644
index 00000000..62672230
--- /dev/null
+++ b/GUIGenericCommon.h
@@ -0,0 +1,13 @@
+#ifndef GUI_GENERIC_COMMON_H
+#define GUI_GENERIC_COMMON_H
+
+#ifndef UI_LANGUAGE
+#include "language/pl.h"
+#else
+#define QUOTE(x)        QUOTE_1(x)
+#define QUOTE_1(x)      #x
+#define INCLUDE_FILE(x) QUOTE(language/x.h)
+#include INCLUDE_FILE(UI_LANGUAGE)
+#endif
+
+#endif  // GUI_GENERIC_COMMON_H
diff --git a/SuplaWebPageConfig.cpp b/SuplaWebPageConfig.cpp
index 771b8218..c613d939 100644
--- a/SuplaWebPageConfig.cpp
+++ b/SuplaWebPageConfig.cpp
@@ -2,6 +2,7 @@
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 #include "SuplaCommonPROGMEM.h"
+#include "GUIGenericCommon.h"
 
 SuplaWebPageConfig *WebPageConfig = new SuplaWebPageConfig();
 
@@ -75,7 +76,7 @@ void SuplaWebPageConfig::handleConfigSave() {
       ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), FUNCTION_CFG_BUTTON);
     }
     else if (ConfigESP->checkBusyGpio(WebServer->httpServer.arg(input).toInt(), FUNCTION_BUTTON) == false) {
-      //ConfigManager->setElement(key.c_str(), CFG, 1);
+      // ConfigManager->setElement(key.c_str(), CFG, 1);
       ConfigESP->setGpio(key.toInt(), FUNCTION_CFG_BUTTON);
     }
     else {
@@ -92,9 +93,8 @@ void SuplaWebPageConfig::handleConfigSave() {
     for (int i = 1; i <= ConfigManager->get(KEY_MAX_BUTTON)->getValueInt(); i++) {
       key = GPIO;
       key += ConfigESP->getGpio(i, FUNCTION_BUTTON);
-      if (ConfigESP->getGpio(i, FUNCTION_BUTTON) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
-        if (ConfigManager->get(key.c_str())->getElement(CFG).toInt() == 1) {
-          ConfigManager->setElement(key.c_str(), CFG, 0);
+      if (ConfigESP->getGpio(i, FUNCTION_BUTTON) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO)
+    { if (ConfigManager->get(key.c_str())->getElement(CFG).toInt() == 1) { ConfigManager->setElement(key.c_str(), CFG, 0);
         }
       }
     }
@@ -119,7 +119,9 @@ String SuplaWebPageConfig::supla_webpage_config(int save) {
   page += WebServer->SuplaJavaScript(PATH_CONFIG);
   page += F("<form method='post' action='");
   page += PATH_SAVE_CONFIG;
-  page += F("'><div class='w'><h3>Ustawienie GPIO dla CONFIG</h3>");
+  page += F("'><div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR_CONFIG;
+  page += F("</h3>");
   page += F("<i><label>");
   page += F("LED</label>");
   page += WebServer->selectGPIO(INPUT_CFG_LED_GPIO, FUNCTION_CFG_LED);
@@ -127,7 +129,8 @@ String SuplaWebPageConfig::supla_webpage_config(int save) {
 
   if (selected != 17) {
     page += F("<i><label>");
-    page += F("Sterowanie stanem</label><select name='");
+    page += S_STATE_CONTROL;
+    page += F("</label><select name='");
     page += INPUT_CFG_LED_LEVEL;
     page += F("'>");
     selected = ConfigESP->getLevel(FUNCTION_CFG_LED);
@@ -144,14 +147,19 @@ String SuplaWebPageConfig::supla_webpage_config(int save) {
     page += F("</select></i>");
   }
   page += F("<i><label>");
-  page += F("BUTTON</label>");
+  page += S_BUTTON;
+  page += F("</label>");
   page += WebServer->selectGPIO(INPUT_CFG_BTN_GPIO, FUNCTION_CFG_BUTTON);
   page += F("</i>");
-  page += F("</div><button type='submit'>Zapisz</button></form>");
+  page += F("</div><button type='submit'>");
+  page += S_SAVE;
+  page += F("</button></form>");
   page += F("<br>");
   page += F("<a href='");
   page += PATH_START;
   page += PATH_DEVICE_SETTINGS;
-  page += F("'><button>Powrót</button></a></div>");
+  page += F("'><button>");
+  page += S_RETURN;
+  page += F("</button></a></div>");
   return page;
 }
diff --git a/SuplaWebPageControl.cpp b/SuplaWebPageControl.cpp
index 384dbb5c..0635389b 100644
--- a/SuplaWebPageControl.cpp
+++ b/SuplaWebPageControl.cpp
@@ -2,6 +2,7 @@
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 #include "SuplaCommonPROGMEM.h"
+#include "GUIGenericCommon.h"
 
 SuplaWebPageControl *WebPageControl = new SuplaWebPageControl();
 
@@ -140,8 +141,12 @@ String SuplaWebPageControl::supla_webpage_control(int save) {
   pagebutton += PATH_SAVE_CONTROL;
 
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_RSUPLA_BUTTONELAY) || defined(SUPLA_ROLLERSHUTTER))
-  pagebutton += F("'><div class='w'><h3>Ustawienie GPIO dla przycisków</h3>");
-  pagebutton += F("<i><label>ILOŚĆ</label><input name='");
+  pagebutton += F("'><div class='w'><h3>");
+  pagebutton += S_GPIO_SETTINGS_FOR_BUTTONS;
+  pagebutton += F("</h3>");
+  pagebutton += F("<i><label>");
+  pagebutton += S_QUANTITY;
+  pagebutton += F("</label><input name='");
   pagebutton += INPUT_MAX_BUTTON;
   pagebutton += F("' type='number' placeholder='0' step='1' min='0' max='");
   pagebutton += ConfigESP->countFreeGpio(FUNCTION_BUTTON);
@@ -159,7 +164,8 @@ String SuplaWebPageControl::supla_webpage_control(int save) {
       pagebutton += F("'>");
     }
     pagebutton += nr;
-    pagebutton += F(". PRZYCISK ");
+    pagebutton += F(". ");
+    pagebutton += S_BUTTON;
     if (selected != OFF_GPIO) {
       pagebutton += WebServer->SuplaIconEdit();
       pagebutton += F("</a>");
@@ -172,8 +178,12 @@ String SuplaWebPageControl::supla_webpage_control(int save) {
 #endif
 
 #ifdef SUPLA_LIMIT_SWITCH
-  pagebutton += F("<div class='w'><h3>Ustawienie GPIO dla cz. otwarcia</h3>");
-  pagebutton += F("<i><label>ILOŚĆ</label><input name='");
+  pagebutton += F("<div class='w'><h3>");
+  pagebutton += S_GPIO_SETTINGS_FOR_LIMIT_SWITCH;
+  pagebutton += F("</h3>");
+  pagebutton += F("<i><label>");
+  pagebutton += S_QUANTITY;
+  pagebutton += F("</label><input name='");
   pagebutton += INPUT_MAX_LIMIT_SWITCH;
   pagebutton += F("' type='number' placeholder='0' step='1' min='0' max='");
   pagebutton += ConfigESP->countFreeGpio(FUNCTION_LIMIT_SWITCH);
@@ -183,19 +193,25 @@ String SuplaWebPageControl::supla_webpage_control(int save) {
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt(); nr++) {
     pagebutton += F("<i><label>");
     pagebutton += nr;
-    pagebutton += F(". KRAŃCÓWKA</label>");
+    pagebutton += F(". ");
+    pagebutton += S_LIMIT_SWITCH;
+    pagebutton += F("</label>");
     pagebutton += WebServer->selectGPIO(INPUT_LIMIT_SWITCH_GPIO, FUNCTION_LIMIT_SWITCH, nr);
     pagebutton += F("</i>");
   }
   pagebutton += F("</div>");
 #endif
 
-  pagebutton += F("<button type='submit'>Zapisz</button></form>");
+  pagebutton += F("<button type='submit'>");
+  pagebutton += S_SAVE;
+  pagebutton += F("</button></form>");
   pagebutton += F("<br>");
   pagebutton += F("<a href='");
   pagebutton += PATH_START;
   pagebutton += PATH_DEVICE_SETTINGS;
-  pagebutton += F("'><button>Powrót</button></a></div>");
+  pagebutton += F("'><button>");
+  pagebutton += S_RETURN;
+  pagebutton += F("</button></a></div>");
   return pagebutton;
 }
 
@@ -263,11 +279,14 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
     page += F("<form method='post' action='");
     page += PATH_SAVE_BUTTON_SET;
     page += nr_button;
-    page += F("'><div class='w'><h3>Ustawienia przycisku nr. ");
+    page += F("'><div class='w'><h3>");
+    page += S_BUTTON_NR_SETTINGS;
+    page += F(" ");
     page += nr_button;
     page += F("</h3>");
     page += F("<i><label>");
-    page += F("Reakcja na</label><select name='");
+    page += S_REACTION_TO;
+    page += F("</label><select name='");
     page += INPUT_BUTTON_LEVEL;
     page += nr_button;
     page += F("'>");
@@ -283,10 +302,14 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
       page += TriggerString(suported);
     }
     page += F("</select></i>");
-    page += F("</div><button type='submit'>Zapisz</button></form>");
+    page += F("</div><button type='submit'>");
+    page += S_SAVE;
+    page += F("</button></form>");
   }
   else {
-    page += F("<div class='w'><h3>Brak przycisku nr. ");
+    page += F("<div class='w'><h3>");
+    page += S_NO_BUTTON_NR;
+    page += F(" </h3>");
     page += nr_button;
     page += F("</h3>");
   }
@@ -294,7 +317,9 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
   page += F("<a href='");
   page += PATH_START;
   page += PATH_CONTROL;
-  page += F("'><button>Powrót</button></a></div>");
+  page += F("'><button>");
+  page += S_RETURN;
+  page += F("</button></a></div>");
 
   return page;
 }
diff --git a/SuplaWebPageRelay.cpp b/SuplaWebPageRelay.cpp
index b87813ef..a1b453fe 100644
--- a/SuplaWebPageRelay.cpp
+++ b/SuplaWebPageRelay.cpp
@@ -2,6 +2,7 @@
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 #include "SuplaCommonPROGMEM.h"
+#include "GUIGenericCommon.h"
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 SuplaWebPageRelay *WebPageRelay = new SuplaWebPageRelay();
@@ -104,8 +105,12 @@ String SuplaWebPageRelay::supla_webpage_relay(int save) {
   pagerelay += WebServer->SuplaJavaScript(PATH_RELAY);
   pagerelay += F("<form method='post' action='");
   pagerelay += PATH_SAVE_RELAY;
-  pagerelay += F("'><div class='w'><h3>Ustawienie GPIO dla przekaźników</h3>");
-  pagerelay += F("<i><label>ILOŚĆ</label><input name='");
+  pagerelay += F("'><div class='w'><h3>");
+  pagerelay += S_GPIO_SETTINGS_FOR_RELAYS;
+  pagerelay += F("</h3>");
+  pagerelay += F("<i><label>");
+  pagerelay += S_QUANTITY;
+  pagerelay += F("</label><input name='");
   pagerelay += INPUT_MAX_RELAY;
   pagerelay += F("' type='number' placeholder='0' step='1' min='0' max='");
   pagerelay += ConfigESP->countFreeGpio(FUNCTION_RELAY);
@@ -123,7 +128,8 @@ String SuplaWebPageRelay::supla_webpage_relay(int save) {
       pagerelay += F("'>");
     }
     pagerelay += nr;
-    pagerelay += F(". PRZEKAŹNIK ");
+    pagerelay += F(". ");
+    pagerelay += S_RELAY;
     if (selected != OFF_GPIO) {
       pagerelay += WebServer->SuplaIconEdit();
       pagerelay += F("</a>");
@@ -132,12 +138,16 @@ String SuplaWebPageRelay::supla_webpage_relay(int save) {
     pagerelay += WebServer->selectGPIO(INPUT_RELAY_GPIO, FUNCTION_RELAY, nr);
     pagerelay += F("</i>");
   }
-  pagerelay += F("</div><button type='submit'>Zapisz</button></form>");
+  pagerelay += F("</div><button type='submit'>");
+  pagerelay += S_SAVE;
+  pagerelay += F("</button></form>");
   pagerelay += F("<br>");
   pagerelay += F("<a href='");
   pagerelay += PATH_START;
   pagerelay += PATH_DEVICE_SETTINGS;
-  pagerelay += F("'><button>Powrót</button></a></div>");
+  pagerelay += F("'><button>");
+  pagerelay += S_RETURN;
+  pagerelay += F("</button></a></div>");
   return pagerelay;
 }
 
@@ -208,11 +218,14 @@ String SuplaWebPageRelay::supla_webpage_relay_set(int save) {
     page += F("<form method='post' action='");
     page += PATH_SAVE_RELAY_SET;
     page += nr_relay;
-    page += F("'><div class='w'><h3>Ustawienia przekaźnika nr. ");
+    page += F("'><div class='w'><h3>");
+    page += S_RELAY_NR_SETTINGS;
+    page += F(" ");
     page += nr_relay;
     page += F("</h3>");
     page += F("<i><label>");
-    page += F("Sterowanie stanem</label><select name='");
+    page += S_STATE_CONTROL;
+    page += F("</label><select name='");
     page += INPUT_RELAY_LEVEL;
     page += nr_relay;
     page += F("'>");
@@ -229,7 +242,8 @@ String SuplaWebPageRelay::supla_webpage_relay_set(int save) {
     }
     page += F("</select></i>");
     page += F("<i><label>");
-    page += F("Reakcja po resecie</label><select name='");
+    page += S_REACTION_AFTER_RESET;
+    page += F("</label><select name='");
     page += INPUT_RELAY_MEMORY;
     page += nr_relay;
     page += F("'>");
@@ -245,10 +259,14 @@ String SuplaWebPageRelay::supla_webpage_relay_set(int save) {
       page += MemoryString(suported);
     }
     page += F("</select></i>");
-    page += F("</div><button type='submit'>Zapisz</button></form>");
+    page += F("</div><button type='submit'>");
+    page += S_SAVE;
+    page += F("</button></form>");
   }
   else {
-    page += F("<div class='w'><h3>Brak przekaźnika nr. ");
+    page += F("<div class='w'><h3>");
+    page += S_NO_RELAY_NR;
+    page += F(" ");
     page += nr_relay;
     page += F("</h3>");
   }
@@ -256,7 +274,9 @@ String SuplaWebPageRelay::supla_webpage_relay_set(int save) {
   page += F("<a href='");
   page += PATH_START;
   page += PATH_RELAY;
-  page += F("'><button>Powrót</button></a></div>");
+  page += F("'><button>");
+  page += S_RETURN;
+  page += F("</button></a></div>");
 
   return page;
 }
diff --git a/SuplaWebPageSensor.cpp b/SuplaWebPageSensor.cpp
index a62d293b..c1f46178 100644
--- a/SuplaWebPageSensor.cpp
+++ b/SuplaWebPageSensor.cpp
@@ -3,6 +3,7 @@
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 #include "SuplaCommonPROGMEM.h"
+#include "GUIGenericCommon.h"
 
 SuplaWebPageSensor *WebPageSensor = new SuplaWebPageSensor();
 
@@ -111,14 +112,18 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
     content += PATH_SAVE_MULTI_DS;
     content += F("'>");
     this->showDS18B20(content);
-    content += F("<button type='submit'>Zapisz</button></form>");
+    content += F("<button type='submit'>");
+    content += S_SAVE;
+    content += F("</button></form>");
     content += F("<br>");
   }
   content += F("<form method='post' action='");
   content += PATH_SAVE_MULTI_DS;
   content += F("'>");
   content += F("<div class='w'>");
-  content += F("<h3>Znalezione DS18b20</h3>");
+  content += F("<h3>");
+  content += S_FOUND;
+  content += F(" DS18b20</h3>");
   sensors.setOneWire(&ow);
   sensors.begin();
   if (sensors.isParasitePowerMode()) {
@@ -152,17 +157,22 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
   }
 
   if (count == 0) {
-    content += F("<i><label>brak podłączonych czujników</label></i>");
+    content += F("<i><label>");
+    content += S_NO_SENSORS_CONNECTED;
+    content += F("</label></i>");
   }
   content += F("</div>");
   content += F("</center>");
-  content += F("<button type='submit'>Zapisz znalezione DS18b20</button></form>");
+  content += F("<button type='submit'>");
+  content += S_SAVE_FOUND;
+  content += F("DS18b20</button></form>");
   content += F("<br><br>");
   content += F("<a href='");
   content += PATH_START;
   content += PATH_1WIRE;
-  content += F("'><button>Powrót</button></a></div>");
-  //  content += WebServer->SuplaCopyrightBar();
+  content += F("'><button>");
+  content += S_RETURN;
+  content += F("</button></a></div>");
 
   return content;
 }
@@ -170,7 +180,9 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
 void SuplaWebPageSensor::showDS18B20(String &content, bool readonly) {
   if (ConfigESP->getGpio(FUNCTION_DS18B20) != OFF_GPIO) {
     content += F("<div class='w'>");
-    content += F("<h3>Temperatura</h3>");
+    content += F("<h3>");
+    content += S_TEMPERATURE;
+    content += F("</h3>");
     for (uint8_t i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); i++) {
       String ds_key = KEY_DS;
       String ds_name_key = KEY_DS_NAME;
@@ -188,7 +200,7 @@ void SuplaWebPageSensor::showDS18B20(String &content, bool readonly) {
         content += F(" readonly");
       }
       content += F("><label>");
-      content += F("Nazwa ");
+      content += S_NAME;
       content += i + 1;
       content += F("</label></i>");
       content += F("<i><input name='dschlid");
@@ -371,8 +383,12 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
   page += PATH_SAVE_1WIRE;
   page += F("'>");
 #ifdef SUPLA_DHT11
-  page += F("<div class='w'><h3>Ustawienie GPIO dla DHT11</h3>");
-  page += F("<i><label>ILOŚĆ</label><input name='");
+  page += F("<div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR;
+  page += F(" DHT11</h3>");
+  page += F("<i><label>");
+  page += S_QUANTITY;
+  page += F("</label><input name='");
   page += INPUT_MAX_DHT11;
   page += F("' type='number' placeholder='0' step='1' min='0' max='");
   page += ConfigESP->countFreeGpio(FUNCTION_DHT11);
@@ -390,8 +406,12 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
 #endif
 
 #ifdef SUPLA_DHT22
-  page += F("<div class='w'><h3>Ustawienie GPIO dla DHT22</h3>");
-  page += F("<i><label>ILOŚĆ</label><input name='");
+  page += F("<div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR;
+  page += F(" DHT22</h3>");
+  page += F("<i><label>");
+  page += S_QUANTITY;
+  page += F("</label><input name='");
   page += INPUT_MAX_DHT22;
   page += F("' type='number' placeholder='0' step='1' min='0' max='");
   page += ConfigESP->countFreeGpio(FUNCTION_DHT22);
@@ -409,7 +429,9 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
 #endif
 
 #ifdef SUPLA_SI7021_SONOFF
-  page += F("<div class='w'><h3>Ustawienie GPIO dla Si7021 Sonoff</h3>");
+  page += F("<div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR;
+  page += F(" Si7021 Sonoff</h3>");
   page += F("<i><label>Si7021 Sonoff</label>");
   page += WebServer->selectGPIO(INPUT_SI7021_SONOFF, FUNCTION_SI7021_SONOFF);
   page += F("</i>");
@@ -417,8 +439,12 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
 #endif
 
 #ifdef SUPLA_DS18B20
-  page += F("<div class='w'><h3>Ustawienie GPIO dla Multi DS18B20</h3>");
-  page += F("<i><label>ILOŚĆ</label><input name='");
+  page += F("<div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR;
+  page += F(" Multi DS18B20</h3>");
+  page += F("<i><label>");
+  page += S_QUANTITY;
+  page += F("</label><input name='");
   page += INPUT_MAX_DS18B20;
   page += F("' type='number' placeholder='1' step='1' min='0' max='");
   page += MAX_DS18B20;
@@ -446,17 +472,23 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
   page += F("</div>");
 #endif
 
-  page += F("<button type='submit'>Zapisz</button></form>");
+  page += F("<button type='submit'>");
+  page += S_SAVE;
+  page += F("</button></form>");
   page += F("<br>");
   page += F("<form method='post' action='");
   page += PATH_REBOT;
   page += F("'>");
-  page += F("<button type='submit'>Restart</button></form>");
+  page += F("<button type='submit'>");
+  page += S_RESTART;
+  page += F("</button></form>");
   page += F("<br>");
   page += F("<a href='");
   page += PATH_START;
   page += PATH_DEVICE_SETTINGS;
-  page += F("'><button>Powrót</button></a></div>");
+  page += F("'><button>");
+  page += S_RETURN;
+  page += F("</button></a></div>");
   return page;
 }
 #endif
@@ -615,7 +647,9 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
   page += F("'>");
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT30)
-  page += F("<div class='w'><h3>Ustawienie GPIO dla i2c</h3>");
+  page += F("<div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR;
+  page += F(" i2c</h3>");
   page += F("<i><label>SDA</label>");
   page += WebServer->selectGPIO(INPUT_SDA_GPIO, FUNCTION_SDA);
   page += F("</i>");
@@ -648,7 +682,9 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
     page += F("' value='");
     page += ConfigManager->get(KEY_ALTITUDE_BME280)->getValue();
     page += F("' ");
-    page += F("><label>Wysokość m n.p.m.</label></i>");
+    page += F("><label>");
+    page += S_ALTITUDE_ABOVE_SEA_LEVEL;
+    page += F("</label></i>");
 #endif
 
 #ifdef SUPLA_SHT30
@@ -697,7 +733,9 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #endif
 
 #ifdef SUPLA_HC_SR04
-  page += F("<div class='w'><h3>Ustawienie GPIO dla HC-SR04</h3>");
+  page += F("<div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR;
+  page += F(" HC-SR04</h3>");
   page += F("<i><label>TRIG</label>");
   page += WebServer->selectGPIO(INPUT_TRIG_GPIO, FUNCTION_TRIG);
   page += F("</i>");
@@ -706,17 +744,23 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
   page += F("</i>");
   page += F("</div>");
 #endif
-  page += F("<button type='submit'>Zapisz</button></form>");
+  page += F("<button type='submit'>");
+  page += S_SAVE;
+  page += F("</button></form>");
   page += F("<br>");
   page += F("<form method='post' action='");
   page += PATH_REBOT;
   page += F("'>");
-  page += F("<button type='submit'>Restart</button></form>");
+  page += F("<button type='submit'>");
+  page += S_RESTART;
+  page += F("</button></form>");
   page += F("<br>");
   page += F("<a href='");
   page += PATH_START;
   page += PATH_DEVICE_SETTINGS;
-  page += F("'><button>Powrót</button></a></div>");
+  page += F("'><button>");
+  page += S_RETURN;
+  page += F("</button></a></div>");
   return page;
 }
 #endif
@@ -830,7 +874,9 @@ String SuplaWebPageSensor::supla_webpage_spi(int save) {
   page += F("'>");
 
 #if defined(SUPLA_MAX6675)
-  page += F("<div class='w'><h3>Ustawienie GPIO dla SPI</h3>");
+  page += F("<div class='w'><h3>");
+  page += S_GPIO_SETTINGS_FOR;
+  page += F(" SPI</h3>");
   page += F("<i><label>CLK</label>");
   page += WebServer->selectGPIO(INPUT_CLK_GPIO, FUNCTION_CLK);
   page += F("</i>");
@@ -865,17 +911,23 @@ String SuplaWebPageSensor::supla_webpage_spi(int save) {
   }
   page += F("</div>");
 #endif
-  page += F("<button type='submit'>Zapisz</button></form>");
+  page += F("<button type='submit'>");
+  page += S_SAVE;
+  page += F("</button></form>");
   page += F("<br>");
   page += F("<form method='post' action='");
   page += PATH_REBOT;
   page += F("'>");
-  page += F("<button type='submit'>Restart</button></form>");
+  page += F("<button type='submit'>");
+  page += S_RESTART;
+  page += F("</button></form>");
   page += F("<br>");
   page += F("<a href='");
   page += PATH_START;
   page += PATH_DEVICE_SETTINGS;
-  page += F("'><button>Powrót</button></a></div>");
+  page += F("'><button>");
+  page += S_RETURN;
+  page += F("</button></a></div>");
   return page;
 }
 #endif
diff --git a/SuplaWebServer.cpp b/SuplaWebServer.cpp
index d72a4093..7f9a97ec 100644
--- a/SuplaWebServer.cpp
+++ b/SuplaWebServer.cpp
@@ -22,6 +22,7 @@
 #include "SuplaWebPageSensor.h"
 #include "SuplaCommonPROGMEM.h"
 #include "SuplaTemplateBoard.h"
+#include "GUIGenericCommon.h"
 
 SuplaWebServer::SuplaWebServer() {
 }
@@ -148,14 +149,18 @@ String SuplaWebServer::supla_webpage_start(int save) {
   content += SuplaJavaScript();
   content += F("<form method='post'>");
   content += F("<div class='w'>");
-  content += F("<h3>Ustawienia WIFI</h3>");
+  content += F("<h3>");
+  content += S_SETTING_WIFI_SSID;
+  content += F("</h3>");
   content += F("<i><input name='");
   content += INPUT_WIFI_SSID;
   content += F("' value='");
   content += String(ConfigManager->get(KEY_WIFI_SSID)->getValue());
   content += F("' length=");
   content += MAX_SSID;
-  content += F(" required><label>Nazwa sieci</label></i>");
+  content += F(" required><label>");
+  content += S_WIFI_SSID;
+  content += F("</label></i> ");
   content += F("<i><input name='");
   content += INPUT_WIFI_PASS;
   if (ConfigESP->configModeESP != NORMAL_MODE) {
@@ -175,18 +180,23 @@ String SuplaWebServer::supla_webpage_start(int save) {
     content += MAX_PASSWORD;
     content += F(" required>");
   }
-  content += F("<label>Hasło</label></i>");
+  content += F("<label>");
+  content += S_WIFI_PASS;
+  content += F("</label></i> ");
   content += F("<i><input name='");
   content += INPUT_HOSTNAME;
   content += F("' value='");
   content += ConfigManager->get(KEY_HOST_NAME)->getValue();
   content += F("' length=");
   content += MAX_HOSTNAME;
-  content += F(" required><label>Nazwa modułu</label></i>");
+  content += F(" required><label>");
+  content += S_HOST_NAME;
+  content += F("</label></i> ");
   content += F("</div>");
-
   content += F("<div class='w'>");
-  content += F("<h3>Ustawienia SUPLA</h3>");
+  content += F("<h3>");
+  content += S_SETTING_SUPLA;
+  content += F("</h3> ");
   content += F("<i><input name='");
   content += INPUT_SERVER;
   content += F("' length=");
@@ -200,7 +210,9 @@ String SuplaWebServer::supla_webpage_start(int save) {
     content += F(" value='");
   }
   content += def_2;
-  content += F("' required><label>Adres serwera</label></i>");
+  content += F("' required><label>");
+  content += S_SUPLA_SERVER;
+  content += F("</bel></i> ");
   content += F("<i><input name='");
   content += INPUT_EMAIL;
   content += F("' length=");
@@ -214,18 +226,24 @@ String SuplaWebServer::supla_webpage_start(int save) {
     content += F(" value='");
   }
   content += def_2;
-  content += F("' required><label>Email</label></i>");
+  content += F("' required><label>");
+  content += S_SUPLA_EMAIL;
+  content += F("</label></i>");
   content += F("</div>");
 
   content += F("<div class='w'>");
-  content += F("<h3>Ustawienia administratora</h3>");
+  content += F("<h3>");
+  content += S_SETTING_ADMIN;
+  content += F("</h3>");
   content += F("<i><input name='");
   content += INPUT_MODUL_LOGIN;
   content += F("' value='");
   content += String(ConfigManager->get(KEY_LOGIN)->getValue());
   content += F("' length=");
   content += MAX_MLOGIN;
-  content += F("><label>Login</label></i>");
+  content += F("><label>");
+  content += S_LOGIN;
+  content += F("</label></i>");
   content += F("<i><input name='");
   content += INPUT_MODUL_PASS;
   if (ConfigESP->configModeESP != NORMAL_MODE) {
@@ -239,15 +257,21 @@ String SuplaWebServer::supla_webpage_start(int save) {
   content += F("' length=");
   content += MAX_MPASSWORD;
   content += F(" required>");
-  content += F("<label>Hasło</label></i>");
+  content += F("<label>");
+  content += S_LOGIN_PASS;
+  content += F("</label></i>");
   content += F("</div>");
 
 #ifdef SUPLA_ROLLERSHUTTER
   uint8_t maxrollershutter = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   if (maxrollershutter >= 2) {
     content += F("<div class='w'>");
-    content += F("<h3>Rolety</h3>");
-    content += F("<i><label>Ilość</label><input name='");
+    content += F("<h3>");
+    content += S_ROLLERSHUTTERS;
+    content += F("</h3>");
+    content += F("<i><label>");
+    content += S_QUANTITY;
+    content += F("</label><input name='");
     content += INPUT_ROLLERSHUTTER;
     content += F("' type='number' placeholder='1' step='1' min='0' max='");
     content += maxrollershutter / 2;
@@ -262,39 +286,51 @@ String SuplaWebServer::supla_webpage_start(int save) {
   WebPageSensor->showDS18B20(content, true);
 #endif
 
-  content += F("<button type='submit'>Zapisz</button></form>");
+  content += F("<button type='submit'>");
+  content += S_SAVE;
+  content += F("</button></form> ");
   content += F("<br>");
   content += F("<a href='");
   content += PATH_START;
   content += PATH_DEVICE_SETTINGS;
-  content += F("'><button>Ustawienia urządzenia</button></a>");
+  content += F("'><button>");
+  content += S_DEVICE_SETTINGS;
+  content += F("</button></a>");
   content += F("<br><br>");
   content += F("<a href='");
   content += PATH_START;
   content += PATH_UPDATE;
-  content += F("'><button>Aktualizacja</button></a>");
+  content += F("'><button>");
+  content += S_UPDATE;
+  content += F("</button></a>");
   content += F("<br><br>");
   content += F("<form method='post' action='");
   content += PATH_REBOT;
   content += F("'>");
-  content += F("<button type='submit'>Restart</button></form></div>");
+  content += F("<button type='submit'>");
+  content += S_RESTART;
+  content += F("</button></form></div>");
   return content;
 }
 
 String SuplaWebServer::supla_webpage_upddate() {
   String content = "";
   content += F("<div class='w'>");
-  content += F("<h3>Aktualizacja oprogramowania</h3>");
+  content += F("<h3>");
+  content += S_SOFTWARE_UPDATE;
+  content += F("</h3>");
   content += F("<br>");
   content += F("<center>");
   content += F("<iframe src=");
   content += UPDATE_PATH;
   content +=
-    F(">Twoja przeglądarka nie akceptuje ramek! width='200' height='100' "
-      "frameborder='100'></iframe>");
+      F(">Twoja przeglądarka nie akceptuje ramek! width='200' height='100' "
+        "frameborder='100'></iframe>");
   content += F("</center>");
   content += F("</div>");
-  content += F("<a href='/'><button>Powrót</button></a></div>");
+  content += F("<a href='/'><button>");
+  content += S_RETURN;
+  content += F("</button></a></div>");
 
   return content;
 }
@@ -316,8 +352,12 @@ String SuplaWebServer::deviceSettings(int save) {
   content += F("<form method='post' action='");
   content += PATH_SAVE_BOARD;
   content += F("'>");
-  content += F("<div class='w'><h3>Szablony płytek</h3>");
-  content += F("<i><label>Rodzaj</label><select name='");
+  content += F("<div class='w'><h3>");
+  content += S_TEMPLATE_BOARD;
+  content += F("</h3>");
+  content += F("<i><label>");
+  content += S_TYPE;
+  content += F("</label><select name='");
   content += INPUT_BOARD;
   content += F("'>");
   uint8_t selected = ConfigManager->get(KEY_BOARD)->getValueInt();
@@ -332,10 +372,13 @@ String SuplaWebServer::deviceSettings(int save) {
     content += BoardString(suported);
   }
   content += F("</select></i>");
-  content += F("</div><button type='submit'>Zapisz</button></form><br><br>");
-
+  content += F("</div><button type='submit'>");
+  content += S_SAVE;
+  content += F("</button></form><br><br>");
   content += F("<div class='w'>");
-  content += F("<h3>Ustawienia urządzenia</h3>");
+  content += F("<h3>");
+  content += S_DEVICE_SETTINGS;
+  content += F("</h3>");
   content += F("<br>");
   content += F("<center>");
 
@@ -343,7 +386,9 @@ String SuplaWebServer::deviceSettings(int save) {
   content += F("<a href='");
   content += PATH_START;
   content += PATH_RELAY;
-  content += F("'><button>PRZEKAŹNIKI</button></a>");
+  content += F("'><button>");
+  content += S_RELAYS;
+  content += F("</button></a>");
   content += F("<br><br>");
 #endif
 
@@ -351,7 +396,9 @@ String SuplaWebServer::deviceSettings(int save) {
   content += F("<a href='");
   content += PATH_START;
   content += PATH_CONTROL;
-  content += F("'><button>PRZYCISKI</button></a>");
+  content += F("'><button>");
+  content += S_BUTTONS;
+  content += F("</button></a>");
   content += F("<br><br>");
 #endif
 
@@ -359,7 +406,9 @@ String SuplaWebServer::deviceSettings(int save) {
   content += F("<a href='");
   content += PATH_START;
   content += PATH_1WIRE;
-  content += F("'><button>SENSORY 1Wire</button></a>");
+  content += F("'><button>");
+  content += S_SENSORS_1WIRE;
+  content += F("</button></a>");
   content += F("<br><br>");
 #endif
 
@@ -367,7 +416,9 @@ String SuplaWebServer::deviceSettings(int save) {
   content += F("<a href='");
   content += PATH_START;
   content += PATH_I2C;
-  content += F("'><button>SENSORY i2c</button></a>");
+  content += F("'><button>");
+  content += S_SENSORS_I2C;
+  content += F("</button></a>");
   content += F("<br><br>");
 #endif
 
@@ -375,7 +426,9 @@ String SuplaWebServer::deviceSettings(int save) {
   content += F("<a href='");
   content += PATH_START;
   content += PATH_SPI;
-  content += F("'><button>SENSORY SPI</button></a>");
+  content += F("'><button>");
+  content += S_SENSORS_SPI;
+  content += F("</button></a>");
   content += F("<br><br>");
 #endif
 
@@ -383,12 +436,16 @@ String SuplaWebServer::deviceSettings(int save) {
   content += F("<a href='");
   content += PATH_START;
   content += PATH_CONFIG;
-  content += F("'><button>LED, BUTTON CONFIG</button></a>");
+  content += F("'><button>");
+  content += S_LED_BUTTON_CFG;
+  content += F("</button></a>");
   content += F("<br><br>");
 #endif
   content += F("</div>");
   content += F("</center>");
-  content += F("<a href='/'><button>Powrót</button></a></div>");
+  content += F("<a href='/'><button>");
+  content += S_RETURN;
+  content += F("</button></a></div>");
 
   return content;
 }
@@ -425,12 +482,13 @@ void SuplaWebServer::handleBoardSave() {
 }
 
 String SuplaWebServer::selectGPIO(const char* input, uint8_t function, uint8_t nr) {
-  String page  = "";
+  String page = "";
   page += F("<select name='");
   page += input;
-  if (nr != 0 ) {
+  if (nr != 0) {
     page += nr;
-  } else {
+  }
+  else {
     nr = 1;
   }
   page += F("'>");
@@ -463,20 +521,20 @@ const String SuplaWebServer::SuplaFavicon() {
 
 const String SuplaWebServer::SuplaIconEdit() {
   return F(
-           "<img "
-           "src='data:image/"
-           "png;base64,"
-           "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAB3RJTUUH5AYHChEfgNCVHgAAAAlwSFlzAAAuIwAALiMB"
-           "eKU/dgAAAARnQU1BAACxjwv8YQUAAABBSURBVHjaY1BiwA4xhWqU/"
-           "gMxAzZhEGRAF2ZQmoGpA6R6BlSaAV34P0QYIYEmDJPAEIZJQFxSg+"
-           "kPDGFsHiQkAQDjTS5MMLyE4wAAAABJRU5ErkJggg=='>");
+      "<img "
+      "src='data:image/"
+      "png;base64,"
+      "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAB3RJTUUH5AYHChEfgNCVHgAAAAlwSFlzAAAuIwAALiMB"
+      "eKU/dgAAAARnQU1BAACxjwv8YQUAAABBSURBVHjaY1BiwA4xhWqU/"
+      "gMxAzZhEGRAF2ZQmoGpA6R6BlSaAV34P0QYIYEmDJPAEIZJQFxSg+"
+      "kPDGFsHiQkAQDjTS5MMLyE4wAAAABJRU5ErkJggg=='>");
 }
 
 const String SuplaWebServer::SuplaJavaScript(String java_return) {
   String java_script =
-    F("<script type='text/javascript'>setTimeout(function(){var "
-      "element=document.getElementById('msg');if( element != "
-      "null){element.style.visibility='hidden';location.href='");
+      F("<script type='text/javascript'>setTimeout(function(){var "
+        "element=document.getElementById('msg');if( element != "
+        "null){element.style.visibility='hidden';location.href='");
   java_script += java_return;
   java_script += F("';}},1600);</script>\n");
   return java_script;
@@ -488,22 +546,22 @@ const String SuplaWebServer::SuplaSaveResult(int save) {
   String saveresult = "";
   saveresult += F("<div id=\"msg\" class=\"c\">");
   if (save == 1) {
-    saveresult += F("Dane zapisane");
+    saveresult += S_DATA_SAVED;
   }
   else if (save == 2) {
-    saveresult += F("Restart modułu");
+    saveresult += S_RESTART_MODULE;
   }
   else if (save == 3) {
-    saveresult += F("Dane wymazane - należy zrobić restart urządzenia");
+    saveresult += S_DATA_ERASED_RESTART_DEVICE;
   }
   else if (save == 4) {
-    saveresult += F("Błąd zapisu - nie można odczytać pliku - brak partycji FS.");
+    saveresult += S_WRITE_ERROR_UNABLE_TO_READ_FILE_FS_PARTITION_MISSING;
   }
   else if (save == 5) {
-    saveresult += F("Dane zapisane - restart modułu.");
+    saveresult += S_DATA_SAVED_RESTART_MODULE;
   }
   else if (save == 6) {
-    saveresult += F("Błąd zapisu - złe dane.");
+    saveresult += S_WRITE_ERROR_BAD_DATA;
   }
   else if (save == 7) {
     saveresult += F("data saved");
diff --git a/language/en.h b/language/en.h
new file mode 100644
index 00000000..ab971024
--- /dev/null
+++ b/language/en.h
@@ -0,0 +1,59 @@
+
+#ifndef _LANGUAGE_EN_S_H_
+#define _LANGUAGE_EN_S_H_
+
+#define S_SETTING_WIFI_SSID                                    "Setting WIFI"
+#define S_WIFI_SSID                                            "Name WIFI"
+#define S_WIFI_PASS                                            "Password"
+#define S_HOST_NAME                                            "Module name"
+#define S_SETTING_SUPLA                                        "Setting SUPLA"
+#define S_SUPLA_SERVER                                         "Server address"
+#define S_SUPLA_EMAIL                                          "Email"
+#define S_SETTING_ADMIN                                        "Administrator settings"
+#define S_LOGIN                                                "Login"
+#define S_LOGIN_PASS                                           "Password"
+#define S_ROLLERSHUTTERS                                       "Roller shuter"
+#define S_SAVE                                                 "Save"
+#define S_DEVICE_SETTINGS                                      "Device settings"
+#define S_UPDATE                                               "Update"
+#define S_RESTART                                              "Restart"
+#define S_RETURN                                               "Return"
+#define S_TEMPLATE_BOARD                                       "Template board"
+#define S_TYPE                                                 "Type"
+#define S_RELAYS                                               "RELAYS"
+#define S_BUTTONS                                              "BUTTONS"
+#define S_SENSORS_1WIRE                                        "SENSORS 1Wire"
+#define S_SENSORS_I2C                                          "SENSORS i2c"
+#define S_SENSORS_SPI                                          "SENSORS SPI"
+#define S_LED_BUTTON_CFG                                       "LED, BUTTON CONFIG"
+#define S_QUANTITY                                             "QUANTITY"
+#define S_GPIO_SETTINGS_FOR_RELAYS                             "GPIO settings for relays"
+#define S_RELAY                                                "RELAYS"
+#define S_RELAY_NR_SETTINGS                                    "Settings relay nr. "
+#define S_NO_RELAY_NR                                          "No relay nr."
+#define S_STATE_CONTROL                                        "State control"
+#define S_REACTION_AFTER_RESET                                 "Reaction after reset"
+#define S_GPIO_SETTINGS_FOR_BUTTONS                            "GPIO settings for buttons"
+#define S_BUTTON                                               "BUTTON"
+#define S_BUTTON_NR_SETTINGS                                   "Setting button nr."
+#define S_NO_BUTTON_NR                                         "No button nr."
+#define S_REACTION_TO                                          "Reaction to"
+#define S_GPIO_SETTINGS_FOR_LIMIT_SWITCH                       "GPIO settings for limit switch"
+#define S_LIMIT_SWITCH                                         "LIMIT SWITCH"
+#define S_GPIO_SETTINGS_FOR                                    "GPIO settigs for"
+#define S_FOUND                                                "Found"
+#define S_NO_SENSORS_CONNECTED                                 "No sensor conected"
+#define S_SAVE_FOUND                                           "Save found"
+#define S_TEMPERATURE                                          "Temperature"
+#define S_NAME                                                 "Name"
+#define S_ALTITUDE_ABOVE_SEA_LEVEL                             "Altitude"
+#define S_GPIO_SETTINGS_FOR_CONFIG                             "GPIO settings for config"
+#define S_SOFTWARE_UPDATE                                      "Software update"
+#define S_DATA_SAVED                                           "Data saved"
+#define S_RESTART_MODULE                                       "Restart module"
+#define S_DATA_ERASED_RESTART_DEVICE                           "Data erased - restart module"
+#define S_WRITE_ERROR_UNABLE_TO_READ_FILE_FS_PARTITION_MISSING "Write error - ubable to read file FS. Partition missing"
+#define S_DATA_SAVED_RESTART_MODULE                            "Data saved - restart module"
+#define S_WRITE_ERROR_BAD_DATA                                 "Write error - bad data"
+
+#endif  // _LANGUAGE_EN_S_H_
diff --git a/language/pl.h b/language/pl.h
new file mode 100644
index 00000000..efecb24f
--- /dev/null
+++ b/language/pl.h
@@ -0,0 +1,59 @@
+
+#ifndef _LANGUAGE_PL_S_H_
+#define _LANGUAGE_PL_S_H_
+
+#define S_SETTING_WIFI_SSID                                    "Ustawienia WIFI"
+#define S_WIFI_SSID                                            "Nazwa sieci"
+#define S_WIFI_PASS                                            "Hasło"
+#define S_HOST_NAME                                            "Nazwa modułu"
+#define S_SETTING_SUPLA                                        "Ustawienia SUPLA"
+#define S_SUPLA_SERVER                                         "Adres serwera"
+#define S_SUPLA_EMAIL                                          "Email"
+#define S_SETTING_ADMIN                                        "Ustawienia administratora"
+#define S_LOGIN                                                "Login"
+#define S_LOGIN_PASS                                           "Hasło"
+#define S_ROLLERSHUTTERS                                       "Rolety"
+#define S_SAVE                                                 "Zapisz"
+#define S_DEVICE_SETTINGS                                      "Ustawienia urządzenia"
+#define S_UPDATE                                               "Aktualizacja"
+#define S_RESTART                                              "Restart"
+#define S_RETURN                                               "Powrót"
+#define S_TEMPLATE_BOARD                                       "Szablony płytek"
+#define S_TYPE                                                 "Rodzaj"
+#define S_RELAYS                                               "PRZEKAŹNIKI"
+#define S_BUTTONS                                              "PRZYCISKI"
+#define S_SENSORS_1WIRE                                        "SENSORY 1Wire"
+#define S_SENSORS_I2C                                          "SENSORY i2c"
+#define S_SENSORS_SPI                                          "SENSORY SPI"
+#define S_LED_BUTTON_CFG                                       "LED, BUTTON CONFIG"
+#define S_QUANTITY                                             "ILOŚĆ"
+#define S_GPIO_SETTINGS_FOR_RELAYS                             "Ustawienie GPIO dla przekaźników"
+#define S_RELAY                                                "PRZEKAŹNIK"
+#define S_RELAY_NR_SETTINGS                                    "Ustawienia przekaźnika nr."
+#define S_NO_RELAY_NR                                          "Brak przekaźnika nr."
+#define S_STATE_CONTROL                                        "Sterowanie stanem"
+#define S_REACTION_AFTER_RESET                                 "Reakcja po resecie"
+#define S_GPIO_SETTINGS_FOR_BUTTONS                            "Ustawienie GPIO dla przycisków"
+#define S_BUTTON                                               "PRZYCISK"
+#define S_BUTTON_NR_SETTINGS                                   "Ustawienia przycisku nr."
+#define S_NO_BUTTON_NR                                         "Brak przycisku nr."
+#define S_REACTION_TO                                          "Reakcja na"
+#define S_GPIO_SETTINGS_FOR_LIMIT_SWITCH                       "Ustawienie GPIO dla cz. otwarcia"
+#define S_LIMIT_SWITCH                                         "KRAŃCÓWKA"
+#define S_GPIO_SETTINGS_FOR                                    "Ustawienie GPIO dla"
+#define S_FOUND                                                "Znalezione"
+#define S_NO_SENSORS_CONNECTED                                 "Brak podłączonych czujników"
+#define S_SAVE_FOUND                                           "Zapisz znalezione"
+#define S_TEMPERATURE                                          "Temperatura"
+#define S_NAME                                                 "Nazwa"
+#define S_ALTITUDE_ABOVE_SEA_LEVEL                             "Wysokość m n.p.m."
+#define S_GPIO_SETTINGS_FOR_CONFIG                             "Ustawienie GPIO dla CONFIG"
+#define S_SOFTWARE_UPDATE                                      "Aktualizacja oprogramowania"
+#define S_DATA_SAVED                                           "Dane zapisane"
+#define S_RESTART_MODULE                                       "Restart modułu"
+#define S_DATA_ERASED_RESTART_DEVICE                           "Dane wymazane - należy zrobić restart urządzenia"
+#define S_WRITE_ERROR_UNABLE_TO_READ_FILE_FS_PARTITION_MISSING "Błąd zapisu - nie można odczytać pliku - brak partycji FS."
+#define S_DATA_SAVED_RESTART_MODULE                            "Dane zapisane - restart modułu."
+#define S_WRITE_ERROR_BAD_DATA                                 "Błąd zapisu - złe dane."
+
+#endif  // _LANGUAGE_PL_S_H_