From 4a89b164bd318a7270f6ffe34de6c4ff871a6fa4 Mon Sep 17 00:00:00 2001
From: gmx168 <71901960+gmx168@users.noreply.github.com>
Date: Sun, 29 Nov 2020 19:50:16 +0100
Subject: [PATCH 001/165] plik jezyka francuskiego fr.h dla Generic

---
 fr.h | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 fr.h

diff --git a/fr.h b/fr.h
new file mode 100644
index 00000000..d127405a
--- /dev/null
+++ b/fr.h
@@ -0,0 +1,105 @@
+#ifndef _LANGUAGE_FR_S_H_
+#define _LANGUAGE_FR_S_H_
+
+// translated by Fryga
+#define S_SETTING_WIFI_SSID					"Mettre à jour du WIFI"
+#define S_WIFI_SSID 						"Nom du WIFI"
+#define S_WIFI_PASS 						"Mot de passe"
+#define S_HOST_NAME 						"Nom du module"
+#define S_SETTING_SUPLA 					"Paramètres SUPLA"
+#define S_SUPLA_SERVER 						"Adresse du serveur"
+#define S_SUPLA_EMAIL 						"E-mail"
+#define S_SETTING_ADMIN 					"Paramètres administrateur"
+#define S_LOGIN 						"Connexion"
+#define S_LOGIN_PASS 						"Mot de passe"
+#define S_ROLLERSHUTTERS 					"Volet roulant"
+#define S_SAVE 							"Enregistrer"
+#define S_DEVICE_SETTINGS 					"Paramètres du module"
+#define S_UPDATE 						"Mettre à jour"
+#define S_RESTART 						"Réinitialisation"
+#define S_RETURN 						"Retour"
+#define S_TEMPLATE_BOARD 					"Modèle de la planches"
+#define S_TYPE 							"Genre"
+#define S_RELAYS 						"LES RELAIS"
+#define S_BUTTONS 						"LES BOUTONS"
+#define S_SENSORS_1WIRE 					"LES SENSORS du 1Wire"
+#define S_SENSORS_I2C 						"LES SENSORS du i2c"
+#define S_SENSORS_SPI 						"LES SENSORS du SPI"
+#define S_LED_BUTTON_CFG 					"LED, BOUTON metre à jour"
+#define S_QUANTITY 						"Quantité"
+#define S_GPIO_SETTINGS_FOR_RELAYS 				"Paramètres du GPIO pour les relais"
+#define S_RELAY 						"LE RELAIS"
+#define S_RELAY_NR_SETTINGS 					"Paramètres de la relais No."
+#define S_NO_RELAY_NR 						"Manquant numéro de relais"
+#define S_STATE_CONTROL 					"Contrôle d'état"
+#define S_REACTION_AFTER_RESET 					"Réaction après réinitialisation"
+#define S_GPIO_SETTINGS_FOR_BUTTONS 				"Paramètres GPIO pour les boutons"
+#define S_BUTTON 						"BOUTON"
+#define S_BUTTON_NR_SETTINGS 					"Bouton mettre à jour"
+#define S_NO_BUTTON_NR 						"Manquant numéro de bouton"
+#define S_REACTION_TO 						"Réaction à"
+#define S_GPIO_SETTINGS_FOR_LIMIT_SWITCH 			"Paramètres GPIO pour capteur de limite"
+#define S_LIMIT_SWITCH 						"Capteur de limite"
+#define S_GPIO_SETTINGS_FOR 					"GPIO mettre à jour pour"
+#define S_FOUND 						"Trouvé"
+#define S_NO_SENSORS_CONNECTED 					"Aucun capteur connecté"
+#define S_SAVE_FOUND 						"Enregistrer trouvé"
+#define S_TEMPERATURE 						"Température"
+#define S_NAME 							"Nom"
+#define S_ALTITUDE_ABOVE_SEA_LEVEL 				"Altitude"
+#define S_GPIO_SETTINGS_FOR_CONFIG 				"Paramètres GPIO pour la à jour"
+#define S_SOFTWARE_UPDATE 					"Mise à jour du logiciel"
+#define S_DATA_SAVED 						"Données enregistrées"
+#define S_RESTART_MODULE 					"Redémarrer le module"
+#define S_DATA_ERASED_RESTART_DEVICE 				"Données effacées - redémarrer le module"
+#define S_WRITE_ERROR_UNABLE_TO_READ_FILE_FS_PARTITION_MISSING 	"Erreur d'écriture - impossible de lire à partir du fichier FS. Partition manquante"
+#define S_DATA_SAVED_RESTART_MODULE 				"Données enregistrées - redémarrer le module"
+#define S_WRITE_ERROR_BAD_DATA 					"Erreur d'écriture - données incorrectes"
+
+//#### SuplaConfigESP.cpp ####
+#define S_ALEREADY_INITIATED 			"Déjà lancé"
+#define S_NOT_ASSIGNED_CB 			"CB non attribué"
+#define S_INVALID_GUID_OR_DEVICE_REGISTRATION_INACTIVE "GUID non valide ou enregistrement de l'appareil INACTIF"
+#define S_UNKNOWN_SEVER_ADDRESS 		"Adresse de serveur inconnue"
+#define S_UNKNOWN_ID 				"ID inconnu"
+#define S_INITIATED 				"Initié"
+#define S_CHANNEL_LIMIT_EXCEEDED 		"Limite de canal dépassée"
+#define S_DISCONNECTED 				"Déconnecté"
+#define S_REGISRATION_IS_PENDING 		"L'enregistrement est en attente"
+#define S_VARIABLE_ERROR 			"Erreur de variable"
+#define S_PROTOCOL_VERSION_ERROR 		"Erreur de version de protocole"
+#define S_BAD_CREDENTIALS 			"Informations d'identification incorrectes"
+#define S_TEMPORARILY_UNAVAILABLE 		"Temporairement indisponible"
+#define S_LOCATION_CONFLICT 			"Conflit d'emplacement"
+#define S_CHANNEL_CONFLICT 			"Conflit de canal"
+#define S_REGISTERED_AND_READY 			"Enregistré et prêt"
+#define S_DEVICE_IS_DISCONNECTED 		"L'appareil est déconnecté"
+#define S_LOCATION_IS_DISABLED 			"L'emplacement est désactivé"
+#define S_DEVICE_LIMIT_EXCEEDED 		"Limite d'appareils dépassée"
+
+// #### SuplaCommonPROGMEM.h ####
+#define S_OFF 					"ÉTEINDRE"
+#define S_ON 					"ALLUMER"
+#define S_LOW 					"BASSE"
+#define S_HIGH 					"HAUT"
+#define S_POSITION_MEMORY 			"MEMOIRE DE POSITION"
+#define S_REACTION_ON_PRESS 			"ON PRESSE"
+#define S_REACTION_ON_RELEASE 			"EN LIBÉRATION"
+#define S_REACTION_ON_CHANGE 			"SUR LE CHANGEMENT"
+#define S_CFG_10_PRESSES 			"10 FOIS SUR PRESSE"
+#define S_5SEK_HOLD 				"5 SEC TENIR"
+
+// #### SuplaTemplateBoard.h ####
+#define S_ABSENT 				"ABSENT"
+
+// #### SuplaWebPageSensor.cpp ####
+#define S_IMPULSE_COUNTER 			"Compteur d'impulsions"
+#define S_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT 	"Délai anti-rebond"
+#define S_IMPULSE_COUNTER_RAISING_EDGE 		"Bord montant"
+#define S_IMPULSE_COUNTER_PULL_UP 		"Remonter"
+#define S_IMPULSE_COUNTER_CHANGE_VALUE 		"Modifier la valeur"
+#define S_IMPULSE_COUNTER_SETTINGS_NR 		"Paramètres Compteur d'impulsions No."
+#define S_NO_IMPULSE_COUNTER_NR 		"Aucun Compteur d'impulsions No."
+
+
+#endif // _LANGUAGE_FR_S_H_
\ No newline at end of file

From 76adf54af545b49403907ce68228013478f82c28 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 30 Nov 2020 13:04:03 +0100
Subject: [PATCH 002/165] Update platformio.ini

---
 platformio.ini | 129 ++++++++++++++-----------------------------------
 1 file changed, 36 insertions(+), 93 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 9ea7a14c..dbf7d6e8 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,21 +22,6 @@ default_envs =
 
 
 [common]
-platform = espressif8266 @ 2.6.0
-upload_speed = 256000
-monitor_speed = 74880
-upload_resetmethod = nodemcu
-board_build.flash_mode = dout
-board_build.ldscript = eagle.flash.1m64.ld
-lib_deps = 
-	milesburton/DallasTemperature@^3.9.1
-	adafruit/DHT sensor library@^1.4.0
-	paulstoffregen/OneWire@^2.3.5
-	adafruit/Adafruit BME280 Library@^2.1.1
-	datacute/DoubleResetDetector@^1.0.3
-	closedcube/ClosedCube SHT31D@^1.5.1
-	adafruit/Adafruit Si7021 Library@^1.3.0
-    
 build_flags =   -D BUILD_VERSION='"GUI 1.0.1"'
                 -w
                 -DATOMIC_FS_UPDATE
@@ -56,63 +41,41 @@ build_flags =   -D BUILD_VERSION='"GUI 1.0.1"'
                 -D SUPLA_SI7021
                 -D SUPLA_MAX6675
                 -D SUPLA_HC_SR04
-                -D SUPLA_IMPULSE_COUNTER
+                -D SUPLA_IMPULSE_COUNTER             
 
-extra_scripts = tools/copy_files.py               
-              
-[env:GUI_Generic_1M]
-platform = ${common.platform}
+[env]
 framework = arduino
+platform = espressif8266 @ 2.6.0
+upload_speed = 256000
+monitor_speed = 74880
+upload_resetmethod = nodemcu
+board_build.flash_mode = dout
+board_build.ldscript = eagle.flash.1m64.ld
+lib_deps = 
+	milesburton/DallasTemperature@^3.9.1
+	adafruit/DHT sensor library@^1.4.0
+	paulstoffregen/OneWire@^2.3.5
+	adafruit/Adafruit BME280 Library@^2.1.1
+	datacute/DoubleResetDetector@^1.0.3
+	closedcube/ClosedCube SHT31D@^1.5.1
+	adafruit/Adafruit Si7021 Library@^1.3.0
+extra_scripts = tools/copy_files.py       
+
+[env:GUI_Generic_1M]
 board = esp8285
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
-;build_unflags = -D SUPLA_OTA
 build_flags =   ${common.build_flags}   
 
 [env:GUI_Generic_1M-en]
-platform = ${common.platform}
-framework = arduino
 board = esp8285
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
-;build_unflags = -D SUPLA_OTA
 build_flags =   ${common.build_flags}
 				-D UI_LANGUAGE=en     				 
 
 [env:GUI_Generic_4M]
-platform = ${common.platform}
-framework = arduino
 board = esp12e
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
 build_flags =   ${common.build_flags}
 
 [env:GUI_Generic_minimal]
-platform = ${common.platform}
 board = esp8285
-framework = arduino
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
 build_flags =   ${common.build_flags}
 build_unflags = -D SUPLA_DS18B20
                 -D SUPLA_DHT11
@@ -126,16 +89,7 @@ build_unflags = -D SUPLA_DS18B20
                 -D SUPLA_IMPULSE_COUNTER
 
 [env:GUI_Generic_lite]
-platform = ${common.platform}
 board = esp8285
-framework = arduino
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
 build_flags =   ${common.build_flags}
 build_unflags =
                 -D SUPLA_DHT11
@@ -147,16 +101,7 @@ build_unflags =
                 -D SUPLA_IMPULSE_COUNTER                
 
 [env:GUI_Generic_sensors]
-platform = ${common.platform}
 board = esp8285
-framework = arduino
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
 build_flags =   ${common.build_flags}
 build_unflags = -D SUPLA_RELAY
                 -D SUPLA_BUTTON
@@ -165,30 +110,28 @@ build_unflags = -D SUPLA_RELAY
                 -D SUPLA_CONFIG
 
 [env:GUI_Generic_DEBUG]
-platform = ${common.platform}
-framework = arduino
 board = nodemcuv2
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
 build_flags =   ${common.build_flags}
-                -D GUI_Generic 
                 -D DEBUG_MODE
+build_unflags = -DUSE_CUSTOM
 
 [env:GUI_Generic_blank]
-platform = ${common.platform}
-framework = arduino
 board = nodemcuv2
-upload_resetmethod = ${common.upload_resetmethod}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.ldscript = ${common.board_build.ldscript}
-upload_speed = ${common.upload_speed}
-monitor_speed = ${common.monitor_speed}
-lib_deps = ${common.lib_deps}
-extra_scripts = ${common.extra_scripts} 
 build_flags =   ${common.build_flags}
+build_unflags = -D SUPLA_OTA
+                -D SUPLA_RELAY
+                -D SUPLA_BUTTON
+                -D SUPLA_LIMIT_SWITCH
+                -D SUPLA_ROLLERSHUTTER
+                -D SUPLA_CONFIG
+                -D SUPLA_DS18B20
+                -D SUPLA_DHT11
+                -D SUPLA_DHT22
+                -D SUPLA_SI7021_SONOFF
+                -D SUPLA_BME280
+                -D SUPLA_SHT3x
+                -D SUPLA_SI7021
+                -D SUPLA_MAX6675
+                -D SUPLA_HC_SR04
+                -D SUPLA_IMPULSE_COUNTER    
   
\ No newline at end of file

From 3b47fb864220734bef256335c3b51d56e7fcbbde Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 1 Dec 2020 11:32:20 +0100
Subject: [PATCH 003/165] =?UTF-8?q?nowy=20spos=C3=B3b=20wyznaczania=20-=20?=
 =?UTF-8?q?const=20char=20*key=20->=20uint8=5Ft=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Markup.cpp              |  12 ++--
 src/Markup.h                |   8 +--
 src/SuplaConfigESP.cpp      | 114 ++++++++++++++++--------------------
 src/SuplaConfigManager.cpp  |  62 +++++++++-----------
 src/SuplaConfigManager.h    |  78 ++++++++++++------------
 src/SuplaDeviceGUI.cpp      |   7 +--
 src/SuplaWebPageConfig.cpp  |  35 +++++------
 src/SuplaWebPageControl.cpp |   7 +--
 src/SuplaWebPageRelay.cpp   |   9 ++-
 src/SuplaWebPageSensor.cpp  |  37 +++++-------
 src/SuplaWebServer.cpp      |  20 +++----
 11 files changed, 181 insertions(+), 208 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index cd91f446..a2901b00 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -15,7 +15,7 @@ void addFormHeaderEnd(String& html) {
 void addTextBox(String& html,
                 const String& input_id,
                 const String& name,
-                const String& value_key,
+                uint8_t value_key,
                 const String& placeholder,
                 int minlength,
                 int maxlength,
@@ -36,7 +36,7 @@ void addTextBox(String& html,
   }
 
   html += F("' value='");
-  String value = String(ConfigManager->get(value_key.c_str())->getValue());
+  String value = String(ConfigManager->get(value_key)->getValue());
   if (value != placeholder) {
     html += value;
   }
@@ -64,16 +64,16 @@ void addTextBox(String& html,
 }
 
 void addTextBox(
-    String& html, const String& input_id, const String& name, const String& value_key, int minlength, int maxlength, bool required, bool readonly) {
+    String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required, bool readonly) {
   return addTextBox(html, input_id, name, value_key, "", minlength, maxlength, required, readonly, false);
 }
 
 void addTextBoxPassword(
-    String& html, const String& input_id, const String& name, const String& value_key, int minlength, int maxlength, bool required) {
+    String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required) {
   return addTextBox(html, input_id, name, value_key, "", minlength, maxlength, required, false, true);
 }
 
-void addNumberBox(String& html, const String& input_id, const String& name, const String& value_key, uint16_t max) {
+void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max) {
   html += F("<i><label>");
   html += name;
   html += F("</label><input name='");
@@ -81,7 +81,7 @@ void addNumberBox(String& html, const String& input_id, const String& name, cons
   html += F("' type='number' placeholder='0' step='1' min='0' max='");
   html += String(max);
   html += F("' value='");
-  html += String(ConfigManager->get(value_key.c_str())->getValue());
+  html += String(ConfigManager->get(value_key)->getValue());
   html += F("'></i>");
 }
 
diff --git a/src/Markup.h b/src/Markup.h
index a29d4900..3613c9e5 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -8,7 +8,7 @@ void addFormHeaderEnd(String& html);
 void addTextBox(String& html,
                 const String& input_id,
                 const String& name,
-                const String& value_key,
+                uint8_t value_key,
                 const String& placeholder,
                 int minlength,
                 int maxlength,
@@ -18,15 +18,15 @@ void addTextBox(String& html,
 void addTextBox(String& html,
                 const String& input_id,
                 const String& name,
-                const String& value_key,
+                uint8_t value_key,
                 int minlength,
                 int maxlength,
                 bool required,
                 bool readonly = false);
 void addTextBoxPassword(
-    String& html, const String& input_id, const String& value_key, const String& name, int minlength, int maxlength, bool required);
+    String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required);
 
-void addNumberBox(String& html, const String& input_id, const String& name, const String& value_key, uint16_t max);
+void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
 
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0);
 
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index a85d26bb..16a0a381 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -237,17 +237,15 @@ void status_func(int status, const char *msg) {
 }
 
 int SuplaConfigESP::getGpio(int nr, int function) {
-  uint8_t gpio;
-  for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
-    String key = GPIO;
-    key += gpio;
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
     if (function == FUNCTION_CFG_BUTTON) {
       if (checkBusyCfg(gpio)) {
         return gpio;
       }
     }
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == function) {
-      if (ConfigManager->get(key.c_str())->getElement(NR).toInt() == nr) {
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
         return gpio;
       }
     }
@@ -256,13 +254,11 @@ int SuplaConfigESP::getGpio(int nr, int function) {
 }
 
 int SuplaConfigESP::getLevel(int nr, int function) {
-  uint8_t gpio;
-  for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
-    String key = GPIO;
-    key += gpio;
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == function) {
-      if (ConfigManager->get(key.c_str())->getElement(NR).toInt() == nr) {
-        uint8_t level = ConfigManager->get(key.c_str())->getElement(LEVEL).toInt();
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
+        uint8_t level = ConfigManager->get(key)->getElement(LEVEL).toInt();
         return level;
       }
     }
@@ -271,13 +267,11 @@ int SuplaConfigESP::getLevel(int nr, int function) {
 }
 
 int SuplaConfigESP::getMemory(int nr, int function) {
-  uint8_t gpio;
-  for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
-    String key = GPIO;
-    key += gpio;
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == function) {
-      if (ConfigManager->get(key.c_str())->getElement(NR).toInt() == nr) {
-        uint8_t level = ConfigManager->get(key.c_str())->getElement(MEMORY).toInt();
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
+        uint8_t level = ConfigManager->get(key)->getElement(MEMORY).toInt();
         return level;
       }
     }
@@ -285,9 +279,8 @@ int SuplaConfigESP::getMemory(int nr, int function) {
   return OFF_GPIO;
 }
 bool SuplaConfigESP::checkBusyCfg(int gpio) {
-  String key = GPIO;
-  key += gpio;
-  if (ConfigManager->get(key.c_str())->getElement(FUNCTION_CFG_LED).toInt() == 1) {
+  uint8_t key = KEY_GPIO + gpio;
+  if (ConfigManager->get(key)->getElement(FUNCTION_CFG_LED).toInt() == 1) {
     return true;
   }
   return false;
@@ -298,9 +291,9 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
     return true;
   }
   else {
-    String key = GPIO;
-    key += gpio;
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == FUNCTION_BUTTON) {
+    uint8_t key = KEY_GPIO + gpio;
+
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_BUTTON) {
       if (function == FUNCTION_CFG_BUTTON) {
         return false;
       }
@@ -310,8 +303,8 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
         return true;
       }
     }
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() != FUNCTION_OFF) {
-      if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() != function) {
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() != FUNCTION_OFF) {
+      if (ConfigManager->get(key)->getElement(FUNCTION).toInt() != function) {
         return true;
       }
     }
@@ -320,43 +313,42 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
 }
 
 void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory) {
-  String key = GPIO;
-  key += gpio;
+  uint8_t key = KEY_GPIO + gpio;
+
   if (function == FUNCTION_CFG_BUTTON) {
-    ConfigManager->setElement(key.c_str(), CFG, 1);
+    ConfigManager->setElement(key, CFG, 1);
     return;
   }
 
-  ConfigManager->setElement(key.c_str(), NR, nr);
-  ConfigManager->setElement(key.c_str(), FUNCTION, function);
-  ConfigManager->setElement(key.c_str(), LEVEL, level);
-  ConfigManager->setElement(key.c_str(), MEMORY, memory);
+  ConfigManager->setElement(key, NR, nr);
+  ConfigManager->setElement(key, FUNCTION, function);
+  ConfigManager->setElement(key, LEVEL, level);
+  ConfigManager->setElement(key, MEMORY, memory);
 
   // ConfigManager->setElement(key.c_str(), MEMORY, memory);
   // ConfigManager->setElement(key.c_str(), CFG, cfg);
 }
 
 void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
-  String key = GPIO;
-  key += gpio;
+  uint8_t key = KEY_GPIO + gpio;
+
   if (function == FUNCTION_CFG_BUTTON) {
-    ConfigManager->setElement(key.c_str(), CFG, 0);
+    ConfigManager->setElement(key, CFG, 0);
     return;
   }
-  ConfigManager->setElement(key.c_str(), NR, 0);
-  ConfigManager->setElement(key.c_str(), FUNCTION, FUNCTION_OFF);
-  ConfigManager->setElement(key.c_str(), LEVEL, 0);
-  ConfigManager->setElement(key.c_str(), MEMORY, 0);
+  ConfigManager->setElement(key, NR, 0);
+  ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
+  ConfigManager->setElement(key, LEVEL, 0);
+  ConfigManager->setElement(key, MEMORY, 0);
 }
 
 uint8_t SuplaConfigESP::countFreeGpio(uint8_t exception) {
   uint8_t count = 0;
   for (uint8_t gpio = 0; gpio < OFF_GPIO; gpio++) {
     if (gpio != 6 && gpio != 7 && gpio != 8 && gpio != 11) {
-      String key = GPIO;
-      key += gpio;
-      if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == FUNCTION_OFF ||
-          ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == exception) {
+      uint8_t key = KEY_GPIO + gpio;
+      if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF ||
+          ConfigManager->get(key)->getElement(FUNCTION).toInt() == exception) {
         count++;
       }
     }
@@ -377,35 +369,31 @@ void SuplaConfigESP::factoryReset() {
     ConfigManager->set(KEY_HOST_NAME, DEFAULT_HOSTNAME);
     ConfigManager->set(KEY_LOGIN, DEFAULT_LOGIN);
     ConfigManager->set(KEY_LOGIN_PASS, DEFAULT_LOGIN_PASS);
-    ConfigManager->set(KEY_MAX_ROLLERSHUTTER, "0");
     ConfigManager->set(KEY_MAX_RELAY, "1");
     ConfigManager->set(KEY_MAX_BUTTON, "1");
     ConfigManager->set(KEY_MAX_LIMIT_SWITCH, "0");
     ConfigManager->set(KEY_MAX_DHT22, "1");
     ConfigManager->set(KEY_MAX_DHT11, "1");
     ConfigManager->set(KEY_MULTI_MAX_DS18B20, "1");
+    ConfigManager->set(KEY_MAX_ROLLERSHUTTER, "0");
     ConfigManager->set(KEY_ALTITUDE_BME280, "0");
-
-    int nr;
-    String key;
-
-    for (nr = 0; nr <= 17; nr++) {
-      key = GPIO;
-      key += nr;
-      ConfigManager->set(key.c_str(), "0,0,0,0,0");
-    }
-
+    ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, "0");
+    ConfigManager->set(KEY_MAX_IMPULSE_COUNTER, "0");
     ConfigManager->set(KEY_ACTIVE_SENSOR, "0,0,0,0,0");
     ConfigManager->set(KEY_BOARD, "0");
     ConfigManager->set(KEY_CFG_MODE, "0");
 
+    uint8_t nr, key;
+    for (nr = 0; nr <= 17; nr++) {
+      key = KEY_GPIO + nr;
+      ConfigManager->set(key, "0,0,0,0,0");
+    }
+
     for (nr = 0; nr <= MAX_DS18B20; nr++) {
-      key = KEY_DS;
-      key += nr;
-      ConfigManager->set(key.c_str(), "");
-      key = KEY_DS_NAME;
-      key += nr;
-      ConfigManager->set(key.c_str(), "");
+      key = KEY_DS + nr;
+      ConfigManager->set(key, "");
+      key = KEY_DS_NAME + nr;
+      ConfigManager->set(key, "");
     }
 
     ConfigManager->save();
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index ec4d8823..cb78f92d 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -26,21 +26,22 @@
 
 #define CONFIG_FILE_PATH "/dat"
 
-ConfigOption::ConfigOption(const char *key, const char *value, int maxLength) {
+ConfigOption::ConfigOption(uint8_t key, const char *value, int maxLength) {
   // size_t size = strlen(key) + 1;
   // _key = (char *)malloc(sizeof(char) * size);
   // memcpy(_key, key, size - 1);
   // _key[size - 1] = 0;
-  size_t size = strlen(key) + 1;
+  /*size_t size = strlen(key) + 1;
   _key = new char[size];
   strncpy(_key, key, size);
   _key[size - 1] = '\0';
-
+*/
+  _key = key; 
   _maxLength = maxLength + 1;
   setValue(value);
 }
 
-const char *ConfigOption::getKey() {
+uint8_t ConfigOption::getKey() {
   return _key;
 }
 
@@ -151,37 +152,32 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_HOST_NAME, DEFAULT_HOSTNAME, MAX_HOSTNAME);
   this->addKey(KEY_SUPLA_SERVER, DEFAULT_SERVER, MAX_SUPLA_SERVER);
   this->addKey(KEY_SUPLA_EMAIL, DEFAULT_EMAIL, MAX_EMAIL);
-  this->addKey(KEY_MAX_ROLLERSHUTTER, "0", 2);
   this->addKey(KEY_MAX_RELAY, "0", 2);
   this->addKey(KEY_MAX_BUTTON, "0", 2);
   this->addKey(KEY_MAX_LIMIT_SWITCH, "0", 2);
   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_MAX_ROLLERSHUTTER, "0", 2);
   this->addKey(KEY_ALTITUDE_BME280, "0", 4);
   this->addKey(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, "10", 4);
   this->addKey(KEY_MAX_IMPULSE_COUNTER, "0", 2);
+  this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 14);
+  this->addKey(KEY_BOARD, "0", 2);
+  this->addKey(KEY_CFG_MODE, "0", 2);
 
-  int nr;
-  String key;
+  uint8_t nr, key;
 
   for (nr = 0; nr <= 17; nr++) {
-    key = GPIO;
-    key += nr;
-    this->addKey(key.c_str(), "0,0,0,0,0", 14);
+    key = KEY_GPIO + nr;
+    this->addKey(key, "0,0,0,0,0", 14);
   }
 
-  this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 14);
-  this->addKey(KEY_BOARD, "0", 2);
-  this->addKey(KEY_CFG_MODE, "0", 2);
-
   for (nr = 0; nr <= MAX_DS18B20; nr++) {
-    key = KEY_DS;
-    key += nr;
-    this->addKey(key.c_str(), MAX_DS18B20_ADDRESS_HEX);
-    key = KEY_DS_NAME;
-    key += nr;
-    this->addKey(key.c_str(), MAX_DS18B20_NAME);
+    key = KEY_DS + nr;
+    this->addKey(key, MAX_DS18B20_ADDRESS_HEX);
+    key = KEY_DS_NAME + nr;
+    this->addKey(key, MAX_DS18B20_NAME);
   }
   this->load();
   //  switch (this->load()) {
@@ -203,11 +199,11 @@ SuplaConfigManager::SuplaConfigManager() {
   //  }
 }
 
-uint8_t SuplaConfigManager::addKey(const char *key, int maxLength) {
+uint8_t SuplaConfigManager::addKey(uint8_t key, int maxLength) {
   return addKey(key, "", maxLength);
 }
 
-uint8_t SuplaConfigManager::addKey(const char *key, const char *value, int maxLength) {
+uint8_t SuplaConfigManager::addKey(uint8_t key, const char *value, int maxLength) {
   if (_optionCount == CONFIG_MAX_OPTIONS) {
     return E_CONFIG_MAX;
   }
@@ -217,7 +213,7 @@ uint8_t SuplaConfigManager::addKey(const char *key, const char *value, int maxLe
   return E_CONFIG_OK;
 }
 
-uint8_t SuplaConfigManager::addKeyAndRead(const char *key, const char *value, int maxLength) {
+uint8_t SuplaConfigManager::addKeyAndRead(uint8_t key, const char *value, int maxLength) {
   addKey(key, maxLength);
   if (this->loadItem(key) != E_CONFIG_OK) {
     this->set(key, value);
@@ -225,9 +221,9 @@ uint8_t SuplaConfigManager::addKeyAndRead(const char *key, const char *value, in
   return E_CONFIG_OK;
 }
 
-uint8_t SuplaConfigManager::deleteKey(const char *key) {
+uint8_t SuplaConfigManager::deleteKey(uint8_t key) {
   for (int i = 0; i < _optionCount; i++) {
-    if (strcmp(_options[i]->getKey(), key) == 0) {
+    if (_options[i]->getKey() == key) {
       delete _options[_optionCount];
       _optionCount -= 1;
     }
@@ -281,7 +277,7 @@ uint8_t SuplaConfigManager::load() {
   }
 }
 
-uint8_t SuplaConfigManager::loadItem(const char *key) {
+uint8_t SuplaConfigManager::loadItem(uint8_t key) {
   if (SPIFFS.begin()) {
     if (SPIFFS.exists(CONFIG_FILE_PATH)) {
       File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
@@ -299,7 +295,7 @@ uint8_t SuplaConfigManager::loadItem(const char *key) {
         configFile.read(content, length);
 
         for (i = 0; i < _optionCount; i++) {
-          if (strcmp(_options[i]->getKey(), key) == 0) {
+          if (_options[i]->getKey() == key) {
             _options[i]->setValue((const char *)(content + offset));
           }
           offset += _options[i]->getLength();
@@ -369,18 +365,18 @@ bool SuplaConfigManager::isDeviceConfigured() {
          strcmp(this->get(KEY_LOGIN)->getValue(), "") == 0;
 }
 
-ConfigOption *SuplaConfigManager::get(const char *key) {
+ConfigOption *SuplaConfigManager::get(uint8_t key) {
   for (int i = 0; i < _optionCount; i++) {
-    if (strcmp(_options[i]->getKey(), key) == 0) {
+    if (_options[i]->getKey() == key) {
       return _options[i];
     }
   }
   return NULL;
 }
 
-bool SuplaConfigManager::set(const char *key, const char *value) {
+bool SuplaConfigManager::set(uint8_t key, const char *value) {
   for (int i = 0; i < _optionCount; i++) {
-    if (strcmp(key, _options[i]->getKey()) == 0) {
+    if (key == _options[i]->getKey()) {
       _options[i]->setValue(value);
       return true;
     }
@@ -388,9 +384,9 @@ bool SuplaConfigManager::set(const char *key, const char *value) {
   return false;
 }
 
-bool SuplaConfigManager::setElement(const char *key, int index, int newvalue) {
+bool SuplaConfigManager::setElement(uint8_t key, int index, int newvalue) {
   for (int i = 0; i < _optionCount; i++) {
-    if (strcmp(key, _options[i]->getKey()) == 0) {
+    if (key == _options[i]->getKey()) {
       String data = _options[i]->replaceElement(index, newvalue);
       _options[i]->setValue(data.c_str());
       return true;
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index ce736f55..7d36b9a1 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -25,33 +25,35 @@
 #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 KEY_CFG_MODE                         "cfgmode"
-#define KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT "icDebounceTimeout"
-#define KEY_MAX_IMPULSE_COUNTER              "maxicRaisingEdge"
-
-#define GPIO      "GPIO"
+enum _key {
+KEY_SUPLA_GUID,
+KEY_SUPLA_AUTHKEY,
+KEY_WIFI_SSID,
+KEY_WIFI_PASS,
+KEY_LOGIN,
+KEY_LOGIN_PASS,
+KEY_HOST_NAME,
+KEY_SUPLA_SERVER,
+KEY_SUPLA_EMAIL,
+KEY_MAX_RELAY,
+KEY_MAX_BUTTON,
+KEY_MAX_LIMIT_SWITCH,
+KEY_MAX_DHT22,
+KEY_MAX_DHT11,
+KEY_MULTI_MAX_DS18B20,
+KEY_MAX_ROLLERSHUTTER,
+KEY_ALTITUDE_BME280,
+KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT,
+KEY_MAX_IMPULSE_COUNTER,
+KEY_ACTIVE_SENSOR,
+KEY_BOARD,
+KEY_CFG_MODE,
+KEY_GPIO = 40,
+KEY_DS = 57,
+KEY_DS_NAME
+};
+
+//#define GPIO      "GPIO"
 #define SEPARATOR ','
 
 enum _settings
@@ -117,8 +119,8 @@ enum _e_onfig
 
 class ConfigOption {
  public:
-  ConfigOption(const char *key, const char *value, int maxLength);
-  const char *getKey();
+  ConfigOption(uint8_t key, const char *value, int maxLength);
+  uint8_t getKey();
   const char *getValue();
   int getValueInt();
   uint8_t *getValueBin(size_t size);
@@ -131,7 +133,7 @@ class ConfigOption {
   String replaceElement(int index, int value);
 
  private:
-  char *_key;
+  uint8_t _key;
   char *_value;
   int _maxLength;
 };
@@ -139,18 +141,18 @@ class ConfigOption {
 class SuplaConfigManager {
  public:
   SuplaConfigManager();
-  uint8_t addKey(const char *key, int maxLength);
-  uint8_t addKey(const char *key, const char *value, int maxLength);
-  uint8_t addKeyAndRead(const char *key, const char *value, int maxLength);
-  uint8_t deleteKey(const char *key);
+  uint8_t addKey(uint8_t key, int maxLength);
+  uint8_t addKey(uint8_t key, const char *value, int maxLength);
+  uint8_t addKeyAndRead(uint8_t key, const char *value, int maxLength);
+  uint8_t deleteKey(uint8_t key);
   uint8_t load();
-  uint8_t loadItem(const char *key);
+  uint8_t loadItem(uint8_t key);
   uint8_t save();
   void showAllValue();
 
-  ConfigOption *get(const char *key);
-  bool set(const char *key, const char *value);
-  bool setElement(const char *key, int index, int newvalue);
+  ConfigOption *get(uint8_t key);
+  bool set(uint8_t key, const char *value);
+  bool setElement(uint8_t key, int index, int newvalue);
 
   bool isDeviceConfigured();
   void setGUIDandAUTHKEY();
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index b70dc6c4..28da64d2 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -89,10 +89,9 @@ void addRelayButton(int pinRelay, int pinButton, bool highIsOn) {
 void addDS18B20MultiThermometer(int pinNumber) {
   if (ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt() > 1) {
     for (int i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); ++i) {
-      String ds_key = KEY_DS;
-      ds_key += i;
-      sensorDS.push_back(new DS18B20(pinNumber, ConfigManager->get(ds_key.c_str())->getValueBin(MAX_DS18B20_ADDRESS)));
-      supla_log(LOG_DEBUG, "Index %d - address %s", i, ConfigManager->get(ds_key.c_str())->getValue());
+      uint8_t ds_key = KEY_DS + i;
+      sensorDS.push_back(new DS18B20(pinNumber, ConfigManager->get(ds_key)->getValueBin(MAX_DS18B20_ADDRESS)));
+      supla_log(LOG_DEBUG, "Index %d - address %s", i, ConfigManager->get(ds_key)->getValue());
     }
   }
   else {
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index d36720f5..724b36f6 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -36,25 +36,24 @@ void SuplaWebPageConfig::handleConfigSave() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String key, input;
+  String input;
+  uint8_t key;
   input = INPUT_CFG_LED_GPIO;
-  key = GPIO;
-  key += WebServer->httpServer.arg(input).toInt();
+  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
+
   if (ConfigESP->getGpio(FUNCTION_CFG_LED) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
     ConfigESP->clearGpio(ConfigESP->getGpio(FUNCTION_CFG_LED));
   }
   if (WebServer->httpServer.arg(input).toInt() != OFF_GPIO) {
-    key = GPIO;
-    key += WebServer->httpServer.arg(input).toInt();
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
+    key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
       ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), 1, FUNCTION_CFG_LED, 1);
     }
     else if (ConfigESP->getGpio(FUNCTION_CFG_LED) == WebServer->httpServer.arg(input).toInt() &&
-             ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == FUNCTION_CFG_LED) {
-      key = GPIO;
-      key += ConfigESP->getGpio(FUNCTION_CFG_LED);
+             ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_CFG_LED) {
+      key = KEY_GPIO + ConfigESP->getGpio(FUNCTION_CFG_LED);
       input = INPUT_CFG_LED_LEVEL;
-      ConfigManager->setElement(key.c_str(), LEVEL, WebServer->httpServer.arg(input).toInt());
+      ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
     }
     else {
       WebServer->sendContent(supla_webpage_config(6));
@@ -63,22 +62,20 @@ void SuplaWebPageConfig::handleConfigSave() {
   }
 
   input = INPUT_CFG_BTN_GPIO;
-  key = GPIO;
-  key += WebServer->httpServer.arg(input).toInt();
+  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
   if (ConfigESP->getGpio(FUNCTION_CFG_BUTTON) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
     ConfigESP->clearGpio(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
   }
   if (WebServer->httpServer.arg(input).toInt() != OFF_GPIO) {
-    key = GPIO;
-    key += WebServer->httpServer.arg(input).toInt();
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == FUNCTION_OFF ||
+    key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF ||
         (ConfigESP->getGpio(FUNCTION_CFG_BUTTON) == WebServer->httpServer.arg(input).toInt() &&
-         ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == FUNCTION_CFG_BUTTON)) {
+         ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_CFG_BUTTON)) {
       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);
-      ConfigESP->setGpio(key.toInt(), FUNCTION_CFG_BUTTON);
+      // ConfigManager->setElement(key, CFG, 1);
+      ConfigESP->setGpio(key, FUNCTION_CFG_BUTTON);
     }
     else {
       WebServer->sendContent(supla_webpage_config(6));
@@ -95,7 +92,7 @@ void SuplaWebPageConfig::handleConfigSave() {
       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 (ConfigManager->get(key)->getElement(CFG).toInt() == 1) { ConfigManager->setElement(key, CFG, 0);
         }
       }
     }
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 725a8ddf..307a410c 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -145,7 +145,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String readUrl, nr_button, key, input;
+  String readUrl, nr_button, input;
   uint8_t place;
 
   String path = PATH_START;
@@ -154,12 +154,11 @@ void SuplaWebPageControl::handleButtonSaveSet() {
 
   place = readUrl.indexOf(path);
   nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
-  key = GPIO;
-  key += ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
+  uint8_t key = KEY_GPIO + ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
 
   input = INPUT_BUTTON_LEVEL;
   input += nr_button;
-  ConfigManager->setElement(key.c_str(), LEVEL, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 4e3bf9a5..86e24207 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -119,7 +119,7 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String readUrl, nr_relay, key, input;
+  String readUrl, nr_relay, input;
   uint8_t place;
 
   String path = PATH_START;
@@ -128,16 +128,15 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
 
   place = readUrl.indexOf(path);
   nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
-  key = GPIO;
-  key += ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY);
+  uint8_t key = KEY_GPIO + ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY);
 
   input = INPUT_RELAY_MEMORY;
   input += nr_relay;
-  ConfigManager->setElement(key.c_str(), MEMORY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
 
   input = INPUT_RELAY_LEVEL;
   input += nr_relay;
-  ConfigManager->setElement(key.c_str(), LEVEL, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 7fe08b19..6cd19426 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -88,20 +88,18 @@ void SuplaWebPageSensor::handleDSSave() {
       return WebServer->httpServer.requestAuthentication();
   }
   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;
-    ds_key += i;
-    ds_name_key += i;
+    uint8_t ds_key = KEY_DS + i;
+    uint8_t ds_name_key = KEY_DS_NAME + i;
 
     String ds = F("dschlid");
     String ds_name = F("dsnameid");
     ds += i;
     ds_name += i;
 
-    ConfigManager->set(ds_key.c_str(), WebServer->httpServer.arg(ds).c_str());
-    ConfigManager->set(ds_name_key.c_str(), WebServer->httpServer.arg(ds_name).c_str());
+    ConfigManager->set(ds_key, WebServer->httpServer.arg(ds).c_str());
+    ConfigManager->set(ds_name_key, WebServer->httpServer.arg(ds_name).c_str());
 
-    Supla::GUI::sensorDS[i]->setDeviceAddress(ConfigManager->get(ds_key.c_str())->getValueBin(MAX_DS18B20_ADDRESS));
+    Supla::GUI::sensorDS[i]->setDeviceAddress(ConfigManager->get(ds_key)->getValueBin(MAX_DS18B20_ADDRESS));
   }
 
   switch (ConfigManager->save()) {
@@ -208,16 +206,14 @@ void SuplaWebPageSensor::showDS18B20(String &content, bool readonly) {
     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;
-      ds_key += i;
-      ds_name_key += i;
+      uint8_t ds_key = KEY_DS + i;
+      uint8_t ds_name_key = KEY_DS_NAME + i;
 
       double temp = Supla::GUI::sensorDS[i]->getValue();
       content += F("<i style='border-bottom:none !important;'><input name='dsnameid");
       content += i;
       content += F("' value='");
-      content += String(ConfigManager->get(ds_name_key.c_str())->getValue());
+      content += String(ConfigManager->get(ds_name_key)->getValue());
       content += F("' maxlength=");
       content += MAX_DS18B20_NAME;
       if (readonly) {
@@ -230,7 +226,7 @@ void SuplaWebPageSensor::showDS18B20(String &content, bool readonly) {
       content += F("<i><input name='dschlid");
       content += i;
       content += F("' value='");
-      content += String(ConfigManager->get(ds_key.c_str())->getValue());
+      content += String(ConfigManager->get(ds_key)->getValue());
       content += F("' maxlength=");
       content += MAX_DS18B20_ADDRESS_HEX;
       if (readonly) {
@@ -407,8 +403,8 @@ void SuplaWebPageSensor::handlei2cSave() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String key, input;
-  uint8_t nr, current_value, last_value;
+  String input;
+  uint8_t key, nr, current_value, last_value;
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x)
   if (!WebServer->saveGPIO(INPUT_SDA_GPIO, FUNCTION_SDA)) {
@@ -431,7 +427,7 @@ void SuplaWebPageSensor::handlei2cSave() {
   key = KEY_ALTITUDE_BME280;
   input = INPUT_ALTITUDE_BME280;
   if (strcmp(WebServer->httpServer.arg(INPUT_ALTITUDE_BME280).c_str(), "") != 0) {
-    ConfigManager->set(key.c_str(), WebServer->httpServer.arg(input).c_str());
+    ConfigManager->set(key, WebServer->httpServer.arg(input).c_str());
   }
 #endif
 
@@ -727,7 +723,7 @@ void SuplaWebPageSensor::handleImpulseCounterSaveSet() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String readUrl, nr, key, input;
+  String readUrl, nr, input;
   uint8_t place;
 
   String path = PATH_START;
@@ -736,16 +732,15 @@ void SuplaWebPageSensor::handleImpulseCounterSaveSet() {
 
   place = readUrl.indexOf(path);
   nr = readUrl.substring(place + path.length(), place + path.length() + 3);
-  key = GPIO;
-  key += ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
+  uint8_t key = KEY_GPIO + ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
 
   input = INPUT_IMPULSE_COUNTER_PULL_UP;
   input += nr;
-  ConfigManager->setElement(key.c_str(), MEMORY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
 
   input = INPUT_IMPULSE_COUNTER_RAISING_EDGE;
   input += nr;
-  ConfigManager->setElement(key.c_str(), LEVEL, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
 
   ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
   Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 7dd25519..c91df308 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -348,11 +348,10 @@ void SuplaWebServer::handleBoardSave() {
     ConfigManager->set(KEY_BOARD, httpServer.arg(input).c_str());
 
     int nr;
-    String key;
+    uint8_t key;
     for (nr = 0; nr <= 17; nr++) {
-      key = GPIO;
-      key += nr;
-      ConfigManager->set(key.c_str(), "0,0,0,0,0");
+      key = KEY_GPIO + nr;
+      ConfigManager->set(key, "0,0,0,0,0");
     }
 
     chooseTemplateBoard(WebServer->httpServer.arg(input).toInt());
@@ -488,8 +487,8 @@ void SuplaWebServer::handleNotFound() {
 }
 
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t current_value;
-  String key, input;
+  uint8_t current_value, key;
+  String input;
   input = _input;
   if (nr != 0) {
     input += nr;
@@ -498,19 +497,18 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
     nr = 1;
   }
 
-  key = GPIO;
-  key += WebServer->httpServer.arg(input).toInt();
+  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();;
 
   if (ConfigESP->getGpio(nr, function) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
     ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
   }
 
   if (WebServer->httpServer.arg(input).toInt() != OFF_GPIO) {
-    if (ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
       ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), nr, function, 1);
     }
     else if (ConfigESP->getGpio(nr, function) == WebServer->httpServer.arg(input).toInt() &&
-             ConfigManager->get(key.c_str())->getElement(FUNCTION).toInt() == function) {
+             ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), nr, function, ConfigESP->getLevel(nr, function));
     }
     else {
@@ -520,7 +518,7 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
 
   if (input_max != "\n") {
     current_value = WebServer->httpServer.arg(input_max).toInt();
-    if (ConfigManager->get(key.c_str())->getElement(NR).toInt() > current_value) {
+    if (ConfigManager->get(key)->getElement(NR).toInt() > current_value) {
       ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
     }
   }

From f3b1928b5c5d33b554f461be275bc6ea6a0dfcee Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 2 Dec 2020 17:44:31 +0100
Subject: [PATCH 004/165] =?UTF-8?q?zachowanie=20wstecznej=20kompatybilno?=
 =?UTF-8?q?=C5=9Bci=20kluczy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaConfigManager.cpp | 12 ++++++-----
 src/SuplaConfigManager.h   | 43 +++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index cb78f92d..7ba808aa 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -152,26 +152,27 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_HOST_NAME, DEFAULT_HOSTNAME, MAX_HOSTNAME);
   this->addKey(KEY_SUPLA_SERVER, DEFAULT_SERVER, MAX_SUPLA_SERVER);
   this->addKey(KEY_SUPLA_EMAIL, DEFAULT_EMAIL, MAX_EMAIL);
+  this->addKey(KEY_MAX_ROLLERSHUTTER, "0", 2);
   this->addKey(KEY_MAX_RELAY, "0", 2);
   this->addKey(KEY_MAX_BUTTON, "0", 2);
   this->addKey(KEY_MAX_LIMIT_SWITCH, "0", 2);
   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_MAX_ROLLERSHUTTER, "0", 2);
   this->addKey(KEY_ALTITUDE_BME280, "0", 4);
   this->addKey(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, "10", 4);
   this->addKey(KEY_MAX_IMPULSE_COUNTER, "0", 2);
-  this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 14);
-  this->addKey(KEY_BOARD, "0", 2);
-  this->addKey(KEY_CFG_MODE, "0", 2);
 
   uint8_t nr, key;
-
+  
   for (nr = 0; nr <= 17; nr++) {
     key = KEY_GPIO + nr;
     this->addKey(key, "0,0,0,0,0", 14);
   }
+  
+  this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 14);
+  this->addKey(KEY_BOARD, "0", 2);
+  this->addKey(KEY_CFG_MODE, "0", 2);
 
   for (nr = 0; nr <= MAX_DS18B20; nr++) {
     key = KEY_DS + nr;
@@ -179,6 +180,7 @@ SuplaConfigManager::SuplaConfigManager() {
     key = KEY_DS_NAME + nr;
     this->addKey(key, MAX_DS18B20_NAME);
   }
+
   this->load();
   //  switch (this->load()) {
   //    case E_CONFIG_OK:
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 7d36b9a1..96574113 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -25,6 +25,25 @@
 #define DEFAULT_SERVER "svrX.supla.org"
 #define DEFAULT_EMAIL  "email@address.com"
 
+#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
+#define MAX_GPIO                17
+
 enum _key {
 KEY_SUPLA_GUID,
 KEY_SUPLA_AUTHKEY,
@@ -48,9 +67,9 @@ KEY_MAX_IMPULSE_COUNTER,
 KEY_ACTIVE_SENSOR,
 KEY_BOARD,
 KEY_CFG_MODE,
-KEY_GPIO = 40,
-KEY_DS = 57,
-KEY_DS_NAME
+KEY_GPIO,
+KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
+KEY_DS_NAME = KEY_DS + MAX_DS18B20
 };
 
 //#define GPIO      "GPIO"
@@ -87,24 +106,6 @@ enum _function
   FUNCTION_IMPULSE_COUNTER
 };
 
-#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,

From 4cb6f67eebc96a01ec805ed41e72603465408986 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 4 Dec 2020 06:46:26 +0100
Subject: [PATCH 005/165] =?UTF-8?q?Mo=C5=BCliwo=C5=9B=C4=87=20okre=C5=9Ble?=
 =?UTF-8?q?nia=20=20ACTION=20dla=20przycisku?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini              |  2 +-
 src/SuplaCommonPROGMEM.h    |  3 +++
 src/SuplaConfigESP.cpp      | 16 ++++++++++++++++
 src/SuplaConfigESP.h        |  5 +++--
 src/SuplaConfigManager.cpp  |  6 +++---
 src/SuplaConfigManager.h    |  4 +++-
 src/SuplaDeviceGUI.cpp      |  3 ++-
 src/SuplaWebPageControl.cpp | 28 ++++++++++++++++++++++++++++
 src/SuplaWebPageControl.h   |  1 +
 src/SuplaWebServer.cpp      |  3 ++-
 src/language/de.h           |  2 ++
 src/language/en.h           |  2 ++
 src/language/es.h           |  2 ++
 src/language/fr.h           |  2 ++
 src/language/pl.h           |  6 ++++--
 15 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index dbf7d6e8..3846ea63 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.1"'
+build_flags =   -D BUILD_VERSION='"GUI 1.0.2"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 48902040..6210d672 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -96,6 +96,9 @@ const char REACTION_ON_RELEASE[] PROGMEM = S_REACTION_ON_RELEASE;
 const char REACTION_ON_CHANGE[] PROGMEM = S_REACTION_ON_CHANGE;
 const char* const TRIGGER_P[] PROGMEM = {REACTION_ON_PRESS, REACTION_ON_RELEASE, REACTION_ON_CHANGE};
 
+const char ACTION_TOGGLE[] PROGMEM = S_TOGGLE;
+const char* const ACTION_P[] PROGMEM = {ON, OFF, ACTION_TOGGLE};
+
 const char CFG_10_PRESSES[] PROGMEM = S_CFG_10_PRESSES;
 const char CFG_5SEK_HOLD[] PROGMEM = S_5SEK_HOLD;
 const char* const CFG_MODE_P[] PROGMEM = {CFG_10_PRESSES, CFG_5SEK_HOLD};
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 16a0a381..67d9875a 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -278,6 +278,20 @@ int SuplaConfigESP::getMemory(int nr, int function) {
   }
   return OFF_GPIO;
 }
+
+int SuplaConfigESP::getAction(int nr, int function) {
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
+        uint8_t action = ConfigManager->get(key)->getElement(ACTION).toInt();
+        return action;
+      }
+    }
+  }
+  return OFF_GPIO;
+}
+
 bool SuplaConfigESP::checkBusyCfg(int gpio) {
   uint8_t key = KEY_GPIO + gpio;
   if (ConfigManager->get(key)->getElement(FUNCTION_CFG_LED).toInt() == 1) {
@@ -324,6 +338,7 @@ void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function, uint8_t
   ConfigManager->setElement(key, FUNCTION, function);
   ConfigManager->setElement(key, LEVEL, level);
   ConfigManager->setElement(key, MEMORY, memory);
+  ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
 
   // ConfigManager->setElement(key.c_str(), MEMORY, memory);
   // ConfigManager->setElement(key.c_str(), CFG, cfg);
@@ -340,6 +355,7 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
   ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
   ConfigManager->setElement(key, LEVEL, 0);
   ConfigManager->setElement(key, MEMORY, 0);
+  ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
 }
 
 uint8_t SuplaConfigESP::countFreeGpio(uint8_t exception) {
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 19218782..639d97dc 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -22,8 +22,7 @@
 #include "GUI-Generic_Config.h"
 
 enum _configModeESP { NORMAL_MODE, CONFIG_MODE };
-enum _ConfigMode { CONFIG_MODE_10_ON_PRESSES, CONFIG_MODE_5SEK_HOLD };
-
+enum _ConfigMode { CONFIG_MODE_10_ON_PRESSES, CONFIG_MODE_5SEK_HOLD, FACTORYRESET };
 
 typedef struct {
   int status;
@@ -78,6 +77,8 @@ class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
   int getMemory(int function) {
     return getMemory(1, function);
   }
+
+  int getAction(int nr, int function);
   void factoryReset();
 
  private:
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 7ba808aa..0af9ff8f 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -101,9 +101,9 @@ String ConfigOption::getElement(int index) {
 
 String ConfigOption::replaceElement(int index, int newvalue) {
   String data = _value;
-  int lenght = 5;
+  int lenght = SETTINGSCOUNT;
   String table;
-  for (int i = 0; i < lenght; i++) {
+  for (int i = 0; i <= lenght; i++) {
     if (i == index) {
       table += newvalue;
     }
@@ -167,7 +167,7 @@ SuplaConfigManager::SuplaConfigManager() {
   
   for (nr = 0; nr <= 17; nr++) {
     key = KEY_GPIO + nr;
-    this->addKey(key, "0,0,0,0,0", 14);
+    this->addKey(key, "0,0,0,0,0,0", 16);
   }
   
   this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 14);
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 96574113..50db55cd 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -81,7 +81,9 @@ enum _settings
   FUNCTION,
   LEVEL,
   MEMORY,
-  CFG
+  CFG,
+  ACTION,
+  SETTINGSCOUNT
 };
 
 enum _function
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 28da64d2..5f85fbf2 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -78,7 +78,8 @@ void addRelayButton(int pinRelay, int pinButton, bool highIsOn) {
 
     button.push_back(new Supla::Control::Button(pinButton, true));
     if (pinButton != OFF_GPIO) {
-      button[size]->addAction(Supla::TOGGLE, *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
+
+      button[size]->addAction(ConfigESP->getAction(size + 1, FUNCTION_BUTTON), *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
       button[size]->setSwNoiseFilterDelay(50);
     }
   }
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 307a410c..5e2bfaed 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -160,6 +160,10 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   input += nr_button;
   ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
 
+  input = INPUT_BUTTON_ACTION;
+  input += nr_button;
+  ConfigManager->setElement(key, ACTION, WebServer->httpServer.arg(input).toInt());
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       //      Serial.println(F("E_CONFIG_OK: Dane zapisane"));
@@ -197,6 +201,8 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
     page += F(" ");
     page += nr_button;
     page += F("</h3>");
+
+
     page += F("<i><label>");
     page += S_REACTION_TO;
     page += F("</label><select name='");
@@ -215,6 +221,28 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
       page += TriggerString(suported);
     }
     page += F("</select></i>");
+
+
+    page += F("<i><label>");
+    page += S_ACTION;
+    page += F("</label><select name='");
+    page += INPUT_BUTTON_ACTION;
+    page += nr_button;
+    page += F("'>");
+    selected = ConfigESP->getAction(nr_button.toInt(), FUNCTION_BUTTON);
+    for (suported = 0; suported < 3; suported++) {
+      page += F("<option value='");
+      page += suported;
+      if (selected == suported) {
+        page += F("' selected>");
+      }
+      else
+        page += F("'>");
+      page += PGMT(ACTION_P[suported]);
+    }
+    page += F("</select></i>");
+
+
     page += F("</div><button type='submit'>");
     page += S_SAVE;
     page += F("</button></form>");
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index 88e17b98..99ef91f1 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -12,6 +12,7 @@
 #define  INPUT_BUTTON_SET           "bts"
 #define  INPUT_BUTTON_GPIO          "btg"
 #define  INPUT_BUTTON_LEVEL         "icl"
+#define  INPUT_BUTTON_ACTION        "bta"
 #define  INPUT_LIMIT_SWITCH_GPIO    "lsg"
 #define  INPUT_MAX_BUTTON           "mbt"
 #define  INPUT_MAX_LIMIT_SWITCH     "mls"
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index c91df308..ba35fa8a 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -497,7 +497,8 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
     nr = 1;
   }
 
-  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();;
+  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
+  ;
 
   if (ConfigESP->getGpio(nr, function) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
     ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
diff --git a/src/language/de.h b/src/language/de.h
index 68858331..7384c7d4 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -39,6 +39,7 @@
 #define S_BUTTON_NR_SETTINGS                                   "Parameter für Tasten Nr."
 #define S_NO_BUTTON_NR                                         "Kein Tasten Nr."
 #define S_REACTION_TO                                          "Reaktion auf"
+#define S_ACTION                                               "Action"
 #define S_GPIO_SETTINGS_FOR_LIMIT_SWITCH                       "GPIO-Einstellungen für Endschalter"
 #define S_LIMIT_SWITCH                                         "ENDSCHALTER"
 #define S_GPIO_SETTINGS_FOR                                    "GPIO-Parameter für"
@@ -81,6 +82,7 @@
 //#### SuplaCommonPROGMEM.h ####
 #define S_OFF                 "AUS"
 #define S_ON                  "EINGESCHALTET"
+#define S_TOGGLE              "TOGGLE"
 #define S_LOW                 "NIEDRIG"
 #define S_HIGH                "HOCH"
 #define S_POSITION_MEMORY     "LETZTEN STAND ZURÜCKSETZEN"
diff --git a/src/language/en.h b/src/language/en.h
index 08814beb..7cf2c9ad 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -39,6 +39,7 @@
 #define S_BUTTON_NR_SETTINGS                                   "Setting button nr."
 #define S_NO_BUTTON_NR                                         "No button nr."
 #define S_REACTION_TO                                          "Reaction to"
+#define S_ACTION                                               "Action"
 #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"
@@ -81,6 +82,7 @@
 //#### SuplaCommonPROGMEM.h ####
 #define S_OFF                 "OFF"
 #define S_ON                  "ON"
+#define S_TOGGLE              "TOGGLE"
 #define S_LOW                 "LOW"
 #define S_HIGH                "HIGH"
 #define S_POSITION_MEMORY     "POSITION MEMORY"
diff --git a/src/language/es.h b/src/language/es.h
index d010616a..436af679 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -42,6 +42,7 @@
 #define S_BUTTON_NR_SETTINGS                                   "Parámetros del botón no."
 #define S_NO_BUTTON_NR                                         "Falta del botón no."
 #define S_REACTION_TO                                          "Reacción a"
+#define S_ACTION                                               "Action"
 #define S_GPIO_SETTINGS_FOR_LIMIT_SWITCH                       "Parámetros GPIO para el sensor de apertura"
 #define S_LIMIT_SWITCH                                         "INTERRUPTOR DE LÍMITE"
 #define S_GPIO_SETTINGS_FOR                                    "Parámetros GPIO para"
@@ -84,6 +85,7 @@
 //#### SuplaCommonPROGMEM.h ####
 #define S_OFF                 "APAGADO"
 #define S_ON                  "ENCENDIDO"
+#define S_TOGGLE              "TOGGLE"
 #define S_LOW                 "BAJO"
 #define S_HIGH                "ALTO"
 #define S_POSITION_MEMORY     "RECORDAR ESTADO"
diff --git a/src/language/fr.h b/src/language/fr.h
index 411644a8..f444bd0f 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -40,6 +40,7 @@
 #define S_BUTTON_NR_SETTINGS                                   "Bouton mettre à jour"
 #define S_NO_BUTTON_NR                                         "Manquant numéro de bouton"
 #define S_REACTION_TO                                          "Réaction à"
+#define S_ACTION                                               "Action"
 #define S_GPIO_SETTINGS_FOR_LIMIT_SWITCH                       "Paramètres GPIO pour capteur de limite"
 #define S_LIMIT_SWITCH                                         "Capteur de limite"
 #define S_GPIO_SETTINGS_FOR                                    "GPIO mettre à jour pour"
@@ -82,6 +83,7 @@
 // #### SuplaCommonPROGMEM.h ####
 #define S_OFF                 "ÉTEINDRE"
 #define S_ON                  "ALLUMER"
+#define S_TOGGLE              "TOGGLE"
 #define S_LOW                 "BASSE"
 #define S_HIGH                "HAUT"
 #define S_POSITION_MEMORY     "MEMOIRE DE POSITION"
diff --git a/src/language/pl.h b/src/language/pl.h
index 46ddc93a..ae898809 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -40,6 +40,7 @@
 #define S_BUTTON_NR_SETTINGS                                   "Ustawienia przycisku nr."
 #define S_NO_BUTTON_NR                                         "Brak przycisku nr."
 #define S_REACTION_TO                                          "Reakcja na"
+#define S_ACTION                                               "Akcja"
 #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"
@@ -80,8 +81,9 @@
 #define S_DEVICE_LIMIT_EXCEEDED                        "Przekroczono limit urządzeń"
 
 //#### SuplaCommonPROGMEM.h ####
-#define S_OFF                 "WYŁĄCZONY"
-#define S_ON                  "ZAŁĄCZONY"
+#define S_OFF                 "WYŁĄCZ"
+#define S_ON                  "ZAŁĄCZ"
+#define S_TOGGLE              "PRZEŁĄCZ"
 #define S_LOW                 "ODWRÓCONE"
 #define S_HIGH                "NORMALNE"
 #define S_POSITION_MEMORY     "PAMIĘTAJ STAN"

From ee0098812252b223d37731fd825d622bdf9730a0 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 10:11:49 +0100
Subject: [PATCH 006/165] Pobieranie oraz wczytywanie kopi z pliku

---
 platformio.ini                | 13 ++++--
 src/GUI-Generic_Config.h      |  4 +-
 src/Markup.cpp                | 13 ++++++
 src/Markup.h                  |  4 ++
 src/SuplaCommonPROGMEM.h      |  8 ++--
 src/SuplaConfigManager.cpp    |  2 -
 src/SuplaConfigManager.h      |  2 +
 src/SuplaDeviceGUI.h          |  6 +++
 src/SuplaHTTPUpdateServer.cpp |  7 +++-
 src/SuplaWebPageDownload.cpp  | 29 +++++++++++++
 src/SuplaWebPageDownload.h    | 10 +++++
 src/SuplaWebPageTools.cpp     | 29 +++++++++++++
 src/SuplaWebPageTools.h       | 10 +++++
 src/SuplaWebPageUpload.cpp    | 76 +++++++++++++++++++++++++++++++++++
 src/SuplaWebPageUpload.h      | 11 +++++
 src/SuplaWebServer.cpp        | 15 ++++---
 16 files changed, 221 insertions(+), 18 deletions(-)
 create mode 100644 src/SuplaWebPageDownload.cpp
 create mode 100644 src/SuplaWebPageDownload.h
 create mode 100644 src/SuplaWebPageTools.cpp
 create mode 100644 src/SuplaWebPageTools.h
 create mode 100644 src/SuplaWebPageUpload.cpp
 create mode 100644 src/SuplaWebPageUpload.h

diff --git a/platformio.ini b/platformio.ini
index 3846ea63..309ea8e0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.2"'
+build_flags =   -D BUILD_VERSION='"GUI 1.0.3"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -45,12 +45,11 @@ build_flags =   -D BUILD_VERSION='"GUI 1.0.2"'
 
 [env]
 framework = arduino
-platform = espressif8266 @ 2.6.0
+platform = espressif8266@2.6.0
 upload_speed = 256000
 monitor_speed = 74880
 upload_resetmethod = nodemcu
 board_build.flash_mode = dout
-board_build.ldscript = eagle.flash.1m64.ld
 lib_deps = 
 	milesburton/DallasTemperature@^3.9.1
 	adafruit/DHT sensor library@^1.4.0
@@ -63,19 +62,23 @@ extra_scripts = tools/copy_files.py
 
 [env:GUI_Generic_1M]
 board = esp8285
+board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}   
 
 [env:GUI_Generic_1M-en]
 board = esp8285
+board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}
 				-D UI_LANGUAGE=en     				 
 
 [env:GUI_Generic_4M]
 board = esp12e
+board_build.ldscript = eagle.flash.4m1m.ld
 build_flags =   ${common.build_flags}
 
 [env:GUI_Generic_minimal]
 board = esp8285
+board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}
 build_unflags = -D SUPLA_DS18B20
                 -D SUPLA_DHT11
@@ -90,6 +93,7 @@ build_unflags = -D SUPLA_DS18B20
 
 [env:GUI_Generic_lite]
 board = esp8285
+board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}
 build_unflags =
                 -D SUPLA_DHT11
@@ -102,6 +106,7 @@ build_unflags =
 
 [env:GUI_Generic_sensors]
 board = esp8285
+board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}
 build_unflags = -D SUPLA_RELAY
                 -D SUPLA_BUTTON
@@ -111,12 +116,14 @@ build_unflags = -D SUPLA_RELAY
 
 [env:GUI_Generic_DEBUG]
 board = nodemcuv2
+board_build.ldscript = eagle.flash.4m1m.ld
 build_flags =   ${common.build_flags}
                 -D DEBUG_MODE
 build_unflags = -DUSE_CUSTOM
 
 [env:GUI_Generic_blank]
 board = nodemcuv2
+board_build.ldscript = eagle.flash.4m1m.ld
 build_flags =   ${common.build_flags}
 build_unflags = -D SUPLA_OTA
                 -D SUPLA_RELAY
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 6969251a..fb01e453 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -1,7 +1,7 @@
 #ifndef GUI_Generic_Config_h
 #define GUI_Generic_Config_h
 
-#define USE_CUSTOM
+//#define USE_CUSTOM
 
 // User configuration
 #ifdef USE_CUSTOM
@@ -15,7 +15,7 @@
 #define SUPLA_OTA
 
 // Language en - english, pl - polish (default if not defined UI_LANGUAGE), es- spanish, fr - french, de - german,
-#define UI_LANGUAGE de
+//#define UI_LANGUAGE de
 
 #define SUPLA_RELAY
 #define SUPLA_BUTTON
diff --git a/src/Markup.cpp b/src/Markup.cpp
index a2901b00..9318a6a6 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -85,6 +85,15 @@ void addNumberBox(String& html, const String& input_id, const String& name, uint
   html += F("'></i>");
 }
 
+void addButton(String& html, const String& name, const String& url) {
+  html += F("<a href='");
+  html += getURL(url);
+  html += F("'><button>");
+  html += name;
+  html += F("</button></a>");
+  html += F("<br><br>");
+}
+
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr) {
   html += F("<i><label>");
   if (nr > 0) {
@@ -181,4 +190,8 @@ String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr) {
   }
   page += F("</select>");
   return page;
+}
+
+String getURL(const String& url) {
+  return String(F(PATH_START)) + url;
 }
\ No newline at end of file
diff --git a/src/Markup.h b/src/Markup.h
index 3613c9e5..6ff71b52 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -28,6 +28,8 @@ void addTextBoxPassword(
 
 void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
 
+void addButton(String& html, const String& name, const String& url);
+
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0);
 
 void addListGPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr = 0);
@@ -35,4 +37,6 @@ void addListGPIOLinkBox(String& html, const String& input_id, const String& name
 void addListBox(String& html, const String& input_id, const String& name, const char* const* list_P, uint8_t size, uint8_t selected);
 
 String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr = 0);
+
+String getURL(const String& url);
 #endif  // Markup_h
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 6210d672..01aabf4e 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -18,7 +18,8 @@ const char HTTP_STYLE[] PROGMEM =
     "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,"
+    "#00d151;height:42px}i:last-child{border:none}label{position:absolute;display:inline-block;top:0;left:8px;color:#00d151;line-height:41px;}i "
+    "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 "
@@ -28,8 +29,9 @@ const char HTTP_STYLE[] PROGMEM =
     "(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>";
+    "12px;color:#00d151;font-size:13px;position:relative;line-height:18px}i 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}}iframe{margin:auto;display:block;}.formcenter{color:#000;width:50%;margin: 25px auto 25px auto;}</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,"
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 0af9ff8f..4854a66b 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -24,8 +24,6 @@
 #include "FS.h"
 #include "SuplaConfigManager.h"
 
-#define CONFIG_FILE_PATH "/dat"
-
 ConfigOption::ConfigOption(uint8_t key, const char *value, int maxLength) {
   // size_t size = strlen(key) + 1;
   // _key = (char *)malloc(sizeof(char) * size);
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 50db55cd..7d2252cd 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -17,6 +17,8 @@
 #ifndef SuplaConfigManager_h
 #define SuplaConfigManager_h
 
+#define CONFIG_FILE_PATH "/dat"
+
 #define DEFAULT_HOSTNAME "GUI Generic"
 
 #define DEFAULT_LOGIN      "admin"
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index e020bbd5..7c1142e8 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -36,6 +36,12 @@
 #include "SuplaWebServer.h"
 #include "SuplaWebPageRelay.h"
 
+#include "SuplaWebPageDownload.h"
+#include "SuplaWebPageUpload.h"
+#include "SuplaWebPageTools.h"
+#include "GUIGenericCommon.h"
+#include "Markup.h"
+
 #include <vector>
 
 namespace Supla {
diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 5376a5ae..61a98bc2 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -30,7 +30,8 @@ static const char serverIndex[] PROGMEM =
      </body>
      </html>)";
 static const char successResponse[] PROGMEM = "<META http-equiv='refresh' content='15'>Update Success! Rebooting...";
-static const char twoStepResponse[] PROGMEM = "<META http-equiv='refresh' content='15'><b>WARNING</b> only use 2-step OTA update. Use GUI-GenericUpdater.bin";
+static const char twoStepResponse[] PROGMEM =
+    "<META http-equiv='refresh' content='15'><b>WARNING</b> only use 2-step OTA update. Use GUI-GenericUpdater.bin";
 
 ESP8266HTTPUpdateServer::ESP8266HTTPUpdateServer(bool serial_debug) {
   _serial_output = serial_debug;
@@ -160,7 +161,9 @@ String ESP8266HTTPUpdateServer::suplaWebPageUpddate() {
   content += F("' frameborder='0' height='200'></iframe>");
   content += F("</center>");
   content += F("</div>");
-  content += F("<a href='/'><button>");
+  content += F("<a href='");
+  content += PATH_TOOLS;
+  content += F("'><button>");
   content += S_RETURN;
   content += F("</button></a></div>");
 
diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
new file mode 100644
index 00000000..7154ec17
--- /dev/null
+++ b/src/SuplaWebPageDownload.cpp
@@ -0,0 +1,29 @@
+#include "SuplaWebPageDownload.h"
+#include "SuplaDeviceGUI.h"
+
+void createWebDownload() {
+  WebServer->httpServer.on(F(PATH_DOWNLOAD), handleDownload);
+}
+
+void handleDownload() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  File dataFile = SPIFFS.open(F(CONFIG_FILE_PATH), "r");
+
+  if (!dataFile) {
+    return;
+  }
+
+  String str = F("attachment; filename=config_");
+  str += ConfigManager->get(KEY_HOST_NAME)->getValue();
+  str += Supla::Channel::reg_dev.SoftVer;
+  str += '_';
+  str += F(".dat");
+
+  WebServer->httpServer.sendHeader(F("Content-Disposition"), str);
+  WebServer->httpServer.streamFile(dataFile, F("application/octet-stream"));
+  dataFile.close();
+}
\ No newline at end of file
diff --git a/src/SuplaWebPageDownload.h b/src/SuplaWebPageDownload.h
new file mode 100644
index 00000000..947be49e
--- /dev/null
+++ b/src/SuplaWebPageDownload.h
@@ -0,0 +1,10 @@
+
+#ifndef SuplaWebPageDownload_h
+#define SuplaWebPageDownload_h
+
+#define PATH_DOWNLOAD "download"
+
+void createWebDownload();
+void handleDownload();
+
+#endif // ifndef SuplaWebPageDownload_h
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
new file mode 100644
index 00000000..4b4e3148
--- /dev/null
+++ b/src/SuplaWebPageTools.cpp
@@ -0,0 +1,29 @@
+#include "SuplaWebPageTools.h"
+#include "SuplaDeviceGUI.h"
+
+void createWebTools() {
+  WebServer->httpServer.on(F(PATH_TOOLS), handleTools);
+}
+
+void handleTools() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  String content = "";
+  addFormHeader(content, "Tools");
+  //#ifdef SUPLA_BUTTON
+  addButton(content, "Save config", PATH_DOWNLOAD);
+  //#endif
+  //#ifdef SUPLA_BUTTON
+  addButton(content, "Load config", PATH_UPLOAD);
+  //#endif
+#ifdef SUPLA_OTA
+  addButton(content, S_UPDATE, PATH_UPDATE_HENDLE);
+#endif
+  addFormHeaderEnd(content);
+  addButton(content, S_RETURN, "/");
+
+  WebServer->sendContent(content);
+}
\ No newline at end of file
diff --git a/src/SuplaWebPageTools.h b/src/SuplaWebPageTools.h
new file mode 100644
index 00000000..44f053c0
--- /dev/null
+++ b/src/SuplaWebPageTools.h
@@ -0,0 +1,10 @@
+
+#ifndef SuplaWebPageTools_h
+#define SuplaWebPageTools_h
+
+#define PATH_TOOLS "tools"
+
+void createWebTools();
+void handleTools();
+
+#endif // ifndef SuplaWebPageTools_h
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
new file mode 100644
index 00000000..cc97d425
--- /dev/null
+++ b/src/SuplaWebPageUpload.cpp
@@ -0,0 +1,76 @@
+#include "SuplaWebPageUpload.h"
+#include "SuplaDeviceGUI.h"
+
+static const char uploadIndex[] PROGMEM =
+    R"(<form class="formcenter" method="POST" action="/upload" enctype="multipart/form-data">
+         <input type="file" accept=".dat" name="config">
+         </br>
+         <input type="submit" value="Upload">
+     </form>)";
+
+File dataFile;
+
+void createWebUpload() {
+  // WebServer->httpServer.on(F("/upload"), HTTP_GET, handleUpload);
+  WebServer->httpServer.on(F(PATH_UPLOAD), HTTP_GET, []() { handleUpload(); });
+  // WebServer->httpServer.on(F("/upload"), HTTP_POST, handleFileUpload);
+  WebServer->httpServer.on(
+      F(PATH_UPLOAD), HTTP_POST, []() { WebServer->httpServer.send(200); }, handleFileUpload);
+}
+
+void handleUpload(int save) {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  String content = "";
+  content += WebServer->SuplaSaveResult(save);
+  content += WebServer->SuplaJavaScript();
+  content += F("<div class='w'>");
+  content += F("<h3>");
+  content += "Wgraj konfiguracje";
+  content += F("</h3>");
+  content += F("<br>");
+  content += FPSTR(uploadIndex);
+  content += F("</div>");
+  content += F("<a href='");
+  content += getURL(PATH_TOOLS);
+  content += F("'><button>");
+  content += S_RETURN;
+  content += F("</button></a></div>");
+
+  WebServer->sendContent(content);
+  // WebServer->httpServer.send(200, PSTR("text/html"), FPSTR(uploadIndex));
+}
+
+void handleFileUpload() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  if (SPIFFS.begin()) {
+    HTTPUpload& upload = WebServer->httpServer.upload();
+
+    if (upload.status == UPLOAD_FILE_START) {
+      dataFile = SPIFFS.open(CONFIG_FILE_PATH, "w");
+    }
+    else if (upload.status == UPLOAD_FILE_WRITE) {
+      if (dataFile)
+        dataFile.write(upload.buf, upload.currentSize);
+    }
+    else if (upload.status == UPLOAD_FILE_END) {
+      if (dataFile) {
+        dataFile.close();
+        // WebServer->httpServer.sendHeader("Location", "/upload");
+        // WebServer->httpServer.send(303);
+        handleUpload(1);
+      }
+      else {
+        handleUpload(6);
+        //WebServer->httpServer.send(500, "text/plain", "500: couldn't create file");
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/SuplaWebPageUpload.h b/src/SuplaWebPageUpload.h
new file mode 100644
index 00000000..b7635fe6
--- /dev/null
+++ b/src/SuplaWebPageUpload.h
@@ -0,0 +1,11 @@
+
+#ifndef SuplaWebPageUpload_h
+#define SuplaWebPageUpload_h
+
+#define PATH_UPLOAD "upload"
+
+void createWebUpload();
+void handleUpload(int save = 0);
+void handleFileUpload();
+
+#endif // ifndef SuplaWebPageUpload_h
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index ba35fa8a..e1d83591 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -22,8 +22,6 @@
 #include "SuplaWebPageSensor.h"
 #include "SuplaCommonPROGMEM.h"
 #include "SuplaTemplateBoard.h"
-#include "GUIGenericCommon.h"
-
 #include "Markup.h"
 
 SuplaWebServer::SuplaWebServer() {
@@ -74,6 +72,11 @@ void SuplaWebServer::createWebServer() {
 #ifdef SUPLA_OTA
   httpUpdater.setup(&httpServer, this->www_username, this->www_password);
 #endif
+
+  createWebDownload();
+  createWebUpload();
+  createWebTools();
+
 }
 
 void SuplaWebServer::handle() {
@@ -195,14 +198,14 @@ String SuplaWebServer::supla_webpage_start(int save) {
   content += S_DEVICE_SETTINGS;
   content += F("</button></a>");
   content += F("<br><br>");
-#ifdef SUPLA_OTA
+
   content += F("<a href='");
-  content += PATH_UPDATE_HENDLE;
+  content += PATH_TOOLS;
   content += F("'><button>");
-  content += S_UPDATE;
+  content += F("Tools");
   content += F("</button></a>");
   content += F("<br><br>");
-#endif
+
   content += F("<form method='post' action='");
   content += PATH_REBOT;
   content += F("'>");

From 1e74b218564e8d50b9c059e47773a90c91bb217d Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 12:39:52 +0100
Subject: [PATCH 007/165] zapisywanie przycisku CFG

---
 src/SuplaWebPageConfig.cpp | 66 ++++----------------------------------
 src/SuplaWebServer.cpp     |  4 ++-
 2 files changed, 9 insertions(+), 61 deletions(-)

diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index 724b36f6..3df1f5d5 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -29,74 +29,20 @@ void SuplaWebPageConfig::handleConfig() {
 }
 
 void SuplaWebPageConfig::handleConfigSave() {
-  //  Serial.println(F("HTTP_POST - metoda handleConfigSave"));
-
   if (ConfigESP->configModeESP == NORMAL_MODE) {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String input;
-  uint8_t key;
-  input = INPUT_CFG_LED_GPIO;
-  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
-
-  if (ConfigESP->getGpio(FUNCTION_CFG_LED) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
-    ConfigESP->clearGpio(ConfigESP->getGpio(FUNCTION_CFG_LED));
-  }
-  if (WebServer->httpServer.arg(input).toInt() != OFF_GPIO) {
-    key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
-    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
-      ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), 1, FUNCTION_CFG_LED, 1);
-    }
-    else if (ConfigESP->getGpio(FUNCTION_CFG_LED) == WebServer->httpServer.arg(input).toInt() &&
-             ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_CFG_LED) {
-      key = KEY_GPIO + ConfigESP->getGpio(FUNCTION_CFG_LED);
-      input = INPUT_CFG_LED_LEVEL;
-      ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
-    }
-    else {
-      WebServer->sendContent(supla_webpage_config(6));
-      return;
-    }
+  if (!WebServer->saveGPIO(INPUT_CFG_LED_GPIO, FUNCTION_CFG_LED)) {
+    WebServer->sendContent(supla_webpage_config(6));
+    return;
   }
 
-  input = INPUT_CFG_BTN_GPIO;
-  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
-  if (ConfigESP->getGpio(FUNCTION_CFG_BUTTON) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
-    ConfigESP->clearGpio(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
+  if (!WebServer->saveGPIO(INPUT_CFG_BTN_GPIO, FUNCTION_CFG_BUTTON)) {
+    WebServer->sendContent(supla_webpage_config(6));
+    return;
   }
-  if (WebServer->httpServer.arg(input).toInt() != OFF_GPIO) {
-    key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
-    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF ||
-        (ConfigESP->getGpio(FUNCTION_CFG_BUTTON) == WebServer->httpServer.arg(input).toInt() &&
-         ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_CFG_BUTTON)) {
-      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, CFG, 1);
-      ConfigESP->setGpio(key, FUNCTION_CFG_BUTTON);
-    }
-    else {
-      WebServer->sendContent(supla_webpage_config(6));
-      return;
-    }
-  }
-
-  if (ConfigESP->getGpio(FUNCTION_CFG_BUTTON) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
-    ConfigESP->clearGpio(ConfigESP->getGpio(FUNCTION_CFG_BUTTON), FUNCTION_CFG_BUTTON);
-  }
-
-  /*#ifdef SUPLA_BUTTON
-    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)->getElement(CFG).toInt() == 1) { ConfigManager->setElement(key, CFG, 0);
-        }
-      }
-    }
-    #endif*/
 
   if (strcmp(WebServer->httpServer.arg(INPUT_CFG_MODE).c_str(), "") != 0) {
     ConfigManager->set(KEY_CFG_MODE, WebServer->httpServer.arg(INPUT_CFG_MODE).c_str());
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index e1d83591..303b1aba 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -501,7 +501,6 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   }
 
   key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
-  ;
 
   if (ConfigESP->getGpio(nr, function) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
     ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
@@ -515,6 +514,9 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
              ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), nr, function, ConfigESP->getLevel(nr, function));
     }
+    else if (function == FUNCTION_CFG_BUTTON) {
+      ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), FUNCTION_CFG_BUTTON);
+    }
     else {
       return false;
     }

From ce47d017d7ddccd1d2500561b30b2b4f07ab79e3 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 12:43:35 +0100
Subject: [PATCH 008/165] poprawa URL

---
 src/SuplaWebPageDownload.cpp | 2 +-
 src/SuplaWebPageTools.cpp    | 2 +-
 src/SuplaWebPageUpload.cpp   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
index 7154ec17..b4e08d5b 100644
--- a/src/SuplaWebPageDownload.cpp
+++ b/src/SuplaWebPageDownload.cpp
@@ -2,7 +2,7 @@
 #include "SuplaDeviceGUI.h"
 
 void createWebDownload() {
-  WebServer->httpServer.on(F(PATH_DOWNLOAD), handleDownload);
+  WebServer->httpServer.on(getURL(PATH_DOWNLOAD), handleDownload);
 }
 
 void handleDownload() {
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index 4b4e3148..401da73f 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -2,7 +2,7 @@
 #include "SuplaDeviceGUI.h"
 
 void createWebTools() {
-  WebServer->httpServer.on(F(PATH_TOOLS), handleTools);
+  WebServer->httpServer.on(getURL(PATH_TOOLS), handleTools);
 }
 
 void handleTools() {
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index cc97d425..8702dd70 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -12,10 +12,10 @@ File dataFile;
 
 void createWebUpload() {
   // WebServer->httpServer.on(F("/upload"), HTTP_GET, handleUpload);
-  WebServer->httpServer.on(F(PATH_UPLOAD), HTTP_GET, []() { handleUpload(); });
+  WebServer->httpServer.on(getURL(PATH_UPLOAD), HTTP_GET, []() { handleUpload(); });
   // WebServer->httpServer.on(F("/upload"), HTTP_POST, handleFileUpload);
   WebServer->httpServer.on(
-      F(PATH_UPLOAD), HTTP_POST, []() { WebServer->httpServer.send(200); }, handleFileUpload);
+      getURL(PATH_UPLOAD), HTTP_POST, []() { WebServer->httpServer.send(200); }, handleFileUpload);
 }
 
 void handleUpload(int save) {
@@ -69,7 +69,7 @@ void handleFileUpload() {
       }
       else {
         handleUpload(6);
-        //WebServer->httpServer.send(500, "text/plain", "500: couldn't create file");
+        // WebServer->httpServer.send(500, "text/plain", "500: couldn't create file");
       }
     }
   }

From 6c563ab8ffc53fad9abba7709432fd40bb82145c Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 13:04:39 +0100
Subject: [PATCH 009/165] Update SuplaHTTPUpdateServer.cpp

---
 src/SuplaHTTPUpdateServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 61a98bc2..662c09da 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -46,7 +46,7 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
   _username = username;
   _password = password;
 
-  _server->on(PATH_UPDATE_HENDLE, std::bind(&ESP8266HTTPUpdateServer::handleFirmwareUp, this));
+  _server->on(getURL(PATH_UPDATE_HENDLE), std::bind(&ESP8266HTTPUpdateServer::handleFirmwareUp, this));
   // handler for the /update form page
   _server->on(path.c_str(), HTTP_GET, [&]() {
     if (_username != emptyString && _password != emptyString && !_server->authenticate(_username.c_str(), _password.c_str()))

From d98e2a085844a8c02cbe69864dfcc19156fa0141 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 13:11:24 +0100
Subject: [PATCH 010/165] Update SuplaHTTPUpdateServer.h

---
 src/SuplaHTTPUpdateServer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SuplaHTTPUpdateServer.h b/src/SuplaHTTPUpdateServer.h
index ca61d4ea..5d76d0ef 100644
--- a/src/SuplaHTTPUpdateServer.h
+++ b/src/SuplaHTTPUpdateServer.h
@@ -3,7 +3,7 @@
 
 #include <ESP8266WebServer.h>
 
-#define PATH_UPDATE_HENDLE    "/update"
+#define PATH_UPDATE_HENDLE    "update"
 #define PATH_UPDATE           "/updateOTA"
 
 class ESP8266HTTPUpdateServer

From 5b77791dd364aaa6e43ba6622c3f464ac01af766 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 15:28:32 +0100
Subject: [PATCH 011/165] facory reset GUI

---
 src/SuplaConfigESP.cpp    |  6 +++---
 src/SuplaConfigESP.h      |  2 +-
 src/SuplaWebPageTools.cpp | 12 ++++++++++++
 src/SuplaWebPageTools.h   |  1 +
 src/SuplaWebServer.cpp    |  1 -
 src/SuplaWebServer.h      |  2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 67d9875a..36e09b12 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -372,10 +372,10 @@ uint8_t SuplaConfigESP::countFreeGpio(uint8_t exception) {
   return count;
 }
 
-void SuplaConfigESP::factoryReset() {
+void SuplaConfigESP::factoryReset(bool forceReset) {
   delay(1000);
   pinMode(0, INPUT);
-  if (!digitalRead(0)) {
+  if (!digitalRead(0) || forceReset) {
     Serial.println(F("FACTORY RESET!!!"));
 
     ConfigManager->set(KEY_WIFI_SSID, "");
@@ -414,6 +414,6 @@ void SuplaConfigESP::factoryReset() {
 
     ConfigManager->save();
 
-    rebootESP();
+   // rebootESP();
   }
 }
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 639d97dc..969a3783 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -79,7 +79,7 @@ class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
   }
 
   int getAction(int nr, int function);
-  void factoryReset();
+  void factoryReset(bool forceReset = false);
 
  private:
   void configModeInit();
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index 401da73f..77d01527 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -3,6 +3,17 @@
 
 void createWebTools() {
   WebServer->httpServer.on(getURL(PATH_TOOLS), handleTools);
+
+  WebServer->httpServer.on(getURL(PATH_FACTORY_RESET), [&]() {
+    if (ConfigESP->configModeESP == NORMAL_MODE) {
+      if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+        return WebServer->httpServer.requestAuthentication();
+    }
+    WebServer->httpServer.sendHeader("Location", "/");
+    WebServer->httpServer.send(303);
+    WebServer->sendContent(WebServer->supla_webpage_start(0));
+    ConfigESP->factoryReset(true);
+  });
 }
 
 void handleTools() {
@@ -22,6 +33,7 @@ void handleTools() {
 #ifdef SUPLA_OTA
   addButton(content, S_UPDATE, PATH_UPDATE_HENDLE);
 #endif
+  addButton(content, "Factory reset", PATH_FACTORY_RESET);
   addFormHeaderEnd(content);
   addButton(content, S_RETURN, "/");
 
diff --git a/src/SuplaWebPageTools.h b/src/SuplaWebPageTools.h
index 44f053c0..ab4f4029 100644
--- a/src/SuplaWebPageTools.h
+++ b/src/SuplaWebPageTools.h
@@ -3,6 +3,7 @@
 #define SuplaWebPageTools_h
 
 #define PATH_TOOLS "tools"
+#define PATH_FACTORY_RESET "factoryreset"
 
 void createWebTools();
 void handleTools();
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 303b1aba..ae218365 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -76,7 +76,6 @@ void SuplaWebServer::createWebServer() {
   createWebDownload();
   createWebUpload();
   createWebTools();
-
 }
 
 void SuplaWebServer::handle() {
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 50e5a11d..6709100c 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -65,6 +65,7 @@ class SuplaWebServer : public Supla::Element {
   const String SuplaIconEdit();
   const String SuplaJavaScript(String java_return = PATH_START);
   const String SuplaSaveResult(int save);
+  String supla_webpage_start(int save);
 
   void sendContent(const String content);
 
@@ -87,7 +88,6 @@ class SuplaWebServer : public Supla::Element {
   void handleLoginSettings();
   void createWebServer();
 
-  String supla_webpage_start(int save);
   void supla_webpage_reboot();
   String deviceSettings(int save);
   String loginSettings();

From 76117fc293495535da4302a2a90c53f2ff91c6bf Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 21:31:20 +0100
Subject: [PATCH 012/165] GUI po nowemu

---
 src/SuplaWebServer.cpp | 114 ++++++++---------------------------------
 1 file changed, 20 insertions(+), 94 deletions(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index ae218365..37b8095b 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -190,20 +190,9 @@ String SuplaWebServer::supla_webpage_start(int save) {
   content += S_SAVE;
   content += F("</button></form> ");
   content += F("<br>");
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_DEVICE_SETTINGS;
-  content += F("'><button>");
-  content += S_DEVICE_SETTINGS;
-  content += F("</button></a>");
-  content += F("<br><br>");
-
-  content += F("<a href='");
-  content += PATH_TOOLS;
-  content += F("'><button>");
-  content += F("Tools");
-  content += F("</button></a>");
-  content += F("<br><br>");
+
+  addButton(content, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
+  addButton(content, "Tools", PATH_TOOLS);
 
   content += F("<form method='post' action='");
   content += PATH_REBOT;
@@ -228,113 +217,50 @@ String SuplaWebServer::deviceSettings(int save) {
 
   content += WebServer->SuplaSaveResult(save);
   content += WebServer->SuplaJavaScript(PATH_DEVICE_SETTINGS);
+  
   content += F("<form method='post' action='");
   content += PATH_SAVE_BOARD;
   content += F("'>");
-  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("'>");
+
+  addFormHeader(content, S_TEMPLATE_BOARD);
   uint8_t selected = ConfigManager->get(KEY_BOARD)->getValueInt();
-  for (uint8_t suported = 0; suported < MAX_MODULE; suported++) {
-    content += F("<option value='");
-    content += suported;
-    if (selected == suported) {
-      content += F("' selected>");
-    }
-    else
-      content += F("'>");
-    content += BoardString(suported);
-  }
-  content += F("</select></i>");
-  content += F("</div><button type='submit'>");
+  addListBox(content, INPUT_BOARD, S_TYPE, BOARD_P, MAX_MODULE, selected);
+  addFormHeaderEnd(content);
+
+  content += F("<button type='submit'>");
   content += S_SAVE;
   content += F("</button></form><br><br>");
-  content += F("<div class='w'>");
-  content += F("<h3>");
-  content += S_DEVICE_SETTINGS;
-  content += F("</h3>");
-  content += F("<br>");
-  content += F("<center>");
 
+  addFormHeader(content, S_DEVICE_SETTINGS);
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_RELAY;
-  content += F("'><button>");
-  content += S_RELAYS;
-  content += F("</button></a>");
-  content += F("<br><br>");
+  addButton(content, S_RELAYS, PATH_RELAY);
 #endif
 
 #ifdef SUPLA_BUTTON
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_CONTROL;
-  content += F("'><button>");
-  content += S_BUTTONS;
-  content += F("</button></a>");
-  content += F("<br><br>");
+  addButton(content, S_BUTTONS, PATH_CONTROL);
 #endif
 
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_1WIRE;
-  content += F("'><button>");
-  content += S_SENSORS_1WIRE;
-  content += F("</button></a>");
-  content += F("<br><br>");
+  addButton(content, S_SENSORS_1WIRE, PATH_1WIRE);
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SHT30) || defined(SUPLA_SI7021)
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_I2C;
-  content += F("'><button>");
-  content += S_SENSORS_I2C;
-  content += F("</button></a>");
-  content += F("<br><br>");
+  addButton(content, S_SENSORS_I2C, PATH_I2C);
 #endif
 
 #if defined(SUPLA_MAX6675)
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_SPI;
-  content += F("'><button>");
-  content += S_SENSORS_SPI;
-  content += F("</button></a>");
-  content += F("<br><br>");
+  addButton(content, S_SENSORS_SPI, PATH_SPI);
 #endif
 
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_OTHER;
-  content += F("'><button>");
-  content += S_SENSORS_OTHER;
-  content += F("</button></a>");
-  content += F("<br><br>");
+  addButton(content, S_SENSORS_OTHER, PATH_OTHER);
 #endif
 
 #ifdef SUPLA_CONFIG
-  content += F("<a href='");
-  content += PATH_START;
-  content += PATH_CONFIG;
-  content += F("'><button>");
-  content += S_LED_BUTTON_CFG;
-  content += F("</button></a>");
-  content += F("<br><br>");
+  addButton(content, S_LED_BUTTON_CFG, PATH_CONFIG);
 #endif
-  content += F("</div>");
-  content += F("</center>");
-  content += F("<a href='/'><button>");
-  content += S_RETURN;
-  content += F("</button></a></div>");
+  addFormHeaderEnd(content);
+  addButton(content, S_RETURN, "");
 
   return content;
 }

From 9cc6b92468f5bc38e096d366e28fe966c0d08adb Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 8 Dec 2020 21:31:49 +0100
Subject: [PATCH 013/165] Poprawka powrotu

---
 src/SuplaHTTPUpdateServer.cpp | 2 +-
 src/SuplaWebPageTools.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 662c09da..3c93fb1a 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -116,7 +116,7 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
           if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
             _server->send_P(200, PSTR("text/html"), twoStepResponse);
 
-            //_setUpdaterError();
+            _setUpdaterError();
           }
         }
         else if (_authenticated && upload.status == UPLOAD_FILE_END && !_updaterError.length()) {
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index 77d01527..d8bb1ab2 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -35,7 +35,7 @@ void handleTools() {
 #endif
   addButton(content, "Factory reset", PATH_FACTORY_RESET);
   addFormHeaderEnd(content);
-  addButton(content, S_RETURN, "/");
+  addButton(content, S_RETURN, "");
 
   WebServer->sendContent(content);
 }
\ No newline at end of file

From 5843acda8059cbab295558e81f069d7265aab29a Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 9 Dec 2020 20:50:31 +0100
Subject: [PATCH 014/165] fixed level FUNCTION_CFG_BUTTON

---
 platformio.ini             | 2 +-
 src/SuplaWebPageConfig.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 309ea8e0..5fb67a51 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.3"'
+build_flags =   -D BUILD_VERSION='"GUI 1.0.4"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index 3df1f5d5..e0a0ac54 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -39,6 +39,10 @@ void SuplaWebPageConfig::handleConfigSave() {
     return;
   }
 
+  uint8_t key = KEY_GPIO + ConfigESP->getGpio(FUNCTION_CFG_LED);
+  String input = INPUT_CFG_LED_LEVEL;
+  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
+
   if (!WebServer->saveGPIO(INPUT_CFG_BTN_GPIO, FUNCTION_CFG_BUTTON)) {
     WebServer->sendContent(supla_webpage_config(6));
     return;

From 6f9f37c80a1180a9dcba6ee1a650edfa3adc71dd Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 9 Dec 2020 21:46:33 +0100
Subject: [PATCH 015/165] =?UTF-8?q?nowe=20GUI=20strona=20g=C5=82=C3=B3wna?=
 =?UTF-8?q?=20+=20konfiguracyjna?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Markup.cpp             | 36 +++++++++++------
 src/Markup.h               | 10 ++++-
 src/SuplaWebPageConfig.cpp | 80 +++++++++-----------------------------
 src/SuplaWebServer.cpp     | 36 +++++------------
 4 files changed, 60 insertions(+), 102 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index 9318a6a6..51689b05 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -1,6 +1,14 @@
 #include "Markup.h"
 #include "SuplaCommonPROGMEM.h"
 
+void addForm(String& html, const String& method, const String& action) {
+  html += "<form method='" + method + "' action='" + action + "'>";
+}
+
+void addFormEnd(String& html) {
+  html += "</form>";
+}
+
 void addFormHeader(String& html, const String& name) {
   html += F("<div class='w'>");
   html += F("<h3>");
@@ -68,8 +76,7 @@ void addTextBox(
   return addTextBox(html, input_id, name, value_key, "", minlength, maxlength, required, readonly, false);
 }
 
-void addTextBoxPassword(
-    String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required) {
+void addTextBoxPassword(String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required) {
   return addTextBox(html, input_id, name, value_key, "", minlength, maxlength, required, false, true);
 }
 
@@ -85,15 +92,6 @@ void addNumberBox(String& html, const String& input_id, const String& name, uint
   html += F("'></i>");
 }
 
-void addButton(String& html, const String& name, const String& url) {
-  html += F("<a href='");
-  html += getURL(url);
-  html += F("'><button>");
-  html += name;
-  html += F("</button></a>");
-  html += F("<br><br>");
-}
-
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr) {
   html += F("<i><label>");
   if (nr > 0) {
@@ -161,6 +159,22 @@ void addListBox(String& html, const String& input_id, const String& name, const
   html += F("</select></i>");
 }
 
+void addButton(String& html, const String& name, const String& url) {
+  html += F("<a href='");
+  html += getURL(url);
+  html += F("'><button>");
+  html += name;
+  html += F("</button></a>");
+  html += F("<br><br>");
+}
+
+void addButtonSubmit(String& html, const String& name) {
+  html += F("<button type='submit'>");
+  html += name;
+  html += F("</button>");
+  html += F("<br><br>");
+}
+
 String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr) {
   String page = "";
   page += F("<select name='");
diff --git a/src/Markup.h b/src/Markup.h
index 6ff71b52..9cfe2771 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -3,8 +3,12 @@
 
 #include "SuplaDeviceGUI.h"
 
+void addForm(String& html, const String& method, const String& action = "/");
+void addFormEnd(String& html);
+
 void addFormHeader(String& html, const String& name);
 void addFormHeaderEnd(String& html);
+
 void addTextBox(String& html,
                 const String& input_id,
                 const String& name,
@@ -28,14 +32,16 @@ void addTextBoxPassword(
 
 void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
 
-void addButton(String& html, const String& name, const String& url);
-
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0);
 
 void addListGPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr = 0);
 
 void addListBox(String& html, const String& input_id, const String& name, const char* const* list_P, uint8_t size, uint8_t selected);
 
+void addButton(String& html, const String& name, const String& url);
+
+void addButtonSubmit(String& html, const String& name);
+
 String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr = 0);
 
 String getURL(const String& url);
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index e0a0ac54..14265f7a 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -67,70 +67,26 @@ void SuplaWebPageConfig::handleConfigSave() {
 String SuplaWebPageConfig::supla_webpage_config(int save) {
   uint8_t selected, suported;
   String page = "";
+
   page += WebServer->SuplaSaveResult(save);
   page += WebServer->SuplaJavaScript(PATH_CONFIG);
-  page += F("<form method='post' action='");
-  page += PATH_SAVE_CONFIG;
-  page += F("'><div class='w'><h3>");
-  page += S_GPIO_SETTINGS_FOR_CONFIG;
-  page += F("</h3>");
-  page += F("<i><label>");
-  page += F("LED</label>");
-  page += addListGPIOSelect(INPUT_CFG_LED_GPIO, FUNCTION_CFG_LED);
-  page += F("</i>");
-
-  if (selected != 17) {
-    page += F("<i><label>");
-    page += S_STATE_CONTROL;
-    page += F("</label><select name='");
-    page += INPUT_CFG_LED_LEVEL;
-    page += F("'>");
-    selected = ConfigESP->getLevel(FUNCTION_CFG_LED);
-    for (suported = 0; suported < 2; suported++) {
-      page += F("<option value='");
-      page += suported;
-      if (selected == suported) {
-        page += F("' selected>");
-      }
-      else
-        page += F("'>");
-      page += LevelString(suported);
-    }
-    page += F("</select></i>");
-  }
-  page += F("<i><label>");
-  page += S_BUTTON;
-  page += F("</label>");
-  page += addListGPIOSelect(INPUT_CFG_BTN_GPIO, FUNCTION_CFG_BUTTON);
-  page += F("</i>");
-
-  page += F("<i><label>");
-  page += S_CFG_MODE;
-  page += F("</label><select name='");
-  page += INPUT_CFG_MODE;
-  page += F("'>");
+
+  addForm(page, F("post"), PATH_SAVE_CONFIG);
+  addFormHeader(page, S_GPIO_SETTINGS_FOR_CONFIG);
+  addListGPIOBox(page, INPUT_CFG_LED_GPIO, F("LED"), FUNCTION_CFG_LED);
+
+  selected = ConfigESP->getLevel(FUNCTION_CFG_LED);
+  addListBox(page, INPUT_CFG_LED_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
+  addListGPIOBox(page, INPUT_CFG_BTN_GPIO, S_BUTTON, FUNCTION_CFG_BUTTON);
+
   selected = ConfigManager->get(KEY_CFG_MODE)->getValueInt();
-  for (suported = 0; suported < 2; suported++) {
-    page += F("<option value='");
-    page += suported;
-    if (selected == suported) {
-      page += F("' selected>");
-    }
-    else
-      page += F("'>");
-    page += PGMT(CFG_MODE_P[suported]);
-  }
-  page += F("</select></i>");
-
-  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>");
-  page += S_RETURN;
-  page += F("</button></a></div>");
+  addListBox(page, INPUT_CFG_MODE, S_CFG_MODE, CFG_MODE_P, 2, selected);
+  
+  addFormHeaderEnd(page);
+  addButtonSubmit(page, S_SAVE);
+  addFormEnd(page);
+
+  addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
+
   return page;
 }
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 37b8095b..104a6a15 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -144,8 +144,8 @@ String SuplaWebServer::supla_webpage_start(int save) {
   String content = F("");
   content += SuplaSaveResult(save);
   content += SuplaJavaScript();
-  content += F("<form method='post'>");
 
+  addForm(content, F("post"));
   addFormHeader(content, S_SETTING_WIFI_SSID);
   addTextBox(content, INPUT_WIFI_SSID, S_WIFI_SSID, KEY_WIFI_SSID, 0, MAX_SSID, true);
   addTextBoxPassword(content, INPUT_WIFI_PASS, S_WIFI_PASS, KEY_WIFI_PASS, MIN_PASSWORD, MAX_PASSWORD, true);
@@ -165,20 +165,9 @@ String SuplaWebServer::supla_webpage_start(int save) {
 #ifdef SUPLA_ROLLERSHUTTER
   uint8_t maxrollershutter = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   if (maxrollershutter >= 2) {
-    content += F("<div class='w'>");
-    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;
-    content += F("' value='");
-    content += String(ConfigManager->get(KEY_MAX_ROLLERSHUTTER)->getValue());
-    content += F("'></i>");
-    content += F("</div>");
+    addFormHeader(content, S_ROLLERSHUTTERS);
+    addNumberBox(content, INPUT_ROLLERSHUTTER, S_QUANTITY, KEY_MAX_ROLLERSHUTTER, (maxrollershutter / 2));
+    addFormHeaderEnd(content);
   }
 #endif
 
@@ -186,20 +175,13 @@ String SuplaWebServer::supla_webpage_start(int save) {
   WebPageSensor->showDS18B20(content, true);
 #endif
 
-  content += F("<button type='submit'>");
-  content += S_SAVE;
-  content += F("</button></form> ");
-  content += F("<br>");
+  addButtonSubmit(content, S_SAVE);
+  addFormEnd(content);
 
   addButton(content, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
-  addButton(content, "Tools", PATH_TOOLS);
+  addButton(content, F("Tools"), PATH_TOOLS);
+  addButton(content, S_RESTART, PATH_REBOT);
 
-  content += F("<form method='post' action='");
-  content += PATH_REBOT;
-  content += F("'>");
-  content += F("<button type='submit'>");
-  content += S_RESTART;
-  content += F("</button></form></div>");
   return content;
 }
 
@@ -217,7 +199,7 @@ String SuplaWebServer::deviceSettings(int save) {
 
   content += WebServer->SuplaSaveResult(save);
   content += WebServer->SuplaJavaScript(PATH_DEVICE_SETTINGS);
-  
+
   content += F("<form method='post' action='");
   content += PATH_SAVE_BOARD;
   content += F("'>");

From a12875e281b9fc6e55c3049ef76eb951510ddc54 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 19 Dec 2020 18:27:03 +0100
Subject: [PATCH 016/165] wsparcie dla OLEDa

---
 platformio.ini             |   6 +-
 src/GUI-Generic.ino        |  14 +-
 src/GUI-Generic_Config.h   |   1 +
 src/Markup.cpp             |   8 +-
 src/Markup.h               |   2 +-
 src/SuplaConfigESP.cpp     |  10 +-
 src/SuplaConfigESP.h       |   1 +
 src/SuplaDeviceGUI.cpp     |   7 +-
 src/SuplaDeviceGUI.h       |  11 ++
 src/SuplaOled.cpp          | 290 +++++++++++++++++++++++++++++++++++++
 src/SuplaOled.h            |  67 +++++++++
 src/SuplaWebPageSensor.cpp |  55 ++++---
 src/SuplaWebPageSensor.h   |   4 +-
 src/language/pl.h          |   2 +-
 14 files changed, 435 insertions(+), 43 deletions(-)
 create mode 100644 src/SuplaOled.cpp
 create mode 100644 src/SuplaOled.h

diff --git a/platformio.ini b/platformio.ini
index 5fb67a51..63ceb725 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.4"'
+build_flags =   -D BUILD_VERSION='"GUI 1.0.6"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -41,7 +41,8 @@ build_flags =   -D BUILD_VERSION='"GUI 1.0.4"'
                 -D SUPLA_SI7021
                 -D SUPLA_MAX6675
                 -D SUPLA_HC_SR04
-                -D SUPLA_IMPULSE_COUNTER             
+                -D SUPLA_IMPULSE_COUNTER
+                -D SUPLA_OLED             
 
 [env]
 framework = arduino
@@ -58,6 +59,7 @@ lib_deps =
 	datacute/DoubleResetDetector@^1.0.3
 	closedcube/ClosedCube SHT31D@^1.5.1
 	adafruit/Adafruit Si7021 Library@^1.3.0
+    thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays @ ^4.1.0
 extra_scripts = tools/copy_files.py       
 
 [env:GUI_Generic_1M]
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 7466b190..dacd6309 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -149,18 +149,18 @@ void setup() {
     defined(SUPLA_BH1750) || defined(SUPLA_MAX44009)
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
     Wire.begin(ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
-
 #ifdef SUPLA_BME280
+
     switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt()) {
       case BME280_ADDRESS_0X76:
-        new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
         break;
       case BME280_ADDRESS_0X77:
-        new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
         break;
       case BME280_ADDRESS_0X76_AND_0X77:
-        new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
-        new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
+        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
         break;
     }
 #endif
@@ -207,6 +207,10 @@ void setup() {
 
 #endif
 
+#ifdef SUPLA_OLED
+  new SuplaOled();
+#endif
+
   Supla::GUI::begin();
 }
 
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index fb01e453..537d5328 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -33,6 +33,7 @@
 #define SUPLA_BME280
 #define SUPLA_SHT3x
 #define SUPLA_SI7021
+#define SUPLA_OLED
 // #define SUPLA_HTU21D    // 0x40 NOT SUPPORTED
 // #define SUPLA_SHT71     // 0x44 AND 0x45 NOT SUPPORTED
 // #define SUPLA_BH1750    // 0x23 AND 0x5C NOT SUPPORTED
diff --git a/src/Markup.cpp b/src/Markup.cpp
index 51689b05..18e63b89 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -11,9 +11,11 @@ void addFormEnd(String& html) {
 
 void addFormHeader(String& html, const String& name) {
   html += F("<div class='w'>");
-  html += F("<h3>");
-  html += name;
-  html += F("</h3>");
+  if (name != "\n") {
+    html += F("<h3>");
+    html += name;
+    html += F("</h3>");
+  }
 }
 
 void addFormHeaderEnd(String& html) {
diff --git a/src/Markup.h b/src/Markup.h
index 9cfe2771..f794c7b8 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -6,7 +6,7 @@
 void addForm(String& html, const String& method, const String& action = "/");
 void addFormEnd(String& html);
 
-void addFormHeader(String& html, const String& name);
+void addFormHeader(String& html, const String& name = "\n");
 void addFormHeaderEnd(String& html);
 
 void addTextBox(String& html,
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 36e09b12..08bfc445 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -88,7 +88,7 @@ void SuplaConfigESP::runAction(int event, int action) {
   }
 
   if (configModeESP == CONFIG_MODE) {
-    if (event ==  Supla::ON_CLICK_1) {
+    if (event == Supla::ON_CLICK_1) {
       rebootESP();
     }
   }
@@ -113,11 +113,13 @@ void SuplaConfigESP::configModeInit() {
 
 void SuplaConfigESP::iterateAlways() {
   if (configModeESP == CONFIG_MODE) {
-    String CONFIG_WIFI_NAME = "SUPLA-ESP8266-" + getMacAddress(false);
-    WiFi.softAP(CONFIG_WIFI_NAME, "");
+    WiFi.softAP(getConfigNameAP(), "");
   }
 }
 
+String SuplaConfigESP::getConfigNameAP() {
+  return "SUPLA-ESP8266-" + getMacAddress(false);
+}
 const char *SuplaConfigESP::getLastStatusSupla() {
   return supla_status.msg;
 }
@@ -414,6 +416,6 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
 
     ConfigManager->save();
 
-   // rebootESP();
+    // rebootESP();
   }
 }
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 969a3783..1ed1e307 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -80,6 +80,7 @@ class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
 
   int getAction(int nr, int function);
   void factoryReset(bool forceReset = false);
+  String getConfigNameAP();
 
  private:
   void configModeInit();
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 5f85fbf2..6a25ba62 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -76,9 +76,8 @@ void addRelayButton(int pinRelay, int pinButton, bool highIsOn) {
     relay[size]->keepTurnOnDuration();
     eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
-    button.push_back(new Supla::Control::Button(pinButton, true));
     if (pinButton != OFF_GPIO) {
-
+      button.push_back(new Supla::Control::Button(pinButton, true));
       button[size]->addAction(ConfigESP->getAction(size + 1, FUNCTION_BUTTON), *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
       button[size]->setSwNoiseFilterDelay(50);
     }
@@ -163,7 +162,9 @@ std::vector<Supla::Control::Button *> button;
 #ifdef SUPLA_DS18B20
 std::vector<DS18B20 *> sensorDS;
 #endif
-
+#ifdef SUPLA_BME280
+std::vector<Supla::Sensor::BME280 *> sensorBme280;
+#endif
 
 }  // namespace GUI
 }  // namespace Supla
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 7c1142e8..c2c250a7 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -44,6 +44,13 @@
 
 #include <vector>
 
+#ifdef SUPLA_BME280
+#include <supla/sensor/BME280.h>
+#include "SuplaWebPageSensor.h"
+#endif
+
+#include "SuplaOled.h"
+
 namespace Supla {
 namespace GUI {
 
@@ -78,8 +85,12 @@ extern std::vector<Supla::Control::Button *> RollerShutterButtonClose;
 #ifdef SUPLA_IMPULSE_COUNTER
 extern std::vector<Supla::Sensor::ImpulseCounter *> impulseCounter;
 void addImpulseCounter(int pin, bool lowToHigh, bool inputPullup, unsigned int debounceDelay);
+#endif
 
+#ifdef SUPLA_BME280
+extern std::vector<Supla::Sensor::BME280 *> sensorBme280;
 #endif
+
 };  // namespace GUI
 };  // namespace Supla
 
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
new file mode 100644
index 00000000..e4359fcc
--- /dev/null
+++ b/src/SuplaOled.cpp
@@ -0,0 +1,290 @@
+#include "SuplaOled.h"
+#include "SuplaDeviceGUI.h"
+
+#ifdef SUPLA_OLED
+uint8_t* framesCountSensor;
+
+String getTempString(double temperature) {
+  if (temperature == -275) {
+    return F("error");
+  }
+  else {
+    return String(temperature, 1);
+  }
+}
+
+String getHumidityString(double humidity) {
+  if (humidity == -1) {
+    return F("error");
+  }
+  else {
+    return String(humidity, 1);
+  }
+}
+
+String getPressureString(double pressure) {
+  if (pressure == -1) {
+    return F("error");
+  }
+  else {
+    return String(floor(pressure), 0);
+  }
+}
+
+uint8_t getFramesCountSensor(OLEDDisplayUiState* state) {
+  if (state->frameState) {
+    return framesCountSensor[state->currentFrame];
+  }
+  return 0;
+}
+
+int32_t readRssi(void) {
+  int32_t rssi = WiFi.RSSI();
+  if (WiFi.status() != WL_CONNECTED)
+    return -1;
+  if (rssi <= -100)
+    return 0;
+  if (rssi >= -50)
+    return 100;
+  return (2 * (rssi + 100));
+}
+
+void displaySignal(OLEDDisplay* display) {
+  int x = display->getWidth() - 17;
+  int y = 0;
+  int value = readRssi();
+  // clear area only
+  display->setColor(BLACK);
+  display->fillRect(x, y, x + 46, 16);
+  display->setColor(WHITE);
+  if (value == -1) {
+    display->setFont(ArialMT_Plain_10);
+    display->drawString(x + 1, y, "x");
+  }
+  else {
+    if (value > 0)
+      display->fillRect(x, y + 6, 3, 4);
+    else
+      display->drawRect(x, y + 6, 3, 4);
+
+    if (value >= 25)
+      display->fillRect(x + 4, y + 4, 3, 6);
+    else
+      display->drawRect(x + 4, y + 4, 3, 6);
+
+    if (value >= 50)
+      display->fillRect(x + 8, y + 2, 3, 8);
+    else
+      display->drawRect(x + 8, y + 2, 3, 8);
+
+    if (value >= 75)
+      display->fillRect(x + 12, y, 3, 10);
+    else
+      display->drawRect(x + 12, y, 3, 10);
+  }
+}
+
+void displayRelayState(OLEDDisplay* display) {
+  int y = 0;
+  int x = 0;
+
+  display->setFont(ArialMT_Plain_10);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  for (int i = 0; i < Supla::GUI::relay.size(); i++) {
+    if (Supla::GUI::relay[i]->isOn()) {
+      display->setColor(WHITE);
+      display->fillRect(x, y + 1, 10, 10);
+      display->setColor(BLACK);
+      display->drawString(x + 2, y, String(i + 1));
+    }
+    else {
+      display->setColor(WHITE);
+      display->drawString(x + 2, y, String(i + 1));
+    }
+    x += 15;
+  }
+  display->setColor(WHITE);
+  display->drawHorizontalLine(0, 14, display->getWidth());
+}
+
+void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state) {
+  displaySignal(display);
+  if (Supla::GUI::relay.size()) {
+    displayRelayState(display);
+  }
+}
+
+void displaySuplaStatus(OLEDDisplay* display) {
+  int x = 0;
+  int y = display->getHeight() / 3;
+  display->clear();
+
+  displaySignal(display);
+
+  display->setFont(ArialMT_Plain_10);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->setColor(WHITE);
+  display->drawStringMaxWidth(x, y, display->getWidth(), ConfigESP->supla_status.msg);
+  display->display();
+}
+
+void displayConfigMode(OLEDDisplay* display) {
+  display->clear();
+  display->setFont(ArialMT_Plain_10);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->setColor(WHITE);
+  display->drawString(0, 15, F("Tryb konfiguracyjny"));
+  display->drawString(0, 28, F("AP name:"));
+  display->drawString(0, 41, ConfigESP->getConfigNameAP());
+  display->drawString(0, 54, F("IP: 192.168.4.1"));
+  display->display();
+}
+
+void displayBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // display->drawXbm(10, 17, supla_logo_width, supla_logo_height, supla_logo_bits);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->setFont(ArialMT_Plain_16);
+  display->drawString(10, display->getHeight() / 2, F("SUPLA"));
+}
+
+void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name = "\n") {
+  int drawHeightIcon = display->getHeight() / 2 - 10;
+  int drawStringIcon = display->getHeight() / 2 - 5;
+
+  display->setColor(WHITE);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->drawXbm(x + 0, y + drawHeightIcon, temp_width, temp_height, temp_bits);
+  display->setFont(ArialMT_Plain_10);
+  if (name != NULL) {
+    display->drawString(x + temp_width + 20, y + display->getHeight() / 2 - 15, name);
+  }
+  display->setFont(ArialMT_Plain_24);
+  display->drawString(x + temp_width + 10, y + drawStringIcon, getTempString(temp));
+  display->setFont(ArialMT_Plain_16);
+  display->drawString(x + temp_width + 10 + (getTempString(temp).length() * 12), y + drawStringIcon, "ºC");
+}
+
+void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity) {
+  int drawHeightIcon = display->getHeight() / 2 - 10;
+  int drawStringIcon = display->getHeight() / 2 - 5;
+
+  display->setColor(WHITE);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->drawXbm(x + 0, y + drawHeightIcon, humidity_width, humidity_height, humidity_bits);
+  display->setFont(ArialMT_Plain_24);
+  display->drawString(x + humidity_width + 20, y + drawStringIcon, getHumidityString(humidity));
+  display->setFont(ArialMT_Plain_16);
+  display->drawString(x + humidity_width + 20 + (getHumidityString(humidity).length() * 12), y + drawStringIcon, "%");
+}
+
+void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure) {
+  int drawHeightIcon = display->getHeight() / 2 - 10;
+  int drawStringIcon = display->getHeight() / 2 - 5;
+
+  display->setColor(WHITE);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->drawXbm(x + 0, y + drawHeightIcon, pressure_width, pressure_height, pressure_bits);
+  display->setFont(ArialMT_Plain_24);
+  display->drawString(x + pressure_width + 15, y + drawStringIcon, getPressureString(pressure));
+  display->setFont(ArialMT_Plain_10);
+  display->drawString(x + pressure_width + 15 + (getPressureString(pressure).length() * 14), y + drawStringIcon, "hPa");
+}
+
+void displayDs18b20(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displayTemp(display, state, x, y, Supla::GUI::sensorDS[getFramesCountSensor(state)]->getValue(),
+              String(ConfigManager->get(KEY_DS_NAME + getFramesCountSensor(state))->getValue()));
+}
+
+void displayBme280Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displayTemp(display, state, x, y, Supla::GUI::sensorBme280[getFramesCountSensor(state)]->getTemp());
+}
+
+void displayBme280Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displaHumidity(display, state, x, y, Supla::GUI::sensorBme280[getFramesCountSensor(state)]->getHumi());
+}
+
+void displayBme280Pressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displayPressure(display, state, x, y, Supla::GUI::sensorBme280[getFramesCountSensor(state)]->getPressure());
+}
+
+SuplaOled::SuplaOled() {
+  if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+      display = new SH1106Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
+    }
+    else {
+      display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
+    }
+
+    ui = new OLEDDisplayUi(display);
+
+    overlays[0] = {msOverlay};
+
+    int maxFrame = Supla::GUI::sensorDS.size() + (Supla::GUI::sensorBme280.size() * 3);
+    if (maxFrame == 0)
+      maxFrame = 1;
+
+    frames = (FrameCallback*)malloc(sizeof(FrameCallback) * maxFrame);
+    framesCountSensor = (uint8_t*)malloc(sizeof(uint8_t) * maxFrame);
+
+    for (int i = 0; i < Supla::GUI::sensorDS.size(); i++) {
+      frames[frameCount] = {displayDs18b20};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+    }
+
+    for (int i = 0; i < Supla::GUI::sensorBme280.size(); i++) {
+      frames[frameCount] = {displayBme280Temp};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+      frames[frameCount] = {displayBme280Humidity};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+      frames[frameCount] = {displayBme280Pressure};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+    }
+
+    if (frameCount == 0) {
+      frames[frameCount] = {displayBlank};
+      frameCount += 1;
+    }
+
+    if (frameCount == 1) {
+      ui->disableAllIndicators();
+      ui->disableAutoTransition();
+    }
+    else {
+      ui->setIndicatorPosition(BOTTOM);
+      ui->setIndicatorDirection(LEFT_RIGHT);
+      ui->setFrameAnimation(SLIDE_LEFT);
+    }
+
+    ui->setTargetFPS(60);
+    ui->setFrames(frames, frameCount);
+    ui->setOverlays(overlays, overlaysCount);
+    ui->init();
+    display->flipScreenVertically();
+  }
+}
+
+void SuplaOled::iterateAlways() {
+  if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
+
+    if (ConfigESP->supla_status.status != STATUS_REGISTERED_AND_READY) {
+      displaySuplaStatus(display);
+      return;
+    }
+
+    if (ConfigESP->configModeESP == NORMAL_MODE) {
+      int remainingTimeBudget = ui->update();
+
+      if (remainingTimeBudget > 0)
+        delay(remainingTimeBudget);
+    }
+    else {
+      displayConfigMode(display);
+    }
+  }
+}
+#endif
\ No newline at end of file
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
new file mode 100644
index 00000000..283e76b0
--- /dev/null
+++ b/src/SuplaOled.h
@@ -0,0 +1,67 @@
+#ifndef SuplaOled_H
+#define SuplaOled_H
+
+#ifdef SUPLA_OLED
+
+#include "GUI-Generic_Config.h"
+#include <pgmspace.h>
+#include <supla/element.h>
+#include <Wire.h>         // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306Wire.h"  //OLED 0,96"
+#include "SH1106Wire.h"   //OLED 1.3"
+#include "OLEDDisplayUi.h"
+
+const char SSD1306[] PROGMEM = "SSD1306 - 0,96''";
+const char SH1106[] PROGMEM = "SH1106 - 1,3''";
+const char* const OLED_P[] PROGMEM = {SSD1306, SH1106};
+
+class SuplaOled : public Supla::Element {
+ public:
+  SuplaOled();
+
+ private:
+  void iterateAlways();
+  OLEDDisplay *display;
+  OLEDDisplayUi *ui;
+
+  FrameCallback *frames;
+  int frameCount = 0;
+  OverlayCallback overlays[1];
+  int overlaysCount = 1;
+
+  int count = 0;
+};
+
+// https://www.online-utility.org/image/convert/to/XBM
+#define temp_width  32
+#define temp_height 32
+const uint8_t temp_bits[] PROGMEM = {0x00, 0x3C, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00, 0x81, 0xF8, 0x03, 0x00, 0x99, 0x00,
+                                     0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0xF8, 0x03, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99,
+                                     0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0xF8, 0x03, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00,
+                                     0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00,
+                                     0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x80, 0x99, 0x01, 0x00, 0xC0, 0x18, 0x03, 0x00, 0x60, 0x3C, 0x06,
+                                     0x00, 0x20, 0x7E, 0x04, 0x00, 0x20, 0x7E, 0x04, 0x00, 0x20, 0x7E, 0x04, 0x00, 0x60, 0x3C, 0x06, 0x00, 0xC0, 0x18,
+                                     0x03, 0x00, 0x80, 0x81, 0x01, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00};
+
+#define humidity_width  32
+#define humidity_height 32
+const uint8_t humidity_bits[] PROGMEM = {
+    0x00, 0x80, 0x01, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x30, 0x0C, 0x00, 0x00, 0x38, 0x1C, 0x00, 0x00, 0x18,
+    0x18, 0x00, 0x00, 0x0C, 0x30, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x06, 0x40, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x80, 0x01, 0x80, 0x00,
+    0x80, 0x01, 0x80, 0x01, 0xC0, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x00, 0x03, 0x60, 0x30, 0x08, 0x06, 0x30, 0x48, 0x0C, 0x0C, 0x30, 0x48,
+    0x06, 0x0C, 0x30, 0x30, 0x03, 0x0C, 0x30, 0x80, 0x01, 0x0C, 0x30, 0xC0, 0x00, 0x0C, 0x30, 0x60, 0x06, 0x0C, 0x30, 0x30, 0x09, 0x0C,
+    0x30, 0x10, 0x09, 0x0C, 0x30, 0x00, 0x06, 0x0C, 0x20, 0x00, 0x00, 0x04, 0x60, 0x00, 0x00, 0x06, 0xC0, 0x00, 0x00, 0x03, 0x80, 0x01,
+    0x80, 0x01, 0x00, 0x03, 0xC0, 0x00, 0x00, 0x0E, 0x70, 0x00, 0x00, 0xFC, 0x3F, 0x00, 0x00, 0xF0, 0x0F, 0x00};
+
+#define pressure_width  32
+#define pressure_height 32
+const uint8_t pressure_bits[] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,
+    0x0F, 0x00, 0x00, 0xFC, 0x3F, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x80, 0x81, 0x81, 0x01, 0xC0, 0x80, 0x01, 0x03,
+    0x60, 0x80, 0x01, 0x06, 0x30, 0x00, 0xC0, 0x0C, 0x30, 0x03, 0xE0, 0x18, 0x18, 0x07, 0x40, 0x10, 0x0C, 0x82, 0x01, 0x30, 0x0C, 0x80,
+    0x01, 0x30, 0x0C, 0x80, 0x01, 0x30, 0x0C, 0x80, 0x01, 0x30, 0x0C, 0x80, 0x01, 0x30, 0x0C, 0x81, 0x81, 0x30, 0x8C, 0x83, 0xC1, 0x31,
+    0x8C, 0x81, 0x81, 0x31, 0x08, 0xC0, 0x03, 0x10, 0x08, 0xE0, 0x07, 0x10, 0x00, 0xE0, 0x07, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x80,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    
+#endif
+#endif  // SuplaOled_H
\ No newline at end of file
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 6cd19426..f0751b0f 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -5,6 +5,7 @@
 #include "SuplaCommonPROGMEM.h"
 #include "GUIGenericCommon.h"
 #include "Markup.h"
+#include "SuplaOled.h"
 
 SuplaWebPageSensor *WebPageSensor = new SuplaWebPageSensor();
 
@@ -447,6 +448,14 @@ void SuplaWebPageSensor::handlei2cSave() {
   }
 #endif
 
+#ifdef SUPLA_OLED
+  key = KEY_ACTIVE_SENSOR;
+  input = INPUT_OLED;
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_OLED, WebServer->httpServer.arg(input).toInt());
+  }
+#endif
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       WebServer->sendContent(supla_webpage_i2c(1));
@@ -463,52 +472,52 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
   String page, key;
   page += WebServer->SuplaSaveResult(save);
   page += WebServer->SuplaJavaScript(PATH_I2C);
-  page += F("<form method='post' action='");
-  page += PATH_SAVE_I2C;
-  page += F("'>");
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x)
+  addForm(page, F("post"), PATH_SAVE_I2C);
+#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED)
   addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " i2c");
   addListGPIOBox(page, INPUT_SDA_GPIO, "SDA", FUNCTION_SDA);
   addListGPIOBox(page, INPUT_SCL_GPIO, "SCL", FUNCTION_SCL);
+  addFormHeaderEnd(page);
 
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
 #ifdef SUPLA_BME280
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt();
+    addFormHeader(page);
     addListBox(page, INPUT_BME280, "BME280 adres", BME280_P, 4, selected);
     addNumberBox(page, INPUT_ALTITUDE_BME280, S_ALTITUDE_ABOVE_SEA_LEVEL, KEY_ALTITUDE_BME280, 1500);
+    addFormHeaderEnd(page);
 #endif
 
 #ifdef SUPLA_SHT3x
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SHT3x).toInt();
+    addFormHeader(page);
     addListBox(page, INPUT_SHT3x, "SHT3x", SHT3x_P, 4, selected);
+    addFormHeaderEnd(page);
 #endif
 
 #ifdef SUPLA_SI7021
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SI7021).toInt();
-    addListBox(page, INPUT_SI7021, "Si7021", STATE_P, 2, selected);
+    addFormHeader(page);
+    addListBox(page, INPUT_SI7021, "SI7021", STATE_P, 2, selected);
+    addFormHeaderEnd(page);
+#endif
+
+#ifdef SUPLA_OLED
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
+    addFormHeader(page);
+    addListBox(page, INPUT_OLED, "OLED", OLED_P, 2, selected);
+    addFormHeaderEnd(page);
 #endif
   }
-  addFormHeaderEnd(page);
 #endif
 
-  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'>");
-  page += S_RESTART;
-  page += F("</button></form>");
-  page += F("<br>");
-  page += F("<a href='");
-  page += PATH_START;
-  page += PATH_DEVICE_SETTINGS;
-  page += F("'><button>");
-  page += S_RETURN;
-  page += F("</button></a></div>");
+  addButtonSubmit(page, S_SAVE);
+  addFormEnd(page);
+
+  addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
+  addButton(page, S_RESTART, PATH_REBOT);
+
   return page;
 }
 #endif
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 76c6e7c2..f9cbdd5e 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -26,6 +26,7 @@
 #define INPUT_ALTITUDE_BME280                  "abme280"
 #define INPUT_SHT3x                            "sht30"
 #define INPUT_SI7021                           "si7021"
+#define INPUT_OLED                             "oled"
 #define INPUT_SI7021_SONOFF                    "si7021sonoff"
 #define INPUT_TRIG_GPIO                        "trig"
 #define INPUT_ECHO_GPIO                        "echo"
@@ -49,7 +50,8 @@ enum _sensor
   SENSOR_BME280,
   SENSOR_SHT3x,
   SENSOR_SI7021,
-  SENSOR_MAX6675
+  SENSOR_MAX6675,
+  SENSOR_OLED
 };
 #endif
 
diff --git a/src/language/pl.h b/src/language/pl.h
index ae898809..043a25ef 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -23,7 +23,7 @@
 #define S_RELAYS                                               "PRZEKAŹNIKI"
 #define S_BUTTONS                                              "PRZYCISKI"
 #define S_SENSORS_1WIRE                                        "SENSORY 1Wire"
-#define S_SENSORS_I2C                                          "SENSORY i2c"
+#define S_SENSORS_I2C                                          "i2c"
 #define S_SENSORS_SPI                                          "SENSORY SPI"
 #define S_SENSORS_OTHER                                        "SENSORY INNE"
 #define S_LED_BUTTON_CFG                                       "LED, BUTTON CONFIG"

From b060e7680a1ecd292ed61b4347fdcd26f4d52ad2 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 19 Dec 2020 21:29:02 +0100
Subject: [PATCH 017/165] =?UTF-8?q?aktualizacja=20czujnik=C3=B3w=20SHT3x,?=
 =?UTF-8?q?=20Si7021,=20Si7021=20for=20Sonoff,=20MAX6675=20K?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/supla/sensor/MAX6675_K.cpp            |  74 ++++++++
 lib/SuplaDevice/src/supla/sensor/MAX6675_K.h  |  92 +++-------
 lib/SuplaDevice/src/supla/sensor/SHT3x.h      |  65 ++++---
 lib/SuplaDevice/src/supla/sensor/Si7021.h     |  15 +-
 .../src/supla/sensor/Si7021_sonoff.cpp        | 118 ++++++++++++
 .../src/supla/sensor/Si7021_sonoff.h          | 168 ++++--------------
 6 files changed, 298 insertions(+), 234 deletions(-)
 create mode 100644 lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.cpp

diff --git a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
new file mode 100644
index 00000000..4f610197
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
@@ -0,0 +1,74 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "MAX6675_K.h"
+
+namespace Supla {
+namespace Sensor {
+MAX6675_K::MAX6675_K(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO)
+    : pin_CLK(pin_CLK), pin_CS(pin_CS), pin_DO(pin_DO) {
+}
+
+double MAX6675_K::getValue() {
+  uint16_t value;
+
+  digitalWrite(pin_CS, LOW);
+  delay(1);
+
+  value = spiRead();
+  value <<= 8;
+  value |= spiRead();
+
+  digitalWrite(pin_CS, HIGH);
+
+  if (value & 0x4) {  // this means there is no probe connected to Max6675
+    Serial.print(F("no probe connected to Max6675"));
+    return TEMPERATURE_NOT_AVAILABLE;
+  }
+  value >>= 3;
+
+  return value * 0.25;
+}
+
+void MAX6675_K::onInit() {
+  digitalWrite(pin_CS, HIGH);
+
+  pinMode(pin_CS, OUTPUT);
+  pinMode(pin_CLK, OUTPUT);
+  pinMode(pin_DO, INPUT);
+
+  channel.setNewValue(getValue());
+}
+
+byte MAX6675_K::spiRead() {
+  int i;
+  byte d = 0;
+
+  for (i = 7; i >= 0; i--) {
+    digitalWrite(pin_CLK, LOW);
+    delay(1);
+    if (digitalRead(pin_DO)) {
+      d |= (1 << i);
+    }
+
+    digitalWrite(pin_CLK, HIGH);
+    delay(1);
+  }
+  return d;
+}
+
+};  // namespace Sensor
+};  // namespace Supla
\ No newline at end of file
diff --git a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h
index e0f52438..868a9bff 100644
--- a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h
+++ b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h
@@ -1,80 +1,42 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef _max6675_k_h
 #define _max6675_k_h
 
-#if defined(ESP8266)
-#include <pgmspace.h>
-#endif
-#ifdef avr
-#include <util/delay.h>
-#endif
-
-#include <stdlib.h>
-#include "supla/channel.h"
-#include "supla/sensor/thermometer.h"
+#include <Arduino.h>
+#include <supla/sensor/thermometer.h>
 
 namespace Supla {
 namespace Sensor {
 class MAX6675_K : public Thermometer {
  public:
-  MAX6675_K(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO) {
-    _pin_CLK = pin_CLK;
-    _pin_CS = pin_CS;
-    _pin_DO = pin_DO;
-  }
-
-  double getValue() {
-    uint16_t value;
-
-    digitalWrite(_pin_CS, LOW);
-    delay(1);
-
-    value = spi_read();
-    value <<= 8;
-    value |= spi_read();
-
-    digitalWrite(_pin_CS, HIGH);
-
-    if (value & 0x4) {
-      return -275;
-    }
-    value >>= 3;
-
-    return value * 0.25;
-  }
+  MAX6675_K(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO);
+  double getValue();
 
-  void onInit() {
-    pinMode(_pin_CS, OUTPUT);
-    pinMode(_pin_CLK, OUTPUT);
-    pinMode(_pin_DO, INPUT);
-
-    digitalWrite(_pin_CS, HIGH);
-
-    channel.setNewValue(getValue());
-  }
-
-  byte spi_read(void) {
-    int i;
-    byte d = 0;
-
-    for (i = 7; i >= 0; i--) {
-      digitalWrite(_pin_CLK, LOW);
-      delay(1);
-      if (digitalRead(_pin_DO)) {
-        d |= (1 << i);
-      }
-
-      digitalWrite(_pin_CLK, HIGH);
-      delay(1);
-    }
-
-    return d;
-  }
+ private:
+  void onInit();
+  byte spiRead();
 
  protected:
-  int8_t _pin_CLK;
-  int8_t _pin_CS;
-  int8_t _pin_DO;
+  int8_t pin_CLK;
+  int8_t pin_CS;
+  int8_t pin_DO;
 };
+
 };  // namespace Sensor
 };  // namespace Supla
 
diff --git a/lib/SuplaDevice/src/supla/sensor/SHT3x.h b/lib/SuplaDevice/src/supla/sensor/SHT3x.h
index 9f25c919..3406ac14 100644
--- a/lib/SuplaDevice/src/supla/sensor/SHT3x.h
+++ b/lib/SuplaDevice/src/supla/sensor/SHT3x.h
@@ -17,58 +17,73 @@
 #ifndef _sht3x_h
 #define _sht3x_h
 
-// Dependency: Risele SHT3x library - use library manager to install it
+// Dependency: ClosedCube SHT3x library - use library manager to install it
 // https://github.com/closedcube/ClosedCube_SHT31D_Arduino
 
-#include "ClosedCube_SHT31D.h"
+#include <ClosedCube_SHT31D.h>
 
 #include "therm_hygro_meter.h"
 
+
 namespace Supla {
 namespace Sensor {
 class SHT3x : public ThermHygroMeter {
  public:
-  SHT3x(int8_t address = 0x44) : address(address) {
+  SHT3x(int8_t address = 0x44)
+      : temperature(TEMPERATURE_NOT_AVAILABLE),
+        humidity(HUMIDITY_NOT_AVAILABLE),
+        address(address),
+        retryCount(0) {
   }
 
   double getTemp() {
-    float value = TEMPERATURE_NOT_AVAILABLE;
+    return temperature;
+  }
 
-    SHT31D result = sht.readTempAndHumidity(
-        SHT3XD_REPEATABILITY_LOW, SHT3XD_MODE_CLOCK_STRETCH, 50);
+  double getHumi() {
+    return humidity;
+  }
 
-    if (result.error == SHT3XD_NO_ERROR) {
-      value = result.t;
-    } else {
-      Serial.print("SHT [ERROR] Code #");
-      Serial.println(result.error);
+ private:
+  void iterateAlways() {
+    if (millis() - lastReadTime > 10000) {
+      lastReadTime = millis();
+      readValuesFromDevice();
+      channel.setNewValue(getTemp(), getHumi());
     }
-    return value;
   }
 
-  double getHumi() {
-    float value = HUMIDITY_NOT_AVAILABLE;
+  void onInit() {
+    sht.begin(address);
+    readValuesFromDevice();
+    channel.setNewValue(getTemp(), getHumi());
+  }
 
+  void readValuesFromDevice() {
     SHT31D result = sht.readTempAndHumidity(
         SHT3XD_REPEATABILITY_LOW, SHT3XD_MODE_CLOCK_STRETCH, 50);
 
-    if (result.error == SHT3XD_NO_ERROR) {
-      value = result.rh;
-    } else {
-      Serial.print("SHT [ERROR] Code #");
+    if (result.error != SHT3XD_NO_ERROR) {
+      Serial.print(F("SHT [ERROR] Code #"));
       Serial.println(result.error);
+      retryCount++;
+      if (retryCount > 3) {
+        retryCount = 0;
+        temperature = TEMPERATURE_NOT_AVAILABLE;
+        humidity = HUMIDITY_NOT_AVAILABLE;
+      }
+    } else {
+      retryCount = 0;
+      temperature = result.t;
+      humidity = result.rh;
     }
-    return value;
-  }
-
-  void onInit() {
-    sht.begin(address);
-
-    channel.setNewValue(getTemp(), getHumi());
   }
 
  protected:
   int8_t address;
+  double temperature;
+  double humidity;
+  int8_t retryCount;
   ::ClosedCube_SHT31D sht;  // I2C
 };
 
diff --git a/lib/SuplaDevice/src/supla/sensor/Si7021.h b/lib/SuplaDevice/src/supla/sensor/Si7021.h
index 0b6b70f6..055e3f6f 100644
--- a/lib/SuplaDevice/src/supla/sensor/Si7021.h
+++ b/lib/SuplaDevice/src/supla/sensor/Si7021.h
@@ -20,7 +20,7 @@
 // Dependency: Adafruid Si7021 library - use library manager to install it
 // https://github.com/adafruit/Adafruit_Si7021
 
-#include "Adafruit_Si7021.h"
+#include <Adafruit_Si7021.h>
 #include "therm_hygro_meter.h"
 
 namespace Supla {
@@ -53,26 +53,25 @@ class Si7021 : public ThermHygroMeter {
   }
 
   void onInit() {
-    sensor = Adafruit_Si7021();
     sensor.begin();
 
-    Serial.print("Found model ");
+    Serial.print(F("Found model "));
     switch (sensor.getModel()) {
       case SI_Engineering_Samples:
-        Serial.print("SI engineering samples");
+        Serial.print(F("SI engineering samples"));
         break;
       case SI_7013:
-        Serial.print("Si7013");
+        Serial.print(F("Si7013"));
         break;
       case SI_7020:
-        Serial.print("Si7020");
+        Serial.print(F("Si7020"));
         break;
       case SI_7021:
-        Serial.print("Si7021");
+        Serial.print(F("Si7021"));
         break;
       case SI_UNKNOWN:
       default:
-        Serial.print("Unknown");
+        Serial.print(F("Unknown"));
     }
 
     channel.setNewValue(getTemp(), getHumi());
diff --git a/lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.cpp b/lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.cpp
new file mode 100644
index 00000000..c3391e25
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.cpp
@@ -0,0 +1,118 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "Si7021_sonoff.h"
+
+namespace Supla {
+namespace Sensor {
+Si7021Sonoff::Si7021Sonoff(int pin)
+    : temperature(TEMPERATURE_NOT_AVAILABLE),
+      humidity(HUMIDITY_NOT_AVAILABLE),
+      pin(pin),
+      retryCount(0) {
+}
+
+double Si7021Sonoff::getTemp() {
+  return temperature;
+}
+
+double Si7021Sonoff::getHumi() {
+  return humidity;
+}
+
+void Si7021Sonoff::iterateAlways() {
+  if (millis() - lastReadTime > 10000) {
+    lastReadTime = millis();
+    read();
+    channel.setNewValue(getTemp(), getHumi());
+  }
+}
+
+void Si7021Sonoff::onInit() {
+  pinMode(pin, INPUT);
+
+  delay(100);
+  read();
+  channel.setNewValue(getTemp(), getHumi());
+}
+
+double Si7021Sonoff::readTemp(uint8_t* data) {
+  double temp = (((data[2] & 0x7F) << 8) | data[3]) * 0.1;
+  if (data[2] & 0x80) {
+    temp *= -1;
+  }
+  return temp;
+}
+
+double Si7021Sonoff::readHumi(uint8_t* data) {
+  double humi = ((data[0] << 8) | data[1]) * 0.1;
+  return humi;
+}
+
+bool Si7021Sonoff::read() {
+  uint8_t data[5] = {0};
+
+  yield();
+
+  pinMode(pin, OUTPUT);
+  digitalWrite(pin, LOW);
+  delayMicroseconds(500);
+  digitalWrite(pin, HIGH);
+  delayMicroseconds(20);
+  pinMode(pin, INPUT);
+
+  uint32_t i = 0;
+  if (waitState(0) && waitState(1) && waitState(0)) {
+    for (i = 0; i < 40; i++) {
+      if (!waitState(1)) {
+        break;
+      }
+      delayMicroseconds(35);
+      if (digitalRead(pin) == HIGH) {
+        data[i / 8] |= (1 << (7 - i % 8));
+      }
+      if (!waitState(0)) {
+        break;
+      }
+    }
+  }
+
+  uint8_t checksum = (data[0] + data[1] + data[2] + data[3]) & 0xFF;
+  if (i < 40 || data[4] != checksum) {
+    retryCount++;
+    if (retryCount > 3) {
+      retryCount = 0;
+      temperature = TEMPERATURE_NOT_AVAILABLE;
+      humidity = HUMIDITY_NOT_AVAILABLE;
+    }
+  } else {
+    retryCount = 0;
+    temperature = readTemp(data);
+    humidity = readHumi(data);
+  }
+}
+
+bool Si7021Sonoff::waitState(bool state) {
+  unsigned long timeout = micros();
+  while (micros() - timeout < 100) {
+    if (digitalRead(pin) == state) return true;
+    delayMicroseconds(1);
+  }
+  return false;
+}
+
+};  // namespace Sensor
+};  // namespace Supla
\ No newline at end of file
diff --git a/lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.h b/lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.h
index b07ec66d..bac9667e 100644
--- a/lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.h
+++ b/lib/SuplaDevice/src/supla/sensor/Si7021_sonoff.h
@@ -1,154 +1,50 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef _si7021_sonoff_h
 #define _si7021_sonoff_h
 
+#include <Arduino.h>
 #include <supla/sensor/therm_hygro_meter.h>
 
+
 namespace Supla {
 namespace Sensor {
 class Si7021Sonoff : public ThermHygroMeter {
  public:
-  Si7021Sonoff(int pin) {
-    _pin = pin;
-    pinMode(_pin, INPUT);
-    delay(100);
-    retryCountTemp = 0;
-    retryCountHumi = 0;
-    lastValidTemp = TEMPERATURE_NOT_AVAILABLE;
-    lastValidHumi = HUMIDITY_NOT_AVAILABLE;
-  }
-
-  double getTemp() {
-    double value = TEMPERATURE_NOT_AVAILABLE;
-    ReadTemp();
-    value = _temp;
-    if (isnan(value)) {
-      value = TEMPERATURE_NOT_AVAILABLE;
-    }
-
-    if (value == TEMPERATURE_NOT_AVAILABLE) {
-      retryCountTemp++;
-      if (retryCountTemp > 3) {
-        retryCountTemp = 0;
-      }
-      else {
-        value = lastValidTemp;
-      }
-    }
-    else {
-      retryCountTemp = 0;
-    }
-    lastValidTemp = value;
-
-    return value;
-  }
-
-  double getHumi() {
-    double value = HUMIDITY_NOT_AVAILABLE;
-    ReadTemp();
-    value = _humidity;
-    if (isnan(value)) {
-      value = HUMIDITY_NOT_AVAILABLE;
-    }
-
-    if (value == HUMIDITY_NOT_AVAILABLE) {
-      retryCountHumi++;
-      if (retryCountHumi > 3) {
-        retryCountHumi = 0;
-      }
-      else {
-        value = lastValidHumi;
-      }
-    }
-    else {
-      retryCountHumi = 0;
-    }
-    lastValidHumi = value;
-
-    return value;
-  }
-
-  void iterateAlways() {
-    if (lastReadTime + 10000 < millis()) {
-      lastReadTime = millis();
-      channel.setNewValue(getTemp(), getHumi());
-    }
-  }
-
-  void onInit() {
-    channel.setNewValue(getTemp(), getHumi());
-  }
+  Si7021Sonoff(int pin);
+  double getTemp();
+  double getHumi();
 
  private:
-  bool ReadTemp() {
-    _temp = NAN;
-    _humidity = NAN;
-
-    uint8_t d[5];
-    d[0] = d[1] = d[2] = d[3] = d[4] = 0;
-
-    pinMode(_pin, OUTPUT);
-    digitalWrite(_pin, LOW);
-    delayMicroseconds(500);
-    digitalWrite(_pin, HIGH);
-    delayMicroseconds(20);
-    pinMode(_pin, INPUT);
-
-    uint32_t i = 0;
-    if (WaitState(0) and WaitState(1) and WaitState(0)) {
-      for (i = 0; i < 40; i++) {
-        if (!WaitState(1)) {
-          break;
-        }
-        delayMicroseconds(35);
-        if (digitalRead(_pin) == HIGH) {
-          d[i / 8] |= (1 << (7 - i % 8));
-        }
-        if (!WaitState(0)) {
-          break;
-        }
-      }
-    }
-
-    if (i < 40) {
-      return false;
-    }
-
-    uint8_t checksum = (d[0] + d[1] + d[2] + d[3]) & 0xFF;
-    if (d[4] == checksum) {
-      _temp = (((d[2] & 0x7F) << 8) | d[3]) * 0.1;
-      _humidity = ((d[0] << 8) | d[1]) * 0.1;
-      if (d[2] & 0x80) {
-        _temp *= -1;
-      }
-    }
-
-    if (isnan(_temp) || isnan(_humidity)) {
-      Serial.println(F("Invalid NAN reading"));
-      return false;
-    }
-    return true;
-  }
-
-  bool WaitState(bool state) {
-    unsigned long timeout = micros();
-    while (micros() - timeout < 100) {
-      if (digitalRead(_pin) == state)
-        return true;
-      delayMicroseconds(1);
-    }
-    return false;
-  }
+  void iterateAlways();
+  void onInit();
+  double readTemp(uint8_t* data);
+  double readHumi(uint8_t* data);
+  bool read();
+  bool waitState(bool state);
 
  protected:
-  int8_t _pin;
-  double _temp = NAN, _humidity = NAN;
-  double lastValidTemp;
-  double lastValidHumi;
-  int8_t retryCountTemp;
-  int8_t retryCountHumi;
+  int8_t pin;
+  double temperature;
+  double humidity;
+  int8_t retryCount;
 };
 
 };  // namespace Sensor
 };  // namespace Supla
 
-#endif
+#endif
\ No newline at end of file

From 7037e3654fa0bfd2f5cdcfba03dd27258367732b Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 21 Dec 2020 18:11:01 +0100
Subject: [PATCH 018/165] =?UTF-8?q?wsparcie=20kolejnych=20czujnik=C3=B3w?=
 =?UTF-8?q?=20dla=20OLED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini            |  2 +-
 src/GUI-Generic.ino       | 43 +++--------------------
 src/SuplaConfigESP.h      |  1 +
 src/SuplaDeviceGUI.cpp    | 13 +++++++
 src/SuplaDeviceGUI.h      | 58 ++++++++++++++++++++++++-------
 src/SuplaOled.cpp         | 72 +++++++++++++++++++++++++++++++++++++--
 src/SuplaOled.h           | 20 +++++++++--
 src/SuplaWebPageRelay.cpp |  1 -
 8 files changed, 153 insertions(+), 57 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 63ceb725..dee6b5fe 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.6"'
+build_flags =   -D BUILD_VERSION='"GUI 1.0.7"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index dacd6309..6498e0ba 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -13,40 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#include "GUI-Generic_Config.h"
-
-#include <DoubleResetDetector.h>
-#include <EEPROM.h>
-#include <SPI.h>
-#include <SuplaDevice.h>
-#include <Wire.h>
-#include <supla/control/button.h>
-#include <supla/control/relay.h>
-#include <supla/sensor/DHT.h>
-#include <supla/sensor/DS18B20.h>
-#include <supla/sensor/HC_SR04.h>
-#include <supla/sensor/binary.h>
-#ifdef SUPLA_BME280
-#include <supla/sensor/BME280.h>
-#include "SuplaWebPageSensor.h"
-#endif
-#ifdef SUPLA_SHT3x
-#include <supla/sensor/SHT3x.h>
-#endif
-#ifdef SUPLA_SI7021
-#include <supla/sensor/Si7021.h>
-#endif
-#ifdef SUPLA_SI7021_SONOFF
-#include <supla/sensor/Si7021_sonoff.h>
-#endif
-#ifdef SUPLA_MAX6675
-#include <supla/sensor/MAX6675_K.h>
-#endif
-#ifdef SUPLA_IMPULSE_COUNTER
-#include <supla/sensor/impulse_counter.h>
-#endif
 #include "SuplaDeviceGUI.h"
-#include "SuplaWebServer.h"
 
 #define DRD_TIMEOUT 5  // Number of seconds after reset during which a subseqent reset will be considered a double reset.
 #define DRD_ADDRESS 0  // RTC Memory Address for the DoubleResetDetector to use
@@ -61,7 +28,6 @@ void setup() {
   }
 
   uint8_t nr, gpio;
-  String key;
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
   uint8_t rollershutters = ConfigManager->get(KEY_MAX_ROLLERSHUTTER)->getValueInt();
@@ -122,7 +88,7 @@ void setup() {
 #ifdef SUPLA_DHT22
   if (ConfigESP->getGpio(FUNCTION_DHT22) != OFF_GPIO && ConfigManager->get(KEY_MAX_DHT22)->getValueInt() > 0) {
     for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
-      new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT22), DHT22);
+      Supla::GUI::sensorDHT22.push_back(new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT22), DHT22));
     }
   }
 #endif
@@ -135,7 +101,7 @@ void setup() {
 
 #ifdef SUPLA_SI7021_SONOFF
   if (ConfigESP->getGpio(FUNCTION_SI7021_SONOFF) != OFF_GPIO) {
-    new Supla::Sensor::Si7021Sonoff(ConfigESP->getGpio(FUNCTION_SI7021_SONOFF));
+    Supla::GUI::sensorSi7021Sonoff.push_back(new Supla::Sensor::Si7021Sonoff(ConfigESP->getGpio(FUNCTION_SI7021_SONOFF)));
   }
 #endif
 
@@ -190,7 +156,7 @@ void setup() {
 
 #ifdef SUPLA_MAX6675
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
-    new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
+    Supla::GUI::sensorMAX6675_K.push_back(new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0)));
   }
 #endif
 
@@ -208,7 +174,8 @@ void setup() {
 #endif
 
 #ifdef SUPLA_OLED
-  new SuplaOled();
+  oled = new SuplaOled();
+  oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
 #endif
 
   Supla::GUI::begin();
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 1ed1e307..b96df291 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -17,6 +17,7 @@
 #ifndef SuplaConfigESP_h
 #define SuplaConfigESP_h
 
+#include "Arduino.h"
 #include <supla/triggerable.h>
 #include <supla/element.h>
 #include "GUI-Generic_Config.h"
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 6a25ba62..64c418be 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -162,10 +162,23 @@ std::vector<Supla::Control::Button *> button;
 #ifdef SUPLA_DS18B20
 std::vector<DS18B20 *> sensorDS;
 #endif
+
 #ifdef SUPLA_BME280
 std::vector<Supla::Sensor::BME280 *> sensorBme280;
 #endif
 
+#ifdef SUPLA_SI7021_SONOFF
+std::vector<Supla::Sensor::Si7021Sonoff *> sensorSi7021Sonoff;
+#endif
+
+#ifdef SUPLA_DHT22
+std::vector<Supla::Sensor::DHT *> sensorDHT22;
+#endif
+
+#ifdef SUPLA_MAX6675
+std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
+#endif
+
 }  // namespace GUI
 }  // namespace Supla
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index c2c250a7..ed5bb1f5 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -19,17 +19,10 @@
 
 #include "GUI-Generic_Config.h"
 
-#include <SuplaDevice.h>
-
-#include <supla/control/button.h>
-#include <supla/control/relay.h>
-#include <supla/control/roller_shutter.h>
-#include "SuplaSensorDS18B20.h"
-#include <supla/sensor/impulse_counter.h>
+#include <DoubleResetDetector.h>
+#include <SPI.h>
 
-#ifdef DEBUG_MODE
-#include <supla/sensor/esp_free_heap.h>
-#endif
+#include <SuplaDevice.h>
 
 #include "SuplaConfigESP.h"
 #include "SuplaConfigManager.h"
@@ -41,15 +34,44 @@
 #include "SuplaWebPageTools.h"
 #include "GUIGenericCommon.h"
 #include "Markup.h"
+#include "SuplaOled.h"
 
 #include <vector>
 
+#include <supla/control/button.h>
+#include <supla/control/relay.h>
+#include <supla/control/roller_shutter.h>
+
+#include "SuplaSensorDS18B20.h"
+#include <supla/sensor/DHT.h>
+#include <supla/sensor/HC_SR04.h>
+#include <supla/sensor/binary.h>
 #ifdef SUPLA_BME280
 #include <supla/sensor/BME280.h>
 #include "SuplaWebPageSensor.h"
 #endif
-
-#include "SuplaOled.h"
+#ifdef SUPLA_SI7021_SONOFF
+#include <supla/sensor/Si7021_sonoff.h>
+#endif
+#ifdef SUPLA_BME280
+#include <supla/sensor/BME280.h>
+#include "SuplaWebPageSensor.h"
+#endif
+#ifdef SUPLA_SHT3x
+#include <supla/sensor/SHT3x.h>
+#endif
+#ifdef SUPLA_SI7021
+#include <supla/sensor/Si7021.h>
+#endif
+#ifdef SUPLA_MAX6675
+#include <supla/sensor/MAX6675_K.h>
+#endif
+#ifdef SUPLA_IMPULSE_COUNTER
+#include <supla/sensor/impulse_counter.h>
+#endif
+#ifdef DEBUG_MODE
+#include <supla/sensor/esp_free_heap.h>
+#endif
 
 namespace Supla {
 namespace GUI {
@@ -91,6 +113,18 @@ void addImpulseCounter(int pin, bool lowToHigh, bool inputPullup, unsigned int d
 extern std::vector<Supla::Sensor::BME280 *> sensorBme280;
 #endif
 
+#ifdef SUPLA_SI7021_SONOFF
+extern std::vector<Supla::Sensor::Si7021Sonoff *> sensorSi7021Sonoff;
+#endif
+
+#ifdef SUPLA_DHT22
+extern std::vector<Supla::Sensor::DHT *> sensorDHT22;
+#endif
+
+#ifdef SUPLA_MAX6675
+extern std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
+#endif
+
 };  // namespace GUI
 };  // namespace Supla
 
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index e4359fcc..e4bba5bd 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -207,6 +207,26 @@ void displayBme280Pressure(OLEDDisplay* display, OLEDDisplayUiState* state, int1
   displayPressure(display, state, x, y, Supla::GUI::sensorBme280[getFramesCountSensor(state)]->getPressure());
 }
 
+void displaySi7021SonoffTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displayTemp(display, state, x, y, Supla::GUI::sensorSi7021Sonoff[getFramesCountSensor(state)]->getTemp());
+}
+
+void displaySi7021SonoffHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displaHumidity(display, state, x, y, Supla::GUI::sensorSi7021Sonoff[getFramesCountSensor(state)]->getHumi());
+}
+
+void displayDHT22Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displayTemp(display, state, x, y, Supla::GUI::sensorDHT22[getFramesCountSensor(state)]->getTemp());
+}
+
+void displayDHT22Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displaHumidity(display, state, x, y, Supla::GUI::sensorDHT22[getFramesCountSensor(state)]->getHumi());
+}
+
+void displayMAX6675Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  displayTemp(display, state, x, y, Supla::GUI::sensorMAX6675_K[getFramesCountSensor(state)]->getValue());
+}
+
 SuplaOled::SuplaOled() {
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
@@ -220,7 +240,9 @@ SuplaOled::SuplaOled() {
 
     overlays[0] = {msOverlay};
 
-    int maxFrame = Supla::GUI::sensorDS.size() + (Supla::GUI::sensorBme280.size() * 3);
+    int maxFrame = Supla::GUI::sensorDS.size() + (Supla::GUI::sensorBme280.size() * 3) + Supla::GUI::sensorSi7021Sonoff.size() +
+                   (Supla::GUI::sensorDHT22.size() * 2) + Supla::GUI::sensorMAX6675_K.size();
+
     if (maxFrame == 0)
       maxFrame = 1;
 
@@ -245,6 +267,30 @@ SuplaOled::SuplaOled() {
       frameCount += 1;
     }
 
+    for (int i = 0; i < Supla::GUI::sensorSi7021Sonoff.size(); i++) {
+      frames[frameCount] = {displaySi7021SonoffTemp};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+      frames[frameCount] = {displaySi7021SonoffHumidity};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+    }
+
+    for (int i = 0; i < Supla::GUI::sensorDHT22.size(); i++) {
+      frames[frameCount] = {displayDHT22Temp};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+      frames[frameCount] = {displayDHT22Humidity};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+    }
+
+    for (int i = 0; i < Supla::GUI::sensorMAX6675_K.size(); i++) {
+      frames[frameCount] = {displayMAX6675Temp};
+      framesCountSensor[frameCount] = i;
+      frameCount += 1;
+    }
+
     if (frameCount == 0) {
       frames[frameCount] = {displayBlank};
       frameCount += 1;
@@ -270,12 +316,17 @@ SuplaOled::SuplaOled() {
 
 void SuplaOled::iterateAlways() {
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
-
     if (ConfigESP->supla_status.status != STATUS_REGISTERED_AND_READY) {
       displaySuplaStatus(display);
       return;
     }
 
+    if (millis() - timeLastChangeOled > 30000 && oledON) {
+      display->setBrightness(50);
+      oledON = false;
+      // display.displayOff();
+    }
+
     if (ConfigESP->configModeESP == NORMAL_MODE) {
       int remainingTimeBudget = ui->update();
 
@@ -287,4 +338,21 @@ void SuplaOled::iterateAlways() {
     }
   }
 }
+
+void SuplaOled::addButtonOled(int pin) {
+  if (pin != OFF_GPIO) {
+    Supla::Control::Button* button = new Supla::Control::Button(pin, true, true);
+    button->addAction(TURN_ON_OLED, oled, Supla::ON_PRESS);
+  }
+}
+
+void SuplaOled::runAction(int event, int action) {
+  if (action == TURN_ON_OLED) {
+    display->setBrightness(255);
+    timeLastChangeOled = millis();
+    oledON = true;
+  }
+}
+
+SuplaOled* oled;
 #endif
\ No newline at end of file
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index 283e76b0..9457c9ba 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -5,22 +5,31 @@
 
 #include "GUI-Generic_Config.h"
 #include <pgmspace.h>
+#include <supla/triggerable.h>
 #include <supla/element.h>
 #include <Wire.h>         // Only needed for Arduino 1.6.5 and earlier
 #include "SSD1306Wire.h"  //OLED 0,96"
 #include "SH1106Wire.h"   //OLED 1.3"
 #include "OLEDDisplayUi.h"
 
+enum customActions
+{
+  TURN_ON_OLED
+};
+
 const char SSD1306[] PROGMEM = "SSD1306 - 0,96''";
 const char SH1106[] PROGMEM = "SH1106 - 1,3''";
-const char* const OLED_P[] PROGMEM = {SSD1306, SH1106};
+const char *const OLED_P[] PROGMEM = {SSD1306, SH1106};
 
-class SuplaOled : public Supla::Element {
+class SuplaOled : public Supla::Triggerable, public Supla::Element {
  public:
   SuplaOled();
+  void addButtonOled(int pin);
 
  private:
   void iterateAlways();
+  void runAction(int event, int action);
+
   OLEDDisplay *display;
   OLEDDisplayUi *ui;
 
@@ -30,8 +39,13 @@ class SuplaOled : public Supla::Element {
   int overlaysCount = 1;
 
   int count = 0;
+
+  unsigned long timeLastChangeOled = millis();
+  bool oledON = true;
 };
 
+extern SuplaOled *oled;
+
 // https://www.online-utility.org/image/convert/to/XBM
 #define temp_width  32
 #define temp_height 32
@@ -62,6 +76,6 @@ const uint8_t pressure_bits[] PROGMEM = {
     0x01, 0x30, 0x0C, 0x80, 0x01, 0x30, 0x0C, 0x80, 0x01, 0x30, 0x0C, 0x80, 0x01, 0x30, 0x0C, 0x81, 0x81, 0x30, 0x8C, 0x83, 0xC1, 0x31,
     0x8C, 0x81, 0x81, 0x31, 0x08, 0xC0, 0x03, 0x10, 0x08, 0xE0, 0x07, 0x10, 0x00, 0xE0, 0x07, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x80,
     0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    
+
 #endif
 #endif  // SuplaOled_H
\ No newline at end of file
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 86e24207..75c9dd43 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -76,7 +76,6 @@ void SuplaWebPageRelay::handleRelaySave() {
 }
 
 String SuplaWebPageRelay::supla_webpage_relay(int save) {
-  String key;
   uint8_t selected, suported, nr;
 
   String pagerelay = "";

From 44e132b0070926a0580156ad957047de9746c09a Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 22 Dec 2020 12:53:32 +0100
Subject: [PATCH 019/165] fixed OLED

---
 platformio.ini      |  3 ++-
 src/GUI-Generic.ino | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index dee6b5fe..725e3cd1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.7"'
+build_flags =   -D BUILD_VERSION='"GUI 1.0.8"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -60,6 +60,7 @@ lib_deps =
 	closedcube/ClosedCube SHT31D@^1.5.1
 	adafruit/Adafruit Si7021 Library@^1.3.0
     thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays @ ^4.1.0
+    xoseperez/HLW8012 @ ^1.1.1
 extra_scripts = tools/copy_files.py       
 
 [env:GUI_Generic_1M]
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 6498e0ba..e477a76e 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -150,6 +150,12 @@ void setup() {
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SI7021).toInt()) {
       new Supla::Sensor::Si7021();
     }
+#endif
+#ifdef SUPLA_OLED
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+      oled = new SuplaOled();
+      oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
+    }
 #endif
   }
 #endif
@@ -173,11 +179,6 @@ void setup() {
 
 #endif
 
-#ifdef SUPLA_OLED
-  oled = new SuplaOled();
-  oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
-#endif
-
   Supla::GUI::begin();
 }
 

From c66a93571e5b6469abbc3996810588203e7c1d81 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 24 Dec 2020 14:22:11 +0100
Subject: [PATCH 020/165] =?UTF-8?q?dodanie=20mo=C5=BCliwo=C5=9Bci=20wy?=
 =?UTF-8?q?=C5=82=C4=85czenia=20OLEDa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaCommonPROGMEM.h | 3 +++
 src/SuplaOled.h          | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 01aabf4e..e9ee41d8 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -54,6 +54,9 @@ 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_RBT[] PROGMEM =
+    "<form method='post' action='rbt'><button type='submit'>Restart</button></form>";
+
 const char GPIO0[] PROGMEM = "GPIO0-D3";
 const char GPIO1[] PROGMEM = "GPIO1-TX";
 const char GPIO2[] PROGMEM = "GPIO2-D4";
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index 9457c9ba..1a864cc9 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -17,10 +17,6 @@ enum customActions
   TURN_ON_OLED
 };
 
-const char SSD1306[] PROGMEM = "SSD1306 - 0,96''";
-const char SH1106[] PROGMEM = "SH1106 - 1,3''";
-const char *const OLED_P[] PROGMEM = {SSD1306, SH1106};
-
 class SuplaOled : public Supla::Triggerable, public Supla::Element {
  public:
   SuplaOled();

From a31a2e4694882408e34d7ddb4aa54902de6a9f11 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 24 Dec 2020 14:23:11 +0100
Subject: [PATCH 021/165] Update SuplaCommonPROGMEM.h

---
 src/SuplaCommonPROGMEM.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index e9ee41d8..0e0b6990 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -108,6 +108,12 @@ const char CFG_10_PRESSES[] PROGMEM = S_CFG_10_PRESSES;
 const char CFG_5SEK_HOLD[] PROGMEM = S_5SEK_HOLD;
 const char* const CFG_MODE_P[] PROGMEM = {CFG_10_PRESSES, CFG_5SEK_HOLD};
 
+#ifdef SUPLA_OLED
+const char SSD1306[] PROGMEM = "SSD1306 - 0,96''";
+const char SH1106[] PROGMEM = "SH1106 - 1,3''";
+const char *const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106};
+#endif
+
 String StateString(uint8_t adr);
 String LevelString(uint8_t nr);
 String MemoryString(uint8_t nr);

From f1b7294e6b4af4ff7ceb3028fc559259d7f4c672 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 24 Dec 2020 14:24:31 +0100
Subject: [PATCH 022/165] =?UTF-8?q?Dodanie=20Restartu=20urz=C4=85dzenia=20?=
 =?UTF-8?q?na=20ka=C5=BCdej=20stronie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Markup.cpp                | 45 +++++++++++++++++++++
 src/Markup.h                  | 17 ++++----
 src/SuplaDeviceGUI.h          |  1 +
 src/SuplaHTTPUpdateServer.cpp |  4 +-
 src/SuplaWebPageConfig.cpp    |  6 +--
 src/SuplaWebPageControl.cpp   | 16 +++-----
 src/SuplaWebPageRelay.cpp     | 12 +++---
 src/SuplaWebPageSensor.cpp    | 73 ++++++++++-------------------------
 src/SuplaWebPageUpload.cpp    |  6 +--
 src/SuplaWebServer.cpp        | 59 ++--------------------------
 src/SuplaWebServer.h          |  2 -
 11 files changed, 97 insertions(+), 144 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index 18e63b89..b1cba4b8 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -210,4 +210,49 @@ String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr) {
 
 String getURL(const String& url) {
   return String(F(PATH_START)) + url;
+}
+
+const String SuplaJavaScript(const 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='");
+  java_script += java_return;
+  java_script += F("';}},1600);</script>\n");
+#ifdef SUPLA_OTA
+  java_script +=
+      F("<script type='text/javascript'>if(window.top.location != window.location){"
+        "window.top.location.href = window.location.href;}</script>\n");
+#endif
+  return java_script;
+}
+
+const String SuplaSaveResult(int save) {
+  if (save == 0)
+    return F("");
+  String saveresult = "";
+  saveresult += F("<div id=\"msg\" class=\"c\">");
+  if (save == 1) {
+    saveresult += S_DATA_SAVED;
+  }
+  else if (save == 2) {
+    saveresult += S_RESTART_MODULE;
+  }
+  else if (save == 3) {
+    saveresult += S_DATA_ERASED_RESTART_DEVICE;
+  }
+  else if (save == 4) {
+    saveresult += S_WRITE_ERROR_UNABLE_TO_READ_FILE_FS_PARTITION_MISSING;
+  }
+  else if (save == 5) {
+    saveresult += S_DATA_SAVED_RESTART_MODULE;
+  }
+  else if (save == 6) {
+    saveresult += S_WRITE_ERROR_BAD_DATA;
+  }
+  else if (save == 7) {
+    saveresult += F("data saved");
+  }
+  saveresult += F("</div>");
+  return saveresult;
 }
\ No newline at end of file
diff --git a/src/Markup.h b/src/Markup.h
index f794c7b8..1a348def 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -19,16 +19,9 @@ void addTextBox(String& html,
                 bool required,
                 bool readonly = false,
                 bool password = false);
-void addTextBox(String& html,
-                const String& input_id,
-                const String& name,
-                uint8_t value_key,
-                int minlength,
-                int maxlength,
-                bool required,
-                bool readonly = false);
-void addTextBoxPassword(
-    String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required);
+void addTextBox(
+    String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required, bool readonly = false);
+void addTextBoxPassword(String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required);
 
 void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
 
@@ -45,4 +38,8 @@ void addButtonSubmit(String& html, const String& name);
 String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr = 0);
 
 String getURL(const String& url);
+
+const String SuplaJavaScript(const String& java_return = PATH_START);
+
+const String SuplaSaveResult(int save);
 #endif  // Markup_h
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index ed5bb1f5..7619e957 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -33,6 +33,7 @@
 #include "SuplaWebPageUpload.h"
 #include "SuplaWebPageTools.h"
 #include "GUIGenericCommon.h"
+#include "SuplaCommonPROGMEM.h"
 #include "Markup.h"
 #include "SuplaOled.h"
 
diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 3c93fb1a..7a68aaf8 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -149,7 +149,7 @@ void ESP8266HTTPUpdateServer::handleFirmwareUp() {
 
 String ESP8266HTTPUpdateServer::suplaWebPageUpddate() {
   String content = "";
-  content += WebServer->SuplaJavaScript();
+  content += SuplaJavaScript();
   content += F("<div class='w'>");
   content += F("<h3>");
   content += S_SOFTWARE_UPDATE;
@@ -165,7 +165,7 @@ String ESP8266HTTPUpdateServer::suplaWebPageUpddate() {
   content += PATH_TOOLS;
   content += F("'><button>");
   content += S_RETURN;
-  content += F("</button></a></div>");
+  content += F("</button></a><br><br>");
 
   return content;
 }
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index 14265f7a..1a28163b 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -68,8 +68,8 @@ String SuplaWebPageConfig::supla_webpage_config(int save) {
   uint8_t selected, suported;
   String page = "";
 
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_CONFIG);
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_CONFIG);
 
   addForm(page, F("post"), PATH_SAVE_CONFIG);
   addFormHeader(page, S_GPIO_SETTINGS_FOR_CONFIG);
@@ -81,7 +81,7 @@ String SuplaWebPageConfig::supla_webpage_config(int save) {
 
   selected = ConfigManager->get(KEY_CFG_MODE)->getValueInt();
   addListBox(page, INPUT_CFG_MODE, S_CFG_MODE, CFG_MODE_P, 2, selected);
-  
+
   addFormHeaderEnd(page);
   addButtonSubmit(page, S_SAVE);
   addFormEnd(page);
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 5e2bfaed..9033f567 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -1,7 +1,6 @@
 #include "SuplaWebPageControl.h"
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
-#include "SuplaCommonPROGMEM.h"
 #include "GUIGenericCommon.h"
 #include "Markup.h"
 
@@ -92,8 +91,8 @@ String SuplaWebPageControl::supla_webpage_control(int save) {
   uint8_t nr, suported, selected;
   String pagebutton, key;
 
-  pagebutton += WebServer->SuplaSaveResult(save);
-  pagebutton += WebServer->SuplaJavaScript(PATH_CONTROL);
+  pagebutton += SuplaSaveResult(save);
+  pagebutton += SuplaJavaScript(PATH_CONTROL);
   pagebutton += F("<form method='post' action='");
   pagebutton += PATH_SAVE_CONTROL;
   pagebutton += F("'>");
@@ -125,7 +124,7 @@ String SuplaWebPageControl::supla_webpage_control(int save) {
   pagebutton += PATH_DEVICE_SETTINGS;
   pagebutton += F("'><button>");
   pagebutton += S_RETURN;
-  pagebutton += F("</button></a></div>");
+  pagebutton += F("</button></a><br><br>");
   return pagebutton;
 }
 
@@ -189,8 +188,8 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
   nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
 
   String page = "";
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_CONTROL);
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_CONTROL);
   uint8_t buttons = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   if (nr_button.toInt() <= buttons && ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON) != OFF_GPIO) {
     page += F("<form method='post' action='");
@@ -202,7 +201,6 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
     page += nr_button;
     page += F("</h3>");
 
-
     page += F("<i><label>");
     page += S_REACTION_TO;
     page += F("</label><select name='");
@@ -222,7 +220,6 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
     }
     page += F("</select></i>");
 
-
     page += F("<i><label>");
     page += S_ACTION;
     page += F("</label><select name='");
@@ -242,7 +239,6 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
     }
     page += F("</select></i>");
 
-
     page += F("</div><button type='submit'>");
     page += S_SAVE;
     page += F("</button></form>");
@@ -260,7 +256,7 @@ String SuplaWebPageControl::supla_webpage_button_set(int save) {
   page += PATH_CONTROL;
   page += F("'><button>");
   page += S_RETURN;
-  page += F("</button></a></div>");
+  page += F("</button></a><br><br>");
 
   return page;
 }
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 75c9dd43..a2e44450 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -79,8 +79,8 @@ String SuplaWebPageRelay::supla_webpage_relay(int save) {
   uint8_t selected, suported, nr;
 
   String pagerelay = "";
-  pagerelay += WebServer->SuplaSaveResult(save);
-  pagerelay += WebServer->SuplaJavaScript(PATH_RELAY);
+  pagerelay += SuplaSaveResult(save);
+  pagerelay += SuplaJavaScript(PATH_RELAY);
   pagerelay += F("<form method='post' action='");
   pagerelay += PATH_SAVE_RELAY;
   pagerelay += F("'>");
@@ -99,7 +99,7 @@ String SuplaWebPageRelay::supla_webpage_relay(int save) {
   pagerelay += PATH_DEVICE_SETTINGS;
   pagerelay += F("'><button>");
   pagerelay += S_RETURN;
-  pagerelay += F("</button></a></div>");
+  pagerelay += F("</button></a><br><br>");
   return pagerelay;
 }
 
@@ -162,8 +162,8 @@ String SuplaWebPageRelay::supla_webpage_relay_set(int save) {
   nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
 
   String page = "";
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_RELAY);
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_RELAY);
   uint8_t relays = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   if (nr_relay.toInt() <= relays && ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY) != OFF_GPIO) {
     page += F("<form method='post' action='");
@@ -227,7 +227,7 @@ String SuplaWebPageRelay::supla_webpage_relay_set(int save) {
   page += PATH_RELAY;
   page += F("'><button>");
   page += S_RETURN;
-  page += F("</button></a></div>");
+  page += F("</button></a><br><br>");
 
   return page;
 }
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index f0751b0f..c085bd65 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -127,8 +127,8 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
   char strAddr[64];
   uint8_t i;
 
-  content += WebServer->SuplaSaveResult(save);
-  content += WebServer->SuplaJavaScript(PATH_MULTI_DS);
+  content += SuplaSaveResult(save);
+  content += SuplaJavaScript(PATH_MULTI_DS);
   content += F("<center>");
   if (ConfigESP->getGpio(FUNCTION_DS18B20) < OFF_GPIO || !Supla::GUI::sensorDS.empty()) {
     content += F("<form method='post' action='");
@@ -195,7 +195,7 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
   content += PATH_1WIRE;
   content += F("'><button>");
   content += S_RETURN;
-  content += F("</button></a></div>");
+  content += F("</button></a><br><br>");
 
   return content;
 }
@@ -327,8 +327,8 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
   uint8_t nr, suported, selected;
   uint16_t max;
   String page, key;
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_1WIRE);
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_1WIRE);
   page += F("<form method='post' action='");
   page += PATH_SAVE_1WIRE;
   page += F("'>");
@@ -372,19 +372,12 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
   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'>");
-  page += S_RESTART;
-  page += F("</button></form>");
-  page += F("<br>");
   page += F("<a href='");
   page += PATH_START;
   page += PATH_DEVICE_SETTINGS;
   page += F("'><button>");
   page += S_RETURN;
-  page += F("</button></a></div>");
+  page += F("</button></a><br><br>");
   return page;
 }
 #endif
@@ -470,8 +463,8 @@ void SuplaWebPageSensor::handlei2cSave() {
 String SuplaWebPageSensor::supla_webpage_i2c(int save) {
   uint8_t nr, suported, selected, size;
   String page, key;
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_I2C);
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_I2C);
 
   addForm(page, F("post"), PATH_SAVE_I2C);
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED)
@@ -506,7 +499,7 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #ifdef SUPLA_OLED
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
     addFormHeader(page);
-    addListBox(page, INPUT_OLED, "OLED", OLED_P, 2, selected);
+    addListBox(page, INPUT_OLED, "OLED", OLED_P, 3, selected);
     addFormHeaderEnd(page);
 #endif
   }
@@ -516,7 +509,6 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
   addFormEnd(page);
 
   addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
-  addButton(page, S_RESTART, PATH_REBOT);
 
   return page;
 }
@@ -577,8 +569,8 @@ void SuplaWebPageSensor::handleSpiSave() {
 String SuplaWebPageSensor::supla_webpage_spi(int save) {
   uint8_t nr, suported, selected;
   String page, key;
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_SPI);
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_SPI);
   page += F("<form method='post' action='");
   page += PATH_SAVE_SPI;
   page += F("'>");
@@ -599,19 +591,12 @@ String SuplaWebPageSensor::supla_webpage_spi(int save) {
   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'>");
-  page += S_RESTART;
-  page += F("</button></form>");
-  page += F("<br>");
   page += F("<a href='");
   page += PATH_START;
   page += PATH_DEVICE_SETTINGS;
   page += F("'><button>");
   page += S_RETURN;
-  page += F("</button></a></div>");
+  page += F("</button></a><br><br>");
   return page;
 }
 #endif
@@ -675,12 +660,10 @@ void SuplaWebPageSensor::handleOtherSave() {
 String SuplaWebPageSensor::supla_webpage_other(int save) {
   uint8_t nr, suported, selected;
   String page, key;
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_OTHER);
-  page += F("<form method='post' action='");
-  page += PATH_SAVE_OTHER;
-  page += F("'>");
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_OTHER);
 
+  addForm(page, F("post"), PATH_SAVE_OTHER);
 #ifdef SUPLA_HC_SR04
   addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " HC-SR04");
   addListGPIOBox(page, INPUT_TRIG_GPIO, "TRIG", FUNCTION_TRIG);
@@ -696,23 +679,9 @@ String SuplaWebPageSensor::supla_webpage_other(int save) {
   }
   addFormHeaderEnd(page);
 #endif
-  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'>");
-  page += S_RESTART;
-  page += F("</button></form>");
-  page += F("<br>");
-  page += F("<a href='");
-  page += PATH_START;
-  page += PATH_DEVICE_SETTINGS;
-  page += F("'><button>");
-  page += S_RETURN;
-  page += F("</button></a></div>");
+  addButtonSubmit(page, S_SAVE);
+  addFormEnd(page);
+  addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
   return page;
 }
 #endif
@@ -779,8 +748,8 @@ String SuplaWebPageSensor::supla_impulse_counter_set(int save) {
   nr = readUrl.substring(place + path.length(), place + path.length() + 3);
 
   String page = "";
-  page += WebServer->SuplaSaveResult(save);
-  page += WebServer->SuplaJavaScript(PATH_OTHER);
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_OTHER);
   uint8_t relays = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
   if (nr.toInt() <= relays && ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
     page += F("<form method='post' action='");
@@ -856,7 +825,7 @@ String SuplaWebPageSensor::supla_impulse_counter_set(int save) {
   page += PATH_OTHER;
   page += F("'><button>");
   page += S_RETURN;
-  page += F("</button></a></div>");
+  page += F("</button></a><br><br>");
 
   return page;
 }
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index 8702dd70..4b5d24b1 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -25,8 +25,8 @@ void handleUpload(int save) {
   }
 
   String content = "";
-  content += WebServer->SuplaSaveResult(save);
-  content += WebServer->SuplaJavaScript();
+  content += SuplaSaveResult(save);
+  content += SuplaJavaScript();
   content += F("<div class='w'>");
   content += F("<h3>");
   content += "Wgraj konfiguracje";
@@ -38,7 +38,7 @@ void handleUpload(int save) {
   content += getURL(PATH_TOOLS);
   content += F("'><button>");
   content += S_RETURN;
-  content += F("</button></a></div>");
+  content += F("</button></a>");
 
   WebServer->sendContent(content);
   // WebServer->httpServer.send(200, PSTR("text/html"), FPSTR(uploadIndex));
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 104a6a15..561a3ea0 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -180,7 +180,6 @@ String SuplaWebServer::supla_webpage_start(int save) {
 
   addButton(content, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
   addButton(content, F("Tools"), PATH_TOOLS);
-  addButton(content, S_RESTART, PATH_REBOT);
 
   return content;
 }
@@ -197,8 +196,8 @@ void SuplaWebServer::supla_webpage_reboot() {
 String SuplaWebServer::deviceSettings(int save) {
   String content = "";
 
-  content += WebServer->SuplaSaveResult(save);
-  content += WebServer->SuplaJavaScript(PATH_DEVICE_SETTINGS);
+  content += SuplaSaveResult(save);
+  content += SuplaJavaScript(PATH_DEVICE_SETTINGS);
 
   content += F("<form method='post' action='");
   content += PATH_SAVE_BOARD;
@@ -277,13 +276,6 @@ void SuplaWebServer::handleBoardSave() {
   }
 }
 
-const String SuplaWebServer::SuplaFavicon() {
-  //  return F("<link rel='icon'
-  //  href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAB3RJTUUH5AUUCCQbIwTFfgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAARnQU1BAACxjwv8YQUAAAAwUExURf7nNZuNIOvWMci2KWRbFJGEHnRpFy8rCdrGLSAdBgwLAod6G7inJkI8DVJLEKeYIg6cTsoAAAGUSURBVHjaY2CAAFUGNLCF4QAyl4mhmP8BB4LPcWtdAe+BEBiX9QD77Kzl24GKHCAC/OVZH5hkVyUCFQlCRJhnKjAwLVlVb8lQDOY/ZFrG8FDVQbVqbU8BWODc3BX8dbMMGJhfrUyAaOla+/dAP8jyncsbgJTKgVP/b+pOAUudegAkGMsrGZhE1EFyDGwLwNaucmZyl1TgKTdg4JvAwMBzn3txeKWrMwP7wQcMWiAtf2c9YDjUfYBJapsDw66bm4AiUesOnJty0/O9iwLDPI5EhhCD6/q3Chk4dgCleJYpAEOmfCkDB+sbsK1886YBRfgWMTBwbi896wR04YZuAyAH6OmzDCbr3RgYsj6A1HEBPXCfgWHONgaG6eUBII0LFTiA7jn+iIF/MbMTyEu3lphtAJtpvl4BTLPNWgVSySA+y28aWIDdyGtVBgNH5psshVawwHGGO+arLr7MYFoJjZr/zBPYj85a1sC4ulwAIsIdcJzh2qt1WReYBWBR48gxgd1ziQIi6hTYEsxR45pZwRU9+oWgNAB1F3c/H6bYqgAAAABJRU5ErkJggg=='
-  //  type='image/x-png' />\n");
-  return F("");
-}
-
 const String SuplaWebServer::SuplaIconEdit() {
   return F(
       "<img "
@@ -295,51 +287,6 @@ const String SuplaWebServer::SuplaIconEdit() {
       "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='");
-  java_script += java_return;
-  java_script += F("';}},1600);</script>\n");
-#ifdef SUPLA_OTA
-  java_script +=
-      F("<script type='text/javascript'>if(window.top.location != window.location){"
-        "window.top.location.href = window.location.href;}</script>\n");
-#endif
-  return java_script;
-}
-
-const String SuplaWebServer::SuplaSaveResult(int save) {
-  if (save == 0)
-    return F("");
-  String saveresult = "";
-  saveresult += F("<div id=\"msg\" class=\"c\">");
-  if (save == 1) {
-    saveresult += S_DATA_SAVED;
-  }
-  else if (save == 2) {
-    saveresult += S_RESTART_MODULE;
-  }
-  else if (save == 3) {
-    saveresult += S_DATA_ERASED_RESTART_DEVICE;
-  }
-  else if (save == 4) {
-    saveresult += S_WRITE_ERROR_UNABLE_TO_READ_FILE_FS_PARTITION_MISSING;
-  }
-  else if (save == 5) {
-    saveresult += S_DATA_SAVED_RESTART_MODULE;
-  }
-  else if (save == 6) {
-    saveresult += S_WRITE_ERROR_BAD_DATA;
-  }
-  else if (save == 7) {
-    saveresult += F("data saved");
-  }
-  saveresult += F("</div>");
-  return saveresult;
-}
-
 void SuplaWebServer::sendContent(const String content) {
   // httpServer.send(200, "text/html", "");
   const int bufferSize = 1000;
@@ -387,7 +334,7 @@ void SuplaWebServer::sendContent(const String content) {
     bufferCounter = 0;
     _buffer = "";
   }
-
+  httpServer.sendContent_P(HTTP_RBT);
   httpServer.chunkedResponseFinalize();
 }
 
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 6709100c..51a4219e 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -63,8 +63,6 @@ class SuplaWebServer : public Supla::Element {
 
   const String SuplaFavicon();
   const String SuplaIconEdit();
-  const String SuplaJavaScript(String java_return = PATH_START);
-  const String SuplaSaveResult(int save);
   String supla_webpage_start(int save);
 
   void sendContent(const String content);

From e24d92e29e601023da2f04cc6bc3850a66d14458 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 24 Dec 2020 14:30:17 +0100
Subject: [PATCH 023/165] BUILD_VERSION='"GUI 1.0.9"'

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 725e3cd1..51e6c23e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.8"'
+build_flags =   -D BUILD_VERSION='"GUI 1.0.9"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC

From 7d941d10d943b4f57e6f0ffb27264ba94289c092 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 26 Dec 2020 21:57:18 +0100
Subject: [PATCH 024/165] poprawa kompilacji oled dla Arduino IDE

---
 src/GUI-Generic.ino    |  4 ++--
 src/SuplaDeviceGUI.cpp |  3 +++
 src/SuplaDeviceGUI.h   |  3 +++
 src/SuplaOled.cpp      |  6 ++----
 src/SuplaOled.h        | 36 +++++++++++++++++++++++++++++-------
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index e477a76e..96e8018e 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -153,8 +153,8 @@ void setup() {
 #endif
 #ifdef SUPLA_OLED
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
-      oled = new SuplaOled();
-      oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
+      Supla::GUI::oled = new SuplaOled();
+      Supla::GUI::oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
     }
 #endif
   }
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 64c418be..0ec13f80 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -179,6 +179,9 @@ std::vector<Supla::Sensor::DHT *> sensorDHT22;
 std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
 #endif
 
+#ifdef SUPLA_OLED
+SuplaOled *oled;
+#endif
 }  // namespace GUI
 }  // namespace Supla
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 7619e957..b195aa4b 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -126,6 +126,9 @@ extern std::vector<Supla::Sensor::DHT *> sensorDHT22;
 extern std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
 #endif
 
+#ifdef SUPLA_OLED
+extern SuplaOled *oled;
+#endif
 };  // namespace GUI
 };  // namespace Supla
 
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index e4bba5bd..0dfa7c1d 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -147,7 +147,7 @@ void displayBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, in
   display->drawString(10, display->getHeight() / 2, F("SUPLA"));
 }
 
-void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name = "\n") {
+void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name) {
   int drawHeightIcon = display->getHeight() / 2 - 10;
   int drawStringIcon = display->getHeight() / 2 - 5;
 
@@ -342,7 +342,7 @@ void SuplaOled::iterateAlways() {
 void SuplaOled::addButtonOled(int pin) {
   if (pin != OFF_GPIO) {
     Supla::Control::Button* button = new Supla::Control::Button(pin, true, true);
-    button->addAction(TURN_ON_OLED, oled, Supla::ON_PRESS);
+    button->addAction(TURN_ON_OLED, Supla::GUI::oled, Supla::ON_PRESS);
   }
 }
 
@@ -353,6 +353,4 @@ void SuplaOled::runAction(int event, int action) {
     oledON = true;
   }
 }
-
-SuplaOled* oled;
 #endif
\ No newline at end of file
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index 1a864cc9..3e6c6a96 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -1,22 +1,46 @@
 #ifndef SuplaOled_H
 #define SuplaOled_H
 
-#ifdef SUPLA_OLED
-
 #include "GUI-Generic_Config.h"
+
+#ifdef SUPLA_OLED
 #include <pgmspace.h>
 #include <supla/triggerable.h>
 #include <supla/element.h>
 #include <Wire.h>         // Only needed for Arduino 1.6.5 and earlier
-#include "SSD1306Wire.h"  //OLED 0,96"
-#include "SH1106Wire.h"   //OLED 1.3"
-#include "OLEDDisplayUi.h"
+#include <SSD1306Wire.h>  //OLED 0,96"
+#include <SH1106Wire.h>   //OLED 1.3"
+#include <OLEDDisplayUi.h>
 
 enum customActions
 {
   TURN_ON_OLED
 };
 
+String getTempString(double temperature);
+String getHumidityString(double humidity);
+String getPressureString(double pressure);
+uint8_t getFramesCountSensor(OLEDDisplayUiState* state);
+int32_t readRssi(void);
+void displaySignal(OLEDDisplay* display);
+void displayRelayState(OLEDDisplay* display);
+void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state);
+void displaySuplaStatus(OLEDDisplay* display);
+void displayConfigMode(OLEDDisplay* display);
+void displayBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name = "\n");
+void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity);
+void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure);
+void displayDs18b20(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayBme280Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayBme280Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayBme280Pressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displaySi7021SonoffTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displaySi7021SonoffHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayDHT22Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayDHT22Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayMAX6675Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+
 class SuplaOled : public Supla::Triggerable, public Supla::Element {
  public:
   SuplaOled();
@@ -40,8 +64,6 @@ class SuplaOled : public Supla::Triggerable, public Supla::Element {
   bool oledON = true;
 };
 
-extern SuplaOled *oled;
-
 // https://www.online-utility.org/image/convert/to/XBM
 #define temp_width  32
 #define temp_height 32

From 246310c34b932a04d37b05cbeb71420f2bf06abf Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 28 Dec 2020 16:48:27 +0100
Subject: [PATCH 025/165] wsparcie dla WEMOS OLED shield 64x48

---
 lib/SuplaDevice/src/supla/sensor/HJ101.cpp    |  151 ++
 lib/SuplaDevice/src/supla/sensor/HJ101.h      |   66 +
 lib/esp8266-oled-ssd1306-master/.editorconfig |   14 +
 .../.github/stale.yml                         |   17 +
 lib/esp8266-oled-ssd1306-master/.gitignore    |    2 +
 lib/esp8266-oled-ssd1306-master/.travis.yml   |   25 +
 .../CMakeLists.txt                            |    4 +
 .../CONTRIBUTING.md                           |   70 +
 lib/esp8266-oled-ssd1306-master/README.md     |  429 ++++++
 .../README_GEOMETRY_64_48.md                  |   20 +
 .../UPGRADE-3.0.md                            |  125 ++
 .../UPGRADE-4.0.md                            |   27 +
 lib/esp8266-oled-ssd1306-master/component.mk  |    3 +
 .../SSD1306ClockDemo/SSD1306ClockDemo.ino     |  214 +++
 .../examples/SSD1306ClockDemo/images.h        |   21 +
 .../SSD1306DrawingDemo/SSD1306DrawingDemo.ino |  233 +++
 .../SSD1306OTADemo/SSD1306OTADemo.ino         |  123 ++
 .../SSD1306SimpleDemo/SSD1306SimpleDemo.ino   |  197 +++
 .../examples/SSD1306SimpleDemo/images.h       |   28 +
 .../SSD1306TwoScreenDemo.ino                  |   75 +
 .../examples/SSD1306TwoScreenDemo/images.h    |   28 +
 .../examples/SSD1306UiDemo/SSD1306UiDemo.ino  |  194 +++
 .../examples/SSD1306UiDemo/images.h           |   50 +
 lib/esp8266-oled-ssd1306-master/library.json  |   29 +
 .../library.properties                        |    9 +
 lib/esp8266-oled-ssd1306-master/license       |   24 +
 .../platformio.ini                            |   19 +
 .../resources/DemoFrame1.jpg                  |  Bin 0 -> 16026 bytes
 .../resources/DemoFrame2.jpg                  |  Bin 0 -> 19502 bytes
 .../resources/DemoFrame3.jpg                  |  Bin 0 -> 21777 bytes
 .../resources/DemoFrame4.jpg                  |  Bin 0 -> 25325 bytes
 .../resources/FontTool.png                    |  Bin 0 -> 14052 bytes
 .../resources/SPI_version.jpg                 |  Bin 0 -> 26912 bytes
 .../resources/glyphEditor.html                |  664 +++++++++
 .../resources/glyphEditor.png                 |  Bin 0 -> 68751 bytes
 .../resources/xbmPreview.png                  |  Bin 0 -> 41692 bytes
 .../src/OLEDDisplay.cpp                       | 1043 ++++++++++++++
 .../src/OLEDDisplay.h                         |  383 +++++
 .../src/OLEDDisplayFonts.h                    | 1278 +++++++++++++++++
 .../src/OLEDDisplayUi.cpp                     |  468 ++++++
 .../src/OLEDDisplayUi.h                       |  315 ++++
 lib/esp8266-oled-ssd1306-master/src/SH1106.h  |   39 +
 .../src/SH1106Brzo.h                          |  141 ++
 .../src/SH1106Spi.h                           |  135 ++
 .../src/SH1106Wire.h                          |  205 +++
 lib/esp8266-oled-ssd1306-master/src/SSD1306.h |   39 +
 .../src/SSD1306Brzo.h                         |  167 +++
 .../src/SSD1306I2C.h                          |  152 ++
 .../src/SSD1306Spi.h                          |  163 +++
 .../src/SSD1306Wire.h                         |  211 +++
 src/SuplaCommonPROGMEM.h                      |    3 +-
 src/SuplaOled.cpp                             |   74 +-
 src/SuplaOled.h                               |   27 +-
 53 files changed, 7676 insertions(+), 28 deletions(-)
 create mode 100644 lib/SuplaDevice/src/supla/sensor/HJ101.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/HJ101.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/.editorconfig
 create mode 100644 lib/esp8266-oled-ssd1306-master/.github/stale.yml
 create mode 100644 lib/esp8266-oled-ssd1306-master/.gitignore
 create mode 100644 lib/esp8266-oled-ssd1306-master/.travis.yml
 create mode 100644 lib/esp8266-oled-ssd1306-master/CMakeLists.txt
 create mode 100644 lib/esp8266-oled-ssd1306-master/CONTRIBUTING.md
 create mode 100644 lib/esp8266-oled-ssd1306-master/README.md
 create mode 100644 lib/esp8266-oled-ssd1306-master/README_GEOMETRY_64_48.md
 create mode 100644 lib/esp8266-oled-ssd1306-master/UPGRADE-3.0.md
 create mode 100644 lib/esp8266-oled-ssd1306-master/UPGRADE-4.0.md
 create mode 100644 lib/esp8266-oled-ssd1306-master/component.mk
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/images.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306OTADemo/SSD1306OTADemo.ino
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/images.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/SSD1306TwoScreenDemo.ino
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/images.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/SSD1306UiDemo.ino
 create mode 100644 lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/images.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/library.json
 create mode 100644 lib/esp8266-oled-ssd1306-master/library.properties
 create mode 100644 lib/esp8266-oled-ssd1306-master/license
 create mode 100644 lib/esp8266-oled-ssd1306-master/platformio.ini
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame1.jpg
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame2.jpg
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame3.jpg
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame4.jpg
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/FontTool.png
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/SPI_version.jpg
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/glyphEditor.png
 create mode 100644 lib/esp8266-oled-ssd1306-master/resources/xbmPreview.png
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/OLEDDisplayFonts.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SH1106.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SH1106Brzo.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SH1106Spi.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SH1106Wire.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SSD1306.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SSD1306Brzo.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SSD1306I2C.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SSD1306Spi.h
 create mode 100644 lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h

diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
new file mode 100644
index 00000000..13b3f082
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
@@ -0,0 +1,151 @@
+#include "hj101.h"
+
+namespace Supla {
+namespace Sensor {
+
+HJ101::HJ101(int8_t pinCF, int8_t pinCF1, int8_t pinSEL, bool currentWhen, bool use_interrupts)
+    : pinCF(pinCF), pinCF1(pinCF1), pinSEL(pinSEL), currentWhen(currentWhen), use_interrupts(use_interrupts) {
+  hj101 = new HLW8012();
+  hj101->begin(pinCF, pinCF1, pinSEL, currentWhen, use_interrupts);
+
+  attachInterrupt(pinCF, hjl01_cf_interrupt, FALLING);
+  attachInterrupt(pinCF1, hjl01_cf1_interrupt, FALLING);
+}
+
+void HJ101::onInit() {
+  readValuesFromDevice();
+  updateChannelValues();
+}
+
+void HJ101::readValuesFromDevice() {
+  energy = _energy + (hj101->getEnergy() / 36);  // ----------  current energy value = value at start + (hj101->getEnergy() / 36) ----
+  unsigned int _reactive = 0;
+  double _pf = 0;
+  double _current = hj101->getCurrent();
+  unsigned int _voltage = hj101->getVoltage();
+  unsigned int _active = hj101->getActivePower();
+  unsigned int _apparent = _voltage * _current;
+  if (_apparent > _active) {
+    _reactive = sqrt(_apparent * _apparent - _active * _active);
+  }
+  else {
+    _reactive = 0;
+  }
+  if (_active > _apparent) {
+    _pf = 1;
+  }
+  if (_apparent == 0) {
+    _pf = 0;
+  }
+  else {
+    _pf = (double)_active / _apparent;
+  }
+  setVoltage(0, _voltage * 100);            // voltage in 0.01 V
+  setCurrent(0, _current * 1000);           // current in 0.001 A
+  setPowerActive(0, _active * 100000);      // power in 0.00001 kW
+  setFwdActEnergy(0, energy);               // energy in 0.00001 kWh
+  setPowerApparent(0, _apparent * 100000);  // power in 0.00001 kVA
+  setPowerReactive(0, _reactive * 100000);  // power in 0.00001 kvar
+  setPowerFactor(0, _pf * 1000);            // power in 0.001
+}
+
+void HJ101::onSaveState() {
+  double current_multiplier = getCurrentMultiplier();
+  double voltage_multiplier = getVoltageMultiplier();
+  double power_multiplier = getPowerMultiplier();
+
+  Supla::Storage::WriteState((unsigned char *)&energy, sizeof(energy));
+  Supla::Storage::WriteState((unsigned char *)&current_multiplier, sizeof(current_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&voltage_multiplier, sizeof(voltage_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&power_multiplier, sizeof(power_multiplier));
+}
+
+void HJ101::onLoadState() {
+  _supla_int64_t data;
+  double current_multiplier;
+  double voltage_multiplier;
+  double power_multiplier;
+
+  if (Supla::Storage::ReadState((unsigned char *)&data, sizeof(data))) {
+    setCounter(data);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&current_multiplier, sizeof(current_multiplier))) {
+    setCurrentMultiplier(current_multiplier);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier, sizeof(voltage_multiplier))) {
+    setVoltageMultiplier(voltage_multiplier);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&power_multiplier, sizeof(power_multiplier))) {
+    setPowerMultiplier(power_multiplier);
+  }
+}
+
+_supla_int64_t HJ101::getCounter() {
+  return energy;
+}
+
+void HJ101::setCounter(_supla_int64_t value) {
+  _energy = value;  // ----------  energy value read from memory at startup ----
+  setFwdActEnergy(0, value);
+}
+
+// When using interrupts we have to call the library entry point
+// whenever an interrupt is triggered
+void ICACHE_RAM_ATTR HJ101::hjl01_cf1_interrupt() {
+  hj101->cf1_interrupt();
+}
+
+void ICACHE_RAM_ATTR HJ101::hjl01_cf_interrupt() {
+  hj101->cf_interrupt();
+}
+
+void HJ101::calibrate(double calibPower, double calibVoltage) {
+  unsigned long timeout1 = millis();
+  while ((millis() - timeout1) < 10000) {
+    delay(10);
+  }
+
+  Serial.print(F("[HLW] Active Power (W)    : "));
+  Serial.println(hj101->getActivePower());
+  Serial.print(F("[HLW] Voltage (V)         : "));
+  Serial.println(hj101->getVoltage());
+  Serial.print(F("[HLW] Current (A)         : "));
+  Serial.println(hj101->getCurrent());
+
+  hj101->expectedActivePower(calibPower);
+  hj101->expectedVoltage(calibVoltage);
+  hj101->expectedCurrent(calibPower / calibVoltage);
+
+  unsigned long timeout2 = millis();
+  while ((millis() - timeout2) < 2000) {
+    delay(10);
+  }
+
+  double current_multi = getCurrentMultiplier();
+  double voltage_multi = getVoltageMultiplier();
+  double power_multi = getPowerMultiplier();
+
+  Serial.print(F("[HLW] New current multiplier : "));
+  Serial.println(current_multi);
+  Serial.print(F("[HLW] New voltage multiplier : "));
+  Serial.println(voltage_multi);
+  Serial.print(F("[HLW] New power multiplier   : "));
+  Serial.println(power_multi);
+  saveState();
+  yield();
+}
+
+void HJ101::saveState() {
+  Supla::Storage::PrepareState();
+  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+    element->onSaveState();
+  }
+  Supla::Storage::FinalizeSaveState();
+}
+
+HLW8012 *HJ101::hj101 = nullptr;
+};  // namespace Sensor
+};  // namespace Supla
\ No newline at end of file
diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.h b/lib/SuplaDevice/src/supla/sensor/HJ101.h
new file mode 100644
index 00000000..c4814604
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.h
@@ -0,0 +1,66 @@
+#ifndef _Hj101_h
+#define _Hj101_h
+
+#include <Arduino.h>
+#include <EEPROM.h>
+
+// https://github.com/xoseperez/hlw8012
+#include <HLW8012.h>
+#include <supla/storage/storage.h>
+#include <supla/element.h>
+#include "one_phase_electricity_meter.h"
+
+namespace Supla {
+namespace Sensor {
+
+class HJ101 : public OnePhaseElectricityMeter, public Element {
+ public:
+  HJ101(int8_t pinCF, int8_t pinCF1, int8_t pinSEL, bool currentWhen = LOW, bool use_interrupts = true);
+
+  void onInit();
+  void readValuesFromDevice();
+  void onSaveState();
+  void onLoadState();
+  _supla_int64_t getCounter();
+  void setCounter(_supla_int64_t value);
+  static void ICACHE_RAM_ATTR hjl01_cf1_interrupt();
+  static void ICACHE_RAM_ATTR hjl01_cf_interrupt();
+  void calibrate(double calibPower, double calibVoltage);
+  void saveState();
+
+  double getCurrentMultiplier() {
+    return hj101->getCurrentMultiplier();
+  };
+  double getVoltageMultiplier() {
+    return hj101->getVoltageMultiplier();
+  };
+  double getPowerMultiplier() {
+    return hj101->getPowerMultiplier();
+  };
+
+  void setCurrentMultiplier(double current_multiplier) {
+    hj101->setCurrentMultiplier(current_multiplier);
+  };
+  void setVoltageMultiplier(double voltage_multiplier) {
+    hj101->setVoltageMultiplier(voltage_multiplier);
+  };
+  void setPowerMultiplier(double power_multiplier) {
+    hj101->setPowerMultiplier(power_multiplier);
+  };
+
+ protected:
+  static HLW8012 *hj101;
+  int8_t pinCF;
+  int8_t pinCF1;
+  int8_t pinSEL;
+  bool currentWhen;
+  bool use_interrupts;
+
+  unsigned _supla_int64_t energy;
+  unsigned _supla_int64_t _energy;  // ----------  energy value read from memory at startup ----
+};
+
+};  // namespace Sensor
+};  // namespace Supla
+
+#endif
\ No newline at end of file
diff --git a/lib/esp8266-oled-ssd1306-master/.editorconfig b/lib/esp8266-oled-ssd1306-master/.editorconfig
new file mode 100644
index 00000000..79b24ae3
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/.editorconfig
@@ -0,0 +1,14 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+max_line_length = 120
+curly_bracket_next_line = false
diff --git a/lib/esp8266-oled-ssd1306-master/.github/stale.yml b/lib/esp8266-oled-ssd1306-master/.github/stale.yml
new file mode 100644
index 00000000..9bcd4eb1
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/.github/stale.yml
@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 180
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/lib/esp8266-oled-ssd1306-master/.gitignore b/lib/esp8266-oled-ssd1306-master/.gitignore
new file mode 100644
index 00000000..80e74646
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/.gitignore
@@ -0,0 +1,2 @@
+.vscode
+.pio
diff --git a/lib/esp8266-oled-ssd1306-master/.travis.yml b/lib/esp8266-oled-ssd1306-master/.travis.yml
new file mode 100644
index 00000000..1ade30e9
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/.travis.yml
@@ -0,0 +1,25 @@
+language: python
+python:
+    - "2.7"
+
+# Cache PlatformIO packages using Travis CI container-based infrastructure
+sudo: false
+cache:
+    directories:
+        - "~/.platformio"
+
+env:
+    - PLATFORMIO_CI_SRC=examples/SSD1306UiDemo
+    - PLATFORMIO_CI_SRC=examples/SSD1306SimpleDemo
+    - PLATFORMIO_CI_SRC=examples/SSD1306DrawingDemo
+    - PLATFORMIO_CI_SRC=examples/SSD1306OTADemo
+    - PLATFORMIO_CI_SRC=examples/SSD1306ClockDemo
+    - PLATFORMIO_CI_SRC=examples/SSD1306TwoScreenDemo
+
+
+install:
+    - pip install -U platformio
+    - platformio lib install 44
+
+script:
+    - platformio ci --lib="." --board=nodemcuv2
diff --git a/lib/esp8266-oled-ssd1306-master/CMakeLists.txt b/lib/esp8266-oled-ssd1306-master/CMakeLists.txt
new file mode 100644
index 00000000..705d9a07
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(COMPONENT_ADD_INCLUDEDIRS src)
+set(COMPONENT_PRIV_REQUIRES arduino-esp32)
+set(COMPONENT_SRCDIRS src)
+register_component()
diff --git a/lib/esp8266-oled-ssd1306-master/CONTRIBUTING.md b/lib/esp8266-oled-ssd1306-master/CONTRIBUTING.md
new file mode 100644
index 00000000..6ed01ad3
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/CONTRIBUTING.md
@@ -0,0 +1,70 @@
+# Contributing to ThingPulse OLED SSD1306
+
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+The following is a set of guidelines for contributing to the ThingPulse OLED SSD1306 library on GitHub. These are just guidelines, not rules, use your best judgment and feel free to propose changes to this document in a pull request.
+
+It is appreciated if you raise an issue _before_ you start changing the code, discussing the proposed change; emphasizing that you are proposing to develop the patch yourself, and outlining the strategy for implementation. This type of discussion is what we should be doing on the issues list and it is better to do this before or in parallel to developing the patch rather than having "you should have done it this way" type of feedback on the PR itself.
+
+### Table Of Contents
+* [General remarks](#general-remarks)
+* [Writing Documentation](#writing-documentation)
+* [Working with Git and GitHub](#working-with-git-and-github)
+  * [General flow](#general-flow)
+  * [Keeping your fork in sync](#keeping-your-fork-in-sync)
+  * [Commit messages](#commit-messages)
+
+## General remarks
+We are a friendly and welcoming community and look forward to your contributions. Once your contribution is integrated into this repository we feel responsible for it. Therefore, be prepared for constructive feedback. Before we merge anything we need to ensure that it fits in and is consistent with the rest of code.
+If you made something really cool but won't spend the time to integrate it into this upstream project please still share it in your fork on GitHub. If you mention it in an issue we'll take a look at it anyway.
+
+## Writing Documentation
+ThingPulse maintains documentation for its products at [https://github.com/thingpulse/docs/](https://github.com/thingpulse/docs/). If you contribute features for this project that require altering the respective product guide then we ask you to prepare a pull request with the necessary documentation changes as well.
+
+## Working with Git and GitHub
+
+Avoid intermediate merge commits. [Rebase](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) your feature branch onto `master` to pull updates and verify your local changes against them before placing the pull request.
+
+### General flow
+1. [Fork](https://help.github.com/articles/fork-a-repo) this repository on GitHub.
+1. [Create a branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/#creating-a-branch) in your fork on GitHub **based on the `master` branch**.
+1. Clone the fork on your machine with `git clone https://github.com/<your-account>/<esp8266-oled-ssd1306>.git`
+1. `cd <weather-station-fork>` then run `git remote add upstream https://github.com/ThingPulse/esp8266-oled-ssd1306`
+1. `git checkout <branch-name>`
+1. Make changes to the code base and commit them using e.g. `git commit -a -m 'Look ma, I did it'`
+1. When you're done bring your fork up-to-date with the upstream repo ([see below](#keeping-your-fork-in-sync)). Then rebase your branch on `master` running `git rebase master`.
+1. `git push`
+1. [Create a pull request](https://help.github.com/articles/creating-a-pull-request/) (PR) on GitHub.
+
+This is just one way of doing things. If you're proficient in Git matters you're free to choose your own. If you want to read more then the [GitHub chapter in the Git book](http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project#The-GitHub-Flow) is a way to start. [GitHub's own documentation](https://help.github.com/categories/collaborating/) contains a wealth of information as well.
+
+### Keeping your fork in sync
+You need to sync your fork with the upstream repository from time to time, latest before you rebase (see flow above).
+
+1. `git fetch upstream`
+1. `git checkout master`
+1. `git merge upstream/master`
+
+### Commit messages
+
+From: [http://git-scm.com/book/ch5-2.html](http://git-scm.com/book/ch5-2.html)
+<pre>
+Short (50 chars or less) summary of changes
+
+More detailed explanatory text, if necessary.  Wrap it to about 72
+characters or so.  In some contexts, the first line is treated as the
+subject of an email and the rest of the text as the body.  The blank
+line separating the summary from the body is critical (unless you omit
+the body entirely); tools like rebase can get confused if you run the
+two together.
+
+Further paragraphs come after blank lines.
+
+- Bullet points are okay, too
+- Typically a hyphen or asterisk is used for the bullet, preceded by a
+   single space, with blank lines in between, but conventions vary here
+</pre>
+
+Don't forget to [reference affected issues](https://help.github.com/articles/closing-issues-via-commit-messages/) in the commit message to have them closed automatically on GitHub.
+
+[Amend](https://help.github.com/articles/changing-a-commit-message/) your commit messages if necessary to make sure what the world sees on GitHub is as expressive and meaningful as possible.
diff --git a/lib/esp8266-oled-ssd1306-master/README.md b/lib/esp8266-oled-ssd1306-master/README.md
new file mode 100644
index 00000000..ff3a6ca4
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/README.md
@@ -0,0 +1,429 @@
+[![Build Status](https://travis-ci.org/ThingPulse/esp8266-oled-ssd1306.svg?branch=master)](https://travis-ci.org/ThingPulse/esp8266-oled-ssd1306)
+
+# ThingPulse OLED SSD1306 (ESP8266/ESP32/Mbed-OS)
+
+> We just released version 4.0.0. Please have a look at our [upgrade guide](UPGRADE-4.0.md)
+
+This is a driver for SSD1306 128x64, 128x32, 64x48 and 64x32 OLED displays running on the Arduino/ESP8266 & ESP32 and mbed-os platforms.
+Can be used with either the I2C or SPI version of the display.
+
+You can either download this library as a zip file and unpack it to your Arduino/libraries folder or find it in the Arduino library manager under "ESP8266 and ESP32 Oled Driver for SSD1306 display". For mbed-os a copy of the files are available as an mbed-os library. 
+
+It is also available as a platformio library. Just execute the following command:
+```
+platformio lib install 562
+```
+
+## Service level promise
+
+<table><tr><td><img src="https://thingpulse.com/assets/ThingPulse-open-source-prime.png" width="150">
+</td><td>This is a ThingPulse <em>prime</em> project. See our <a href="https://thingpulse.com/about/open-source-commitment/">open-source commitment declaration</a> for what this means.</td></tr></table>
+
+## Credits
+
+This library has initially been written by Daniel Eichhorn ([@squix78](https://github.com/squix78)). Many thanks go to Fabrice Weinberg ([@FWeinb](https://github.com/FWeinb)) for optimizing and refactoring many aspects of the library. Also many thanks to the many committers who helped to add new features and who fixed many bugs. Mbed-OS support and other improvements were contributed by Helmut Tschemernjak ([@helmut64](https://github.com/helmut64)).
+
+The init sequence for the SSD1306 was inspired by Adafruit's library for the same display.
+
+## mbed-os
+This library has been adopted to support the ARM mbed-os environment. A copy of this library is available in mbed-os under the name OLED_SSD1306 by Helmut Tschemernjak. An alternate installation option is to copy the following files into your mbed-os project: OLEDDisplay.cpp OLEDDisplay.h OLEDDisplayFonts.h OLEDDisplayUi.cpp OLEDDisplayUi.h SSD1306I2C.h
+
+## Usage
+
+Check out the examples folder for a few comprehensive demonstrations how to use the library. Also check out the [ESP8266 Weather Station](https://github.com/ThingPulse/esp8266-weather-station) library which uses the OLED library to display beautiful weather information.
+
+## Upgrade
+
+The API changed a lot with the 3.0 release. If you were using this library with older versions please have a look at the [Upgrade Guide](UPGRADE-3.0.md).
+
+Going from 3.x version to 4.0 a lot of internals changed and compatibility for more displays was added. Please read the [Upgrade Guide](UPGRADE-4.0.md).
+
+## Features
+
+* Draw pixels at given coordinates
+* Draw lines from given coordinates to given coordinates
+* Draw or fill a rectangle with given dimensions
+* Draw Text at given coordinates:
+ * Define Alignment: Left, Right and Center
+ * Set the Fontface you want to use (see section Fonts below)
+ * Limit the width of the text by an amount of pixels. Before this widths will be reached, the renderer will wrap the text to a new line if possible
+* Display content in automatically side scrolling carousel
+ * Define transition cycles
+ * Define how long one frame will be displayed
+ * Draw the different frames in callback methods
+ * One indicator per frame will be automatically displayed. The active frame will be displayed from inactive once
+
+## Fonts
+
+Fonts are defined in a proprietary but open format. You can create new font files by choosing from a given list
+of open sourced Fonts from this web app: http://oleddisplay.squix.ch
+Choose the font family, style and size, check the preview image and if you like what you see click the "Create" button. This will create the font array in a text area form where you can copy and paste it into a new or existing header file.
+
+
+![FontTool](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/FontTool.png)
+
+## Hardware Abstraction
+
+The library supports different protocols to access the OLED display. Currently there is support for I2C using the built in Wire.h library, I2C by using the much faster [BRZO I2C library](https://github.com/pasko-zh/brzo_i2c) written in assembler and it also supports displays which come with the SPI interface.
+
+### I2C with Wire.h
+
+```C++
+#include <Wire.h>  
+#include "SSD1306Wire.h"
+
+// for 128x64 displays:
+SSD1306Wire display(0x3c, SDA, SCL);  // ADDRESS, SDA, SCL
+// for 128x32 displays:
+// SSD1306Wire display(0x3c, SDA, SCL, GEOMETRY_128_32);  // ADDRESS, SDA, SCL, GEOMETRY_128_32 (or 128_64)
+// for using 2nd Hardware I2C (if available)
+// SSD1306Wire(0x3c, SDA, SCL, GEOMETRY_128_64, I2C_TWO); //default value is I2C_ONE if not mentioned
+// By default SD1306Wire set I2C frequency to 700000, you can use set either another frequency or skip setting the frequency by providing -1 value
+// SSD1306Wire(0x3c, SDA, SCL, GEOMETRY_128_64, I2C_ONE, 400000); //set I2C frequency to 400kHz
+// SSD1306Wire(0x3c, SDA, SCL, GEOMETRY_128_64, I2C_ONE, -1); //skip setting the I2C bus frequency
+```
+
+for a SH1106:
+```C++
+#include <Wire.h>  
+#include "SH1106Wire.h"
+
+SH1106Wire display(0x3c, SDA, SCL);  // ADDRESS, SDA, SCL
+// By default SH1106Wire set I2C frequency to 700000, you can use set either another frequency or skip setting the frequency by providing -1 value
+// SH1106Wire(0x3c, SDA, SCL, GEOMETRY_128_64, I2C_ONE, 400000); //set I2C frequency to 400kHz
+// SH1106Wire(0x3c, SDA, SCL, GEOMETRY_128_64, I2C_ONE, -1); //skip setting the I2C bus frequency
+```
+
+### I2C with brzo_i2c
+
+```C++
+#include <brzo_i2c.h>
+#include "SSD1306Brzo.h"
+
+SSD1306Brzo display(0x3c, SDA, SCL);  // ADDRESS, SDA, SCL
+```
+or for the SH1106:
+```C++
+#include <brzo_i2c.h>
+#include "SH1106Brzo.h"
+
+SH1106Brzo display(0x3c, SDA, SCL);  // ADDRESS, SDA, SCL
+```
+
+### SPI
+
+```C++
+#include <SPI.h>
+#include "SSD1306Spi.h"
+
+SSD1306Spi display(D0, D2, D8);  // RES, DC, CS
+```
+or for the SH1106:
+```C++
+#include <SPI.h>
+#include "SH1106Spi.h"
+
+SH1106Spi display(D0, D2);  // RES, DC
+```
+
+## API
+
+### Display Control
+
+```C++
+// Initialize the display
+void init();
+
+// Free the memory used by the display
+void end();
+
+// Cycle through the initialization
+void resetDisplay(void);
+
+// Connect again to the display through I2C
+void reconnect(void);
+
+// Turn the display on
+void displayOn(void);
+
+// Turn the display offs
+void displayOff(void);
+
+// Clear the local pixel buffer
+void clear(void);
+
+// Write the buffer to the display memory
+void display(void);
+
+// Inverted display mode
+void invertDisplay(void);
+
+// Normal display mode
+void normalDisplay(void);
+
+// Set display contrast
+// really low brightness & contrast: contrast = 10, precharge = 5, comdetect = 0
+// normal brightness & contrast:  contrast = 100
+void setContrast(uint8_t contrast, uint8_t precharge = 241, uint8_t comdetect = 64);
+
+// Convenience method to access
+void setBrightness(uint8_t);
+
+// Turn the display upside down
+void flipScreenVertically();
+
+// Draw the screen mirrored
+void mirrorScreen();
+```
+
+## Pixel drawing
+
+```C++
+
+/* Drawing functions */
+// Sets the color of all pixel operations
+// color : BLACK, WHITE, INVERSE
+void setColor(OLEDDISPLAY_COLOR color);
+
+// Draw a pixel at given position
+void setPixel(int16_t x, int16_t y);
+
+// Draw a line from position 0 to position 1
+void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1);
+
+// Draw the border of a rectangle at the given location
+void drawRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+// Fill the rectangle
+void fillRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+// Draw the border of a circle
+void drawCircle(int16_t x, int16_t y, int16_t radius);
+
+// Fill circle
+void fillCircle(int16_t x, int16_t y, int16_t radius);
+
+// Draw a line horizontally
+void drawHorizontalLine(int16_t x, int16_t y, int16_t length);
+
+// Draw a lin vertically
+void drawVerticalLine(int16_t x, int16_t y, int16_t length);
+
+// Draws a rounded progress bar with the outer dimensions given by width and height. Progress is
+// a unsigned byte value between 0 and 100
+void drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress);
+
+// Draw a bitmap in the internal image format
+void drawFastImage(int16_t x, int16_t y, int16_t width, int16_t height, const uint8_t *image);
+
+// Draw a XBM
+void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, const char* xbm);
+```
+
+## Text operations
+
+``` C++
+void drawString(int16_t x, int16_t y, String text);
+
+// Draws a String with a maximum width at the given location.
+// If the given String is wider than the specified width
+// The text will be wrapped to the next line at a space or dash
+void drawStringMaxWidth(int16_t x, int16_t y, int16_t maxLineWidth, String text);
+
+// Returns the width of the const char* with the current
+// font settings
+uint16_t getStringWidth(const char* text, uint16_t length);
+
+// Convencience method for the const char version
+uint16_t getStringWidth(String text);
+
+// Specifies relative to which anchor point
+// the text is rendered. Available constants:
+// TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER_BOTH
+void setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment);
+
+// Sets the current font. Available default fonts
+// ArialMT_Plain_10, ArialMT_Plain_16, ArialMT_Plain_24
+// Or create one with the font tool at http://oleddisplay.squix.ch
+void setFont(const uint8_t* fontData);
+```
+
+## Ui Library (OLEDDisplayUi)
+
+The Ui Library is used to provide a basic set of Ui elements called, `Frames` and `Overlays`. A `Frame` is used to provide
+information the default behaviour is to display a `Frame` for a defined time and than move to the next. The library also provides an `Indicator` that will be updated accordingly. An `Overlay` on the other hand is a pieces of information (e.g. a clock) that is displayed always at the same position.
+
+
+```C++
+/**
+ * Initialise the display
+ */
+void init();
+
+/**
+ * Configure the internal used target FPS
+ */
+void setTargetFPS(uint8_t fps);
+
+/**
+ * Enable automatic transition to next frame after the some time can be configured with
+ * `setTimePerFrame` and `setTimePerTransition`.
+ */
+void enableAutoTransition();
+
+/**
+ * Disable automatic transition to next frame.
+ */
+void disableAutoTransition();
+
+/**
+ * Set the direction if the automatic transitioning
+ */
+void setAutoTransitionForwards();
+void setAutoTransitionBackwards();
+
+/**
+ *  Set the approx. time a frame is displayed
+ */
+void setTimePerFrame(uint16_t time);
+
+/**
+ * Set the approx. time a transition will take
+ */
+void setTimePerTransition(uint16_t time);
+
+/**
+ * Draw the indicator.
+ * This is the default state for all frames if
+ * the indicator was hidden on the previous frame
+ * it will be slided in.
+ */
+void enableIndicator();
+
+/**
+ * Don't draw the indicator.
+ * This will slide out the indicator
+ * when transitioning to the next frame.
+ */
+void disableIndicator();
+
+/**
+ * Enable drawing of all indicators.
+ */
+void enableAllIndicators();
+
+/**
+ * Disable drawing of all indicators.
+ */
+void disableAllIndicators();
+
+/**
+ * Set the position of the indicator bar.
+ */
+void setIndicatorPosition(IndicatorPosition pos);
+
+/**
+ * Set the direction of the indicator bar. Defining the order of frames ASCENDING / DESCENDING
+ */
+void setIndicatorDirection(IndicatorDirection dir);
+
+/**
+ * Set the symbol to indicate an active frame in the indicator bar.
+ */
+void setActiveSymbol(const char* symbol);
+
+/**
+ * Set the symbol to indicate an inactive frame in the indicator bar.
+ */
+void setInactiveSymbol(const char* symbol);
+
+/**
+ * Configure what animation is used to transition from one frame to another
+ */
+void setFrameAnimation(AnimationDirection dir);
+
+/**
+ * Add frame drawing functions
+ */
+void setFrames(FrameCallback* frameFunctions, uint8_t frameCount);
+
+/**
+ * Add overlays drawing functions that are draw independent of the Frames
+ */
+void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
+
+/**
+ * Set the function that will draw each step
+ * in the loading animation
+ */
+void setLoadingDrawFunction(LoadingDrawFunction loadingDrawFunction);
+
+/**
+ * Run the loading process
+ */
+void runLoadingProcess(LoadingStage* stages, uint8_t stagesCount);
+
+// Manuell Controll
+void nextFrame();
+void previousFrame();
+
+/**
+ * Switch without transition to frame `frame`.
+ */
+void switchToFrame(uint8_t frame);
+
+/**
+ * Transition to frame `frame`, when the `frame` number is bigger than the current
+ * frame the forward animation will be used, otherwise the backwards animation is used.
+ */
+void transitionToFrame(uint8_t frame);
+
+// State Info
+OLEDDisplayUiState* getUiState();
+
+// This needs to be called in the main loop
+// the returned value is the remaining time (in ms)
+// you have to draw after drawing to keep the frame budget.
+int8_t update();
+```
+
+## Example: SSD1306Demo
+
+### Frame 1
+![DemoFrame1](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame1.jpg)
+
+This frame shows three things:
+ * How to draw an xbm image
+ * How to draw a static text which is not moved by the frame transition
+ * The active/inactive frame indicators
+
+### Frame 2
+![DemoFrame2](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame2.jpg)
+
+Currently there are one fontface with three sizes included in the library: Arial 10, 16 and 24. Once the converter is published you will be able to convert any ttf font into the used format.
+
+### Frame 3
+
+![DemoFrame3](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame3.jpg)
+
+This frame demonstrates the text alignment. The coordinates in the frame show relative to which position the texts have been rendered.
+
+### Frame 4
+
+![DemoFrame4](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame4.jpg)
+
+This shows how to use define a maximum width after which the driver automatically wraps a word to the next line. This comes in very handy if you have longer texts to display.
+
+### SPI version
+
+![SPIVersion](https://github.com/neptune2/esp8266-oled-ssd1306/raw/master/resources/SPI_version.jpg)
+
+This shows the code working on the SPI version of the display. See demo code for ESP8266 pins used.
+
+## Selection of projects using this library
+
+ * [QRCode ESP8266](https://github.com/anunpanya/ESP8266_QRcode) (by @anunpanya)
+ * [Scan I2C](https://github.com/hallard/Scan-I2C-WiFi) (by @hallard)
+ * [ThingPulse Weather Station](https://github.com/ThingPulse/esp8266-weather-station)
+ * [Meshtastic](https://www.meshtastic.org/) - an open source GPS communicator mesh radio
+ * Yours?
diff --git a/lib/esp8266-oled-ssd1306-master/README_GEOMETRY_64_48.md b/lib/esp8266-oled-ssd1306-master/README_GEOMETRY_64_48.md
new file mode 100644
index 00000000..9b9bf912
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/README_GEOMETRY_64_48.md
@@ -0,0 +1,20 @@
+# GEOMETRY_64_48
+
+The 64x48 geometry setting are working with the `Wire.h` and `brzo_i2c` libraries.
+
+I've tested it successfully with a WEMOS D1 mini Lite and a WEMOS OLED shield
+
+Initialization code:
+
+- Wire
+```
+#include <Wire.h>
+#include <SSD1306Wire.h>
+SSD1306Wire display(0x3c, D2, D1, GEOMETRY_64_48 ); // WEMOS OLED shield
+```
+
+- BRZO i2c
+```
+#include <SSD1306Brzo.h>
+SSD1306Brzo display(0x3c, D2, D1, GEOMETRY_64_48 ); // WEMOS OLED Shield
+```
diff --git a/lib/esp8266-oled-ssd1306-master/UPGRADE-3.0.md b/lib/esp8266-oled-ssd1306-master/UPGRADE-3.0.md
new file mode 100644
index 00000000..e7a315bc
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/UPGRADE-3.0.md
@@ -0,0 +1,125 @@
+# Upgrade from 2.0 to 3.0
+
+While developing version 3.0 we made some breaking changes to the public
+API of this library. This document will help you update your code to work with
+version 3.0
+
+## Font Definitions
+
+To get better performance and a smaller font definition format, we change the memory
+layout of the font definition format. If you are using custom fonts not included in
+this library we updated the font generator [here](http://oleddisplay.squix.ch/#/home).
+Please update your fonts to be working with 3.0 by selecting the respective version in the dropdown.
+
+
+## Architectural Changes
+
+To become a more versatile library for the SSD1306 chipset we abstracted the
+hardware connection into subclasses of the base display class now called `OLEDDisplay`.
+This library is currently shipping with three implementations:
+
+  * `SSD1306Wire` implementing the I2C protocol using the Wire Library.    
+  * `SSD1306Brzo` implementing the I2C protocol using the faster [`brzo_i2c`](https://github.com/pasko-zh/brzo_i2c) library.
+  * `SSD1306Spi` implementing the SPI protocol.
+
+To keep backwards compatiblity with the old API `SSD1306` is an alias of `SSD1306Wire`.
+If you are not using the UI components you don't have to change anything to keep your code working.
+
+## Name Changes
+
+[Naming things is hard](http://martinfowler.com/bliki/TwoHardThings.html), to better reflect our intention with this library
+we changed the name of the base class to `OLEDDisplay` and the UI library accordingly to `OLEDDisplayUi`.
+As a consequence the type definitions of all frame and overlay related functions changed.
+This means that you have to update all your frame drawing callbacks from:
+
+```c
+bool frame1(SSD1306 *display,  SSD1306UiState* state, int x, int y);
+```
+
+too
+
+```c
+void frame1(OLEDDisplay *display,  OLEDDisplayUiState* state, int16_t x, int16_t y);
+```
+
+And your overlay drawing functions from:
+
+```c
+bool overlay1(SSD1306 *display,  SSD1306UiState* state);
+```
+
+too
+
+```c
+void overlay1(OLEDDisplay *display,  OLEDDisplayUiState* state);
+```
+
+## New Features
+
+### Loading Animation
+
+While using this library ourself we noticed a pattern emerging. We want to drawing
+a loading progress while connecting to WiFi and updating weather data etc.
+
+The simplest thing was to add the function `drawProgressBar(x, y, width,  height, progress)`
+,where `progress` is between `0` and `100`, right to the `OLEDDisplay` class.
+
+But we didn't stop there. We added a new feature to the `OLEDDisplayUi` called `LoadingStages`.
+You can define your loading process like this:
+
+```c++
+LoadingStage loadingStages[] = {
+  {
+    .process = "Connect to WiFi",
+    .callback = []() {
+      // Connect to WiFi
+    }
+  },
+  {
+    .process = "Get time from NTP",
+    .callback = []() {
+      // Get current time via NTP
+    }
+  }
+  // more steps
+};
+
+int LOADING_STAGES_COUNT = sizeof(loadingStages) / sizeof(LoadingStage);
+```
+
+After defining your array of `LoadingStages` you can then run the loading process by using
+`ui.runLoadingProcess(loadingStages, LOADING_STAGES_COUNT)`. This will give you a
+nice little loading animation you can see in the beginning of [this](https://vimeo.com/168362918)
+video.
+
+To further customize this you are free to define your own `LoadingDrawFunction` like this:
+
+```c
+void myLoadingDraw(OLEDDisplay *display, LoadingStage* stage, uint8_t progress) {
+  display->setTextAlignment(TEXT_ALIGN_CENTER);
+  display->setFont(ArialMT_Plain_10);
+  // stage->process contains the text of the current progress e.q. "Connect to WiFi"
+  display->drawString(64, 18, stage->process);
+  // you could just print the current process without the progress bar
+  display->drawString(64, 28, progress);
+}
+```
+
+After defining a function like that, you can pass it to the Ui library by use
+`ui.setLoadingDrawFunction(myLoadingDraw)`.
+
+
+### Text Logging
+
+It is always useful to display some text on the display without worrying to much
+where it goes and managing it. In 3.0 we made the `OLEDDisplay` class implement
+[`Print`](https://github.com/arduino/Arduino/blob/master/hardware/arduino/avr/cores/arduino/Print.h)
+so you can use it like you would use `Serial`. We calls this feature `LogBuffer`
+and the only thing you have to do is to define how many lines you want to display
+and how many characters there are on average on each. This is done by calling
+`setLogBuffer(lines, chars);`. If there is not enough memory the function will
+return false.
+
+After that you can draw the `LogBuffer` anywhere you want by calling `drawLogBuffer(x, y)`.
+(Note: You have to call `display()` to update the screen)
+We made a [video](https://www.youtube.com/watch?v=8Fiss77A3TE) showing this feature in action.
diff --git a/lib/esp8266-oled-ssd1306-master/UPGRADE-4.0.md b/lib/esp8266-oled-ssd1306-master/UPGRADE-4.0.md
new file mode 100644
index 00000000..4b17693f
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/UPGRADE-4.0.md
@@ -0,0 +1,27 @@
+# Upgrade from 3.x to 4.0
+
+There are changes that breaks compatibility with older versions.
+
+1. You'll have to change data type for all your binary resources such as images and fonts from
+    
+    ```c
+    const char MySymbol[] PROGMEM = {
+    ```
+    
+    to
+    
+    ```c
+    const uint8_t MySymbol[] PROGMEM = {
+    ```
+
+1. Arguments of `setContrast` from `char` to `uint8_t`
+    
+    ```c++
+    void OLEDDisplay::setContrast(char contrast, char precharge, char comdetect);
+    ```
+    
+    to
+    
+    ```c++
+    void OLEDDisplay::setContrast(uint8_t contrast, uint8_t precharge, uint8_t comdetect);
+    ```
diff --git a/lib/esp8266-oled-ssd1306-master/component.mk b/lib/esp8266-oled-ssd1306-master/component.mk
new file mode 100644
index 00000000..23a01a07
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/component.mk
@@ -0,0 +1,3 @@
+COMPONENT_ADD_INCLUDEDIRS := src
+COMPONENT_SRCDIRS := src
+CXXFLAGS += -Wno-ignored-qualifiers
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino b/lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
new file mode 100644
index 00000000..63102cf0
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
@@ -0,0 +1,214 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#include <TimeLib.h>
+
+// Include the correct display library
+// For a connection via I2C using Wire include
+#include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
+// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
+// For a connection via I2C using brzo_i2c (must be installed) include
+// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Brzo.h"
+// #include "SH1106Brzo.h"
+// For a connection via SPI include
+// #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Spi.h"
+// #include "SH1106SPi.h"
+
+// Include the UI lib
+#include "OLEDDisplayUi.h"
+
+// Include custom images
+#include "images.h"
+
+// Use the corresponding display class:
+
+// Initialize the OLED display using SPI
+// D5 -> CLK
+// D7 -> MOSI (DOUT)
+// D0 -> RES
+// D2 -> DC
+// D8 -> CS
+// SSD1306Spi        display(D0, D2, D8);
+// or
+// SH1106Spi         display(D0, D2);
+
+// Initialize the OLED display using brzo_i2c
+// D3 -> SDA
+// D5 -> SCL
+// SSD1306Brzo display(0x3c, D3, D5);
+// or
+// SH1106Brzo  display(0x3c, D3, D5);
+
+// Initialize the OLED display using Wire library
+SSD1306Wire  display(0x3c, D3, D5);
+// SH1106 display(0x3c, D3, D5);
+
+OLEDDisplayUi ui ( &display );
+
+int screenW = 128;
+int screenH = 64;
+int clockCenterX = screenW/2;
+int clockCenterY = ((screenH-16)/2)+16;   // top yellow part is 16 px height
+int clockRadius = 23;
+
+// utility function for digital clock display: prints leading 0
+String twoDigits(int digits){
+  if(digits < 10) {
+    String i = '0'+String(digits);
+    return i;
+  }
+  else {
+    return String(digits);
+  }
+}
+
+void clockOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
+
+}
+
+void analogClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+//  ui.disableIndicator();
+
+  // Draw the clock face
+//  display->drawCircle(clockCenterX + x, clockCenterY + y, clockRadius);
+  display->drawCircle(clockCenterX + x, clockCenterY + y, 2);
+  //
+  //hour ticks
+  for( int z=0; z < 360;z= z + 30 ){
+  //Begin at 0° and stop at 360°
+    float angle = z ;
+    angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+    int x2 = ( clockCenterX + ( sin(angle) * clockRadius ) );
+    int y2 = ( clockCenterY - ( cos(angle) * clockRadius ) );
+    int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
+    int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
+    display->drawLine( x2 + x , y2 + y , x3 + x , y3 + y);
+  }
+
+  // display second hand
+  float angle = second() * 6 ;
+  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+  int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
+  int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
+  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
+  //
+  // display minute hand
+  angle = minute() * 6 ;
+  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+  x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
+  y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
+  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
+  //
+  // display hour hand
+  angle = hour() * 30 + int( ( minute() / 12 ) * 6 )   ;
+  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+  x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
+  y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
+  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
+}
+
+void digitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  String timenow = String(hour())+":"+twoDigits(minute())+":"+twoDigits(second());
+  display->setTextAlignment(TEXT_ALIGN_CENTER);
+  display->setFont(ArialMT_Plain_24);
+  display->drawString(clockCenterX + x , clockCenterY + y, timenow );
+}
+
+// This array keeps function pointers to all frames
+// frames are the single views that slide in
+FrameCallback frames[] = { analogClockFrame, digitalClockFrame };
+
+// how many frames are there?
+int frameCount = 2;
+
+// Overlays are statically drawn on top of a frame eg. a clock
+OverlayCallback overlays[] = { clockOverlay };
+int overlaysCount = 1;
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println();
+
+	// The ESP is capable of rendering 60fps in 80Mhz mode
+	// but that won't give you much time for anything else
+	// run it in 160Mhz mode or just set it to 30 fps
+  ui.setTargetFPS(60);
+
+	// Customize the active and inactive symbol
+  ui.setActiveSymbol(activeSymbol);
+  ui.setInactiveSymbol(inactiveSymbol);
+
+  // You can change this to
+  // TOP, LEFT, BOTTOM, RIGHT
+  ui.setIndicatorPosition(TOP);
+
+  // Defines where the first frame is located in the bar.
+  ui.setIndicatorDirection(LEFT_RIGHT);
+
+  // You can change the transition that is used
+  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
+  ui.setFrameAnimation(SLIDE_LEFT);
+
+  // Add frames
+  ui.setFrames(frames, frameCount);
+
+  // Add overlays
+  ui.setOverlays(overlays, overlaysCount);
+
+  // Initialising the UI will init the display too.
+  ui.init();
+
+  display.flipScreenVertically();
+
+  unsigned long secsSinceStart = millis();
+  // Unix time starts on Jan 1 1970. In seconds, that's 2208988800:
+  const unsigned long seventyYears = 2208988800UL;
+  // subtract seventy years:
+  unsigned long epoch = secsSinceStart - seventyYears * SECS_PER_HOUR;
+  setTime(epoch);
+
+}
+
+
+void loop() {
+  int remainingTimeBudget = ui.update();
+
+  if (remainingTimeBudget > 0) {
+    // You can do some work here
+    // Don't do stuff if you are below your
+    // time budget.
+    delay(remainingTimeBudget);
+
+  }
+
+
+}
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/images.h b/lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/images.h
new file mode 100644
index 00000000..1889188f
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306ClockDemo/images.h
@@ -0,0 +1,21 @@
+const unsigned char activeSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00011000,
+    B00100100,
+    B01000010,
+    B01000010,
+    B00100100,
+    B00011000
+};
+
+const unsigned char inactiveSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00000000,
+    B00000000,
+    B00011000,
+    B00011000,
+    B00000000,
+    B00000000
+};
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino b/lib/esp8266-oled-ssd1306-master/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino
new file mode 100644
index 00000000..43bd9747
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino
@@ -0,0 +1,233 @@
+ /**
+  * The MIT License (MIT)
+  *
+  * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+  * Copyright (c) 2018 by Fabrice Weinberg
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a copy
+  * of this software and associated documentation files (the "Software"), to deal
+  * in the Software without restriction, including without limitation the rights
+  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  * copies of the Software, and to permit persons to whom the Software is
+  * furnished to do so, subject to the following conditions:
+  *
+  * The above copyright notice and this permission notice shall be included in all
+  * copies or substantial portions of the Software.
+  *
+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  * SOFTWARE.
+  *
+  * ThingPulse invests considerable time and money to develop these open source libraries.
+  * Please support us by buying our products (and not the clones) from
+  * https://thingpulse.com
+  *
+  */
+
+ // Include the correct display library
+ // For a connection via I2C using Wire include
+ #include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
+ // or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
+ // For a connection via I2C using brzo_i2c (must be installed) include
+ // #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
+ // #include "SSD1306Brzo.h"
+ // #include "SH1106Brzo.h"
+ // For a connection via SPI include
+ // #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
+ // #include "SSD1306Spi.h"
+ // #include "SH1106SPi.h"
+
+ // Use the corresponding display class:
+
+ // Initialize the OLED display using SPI
+ // D5 -> CLK
+ // D7 -> MOSI (DOUT)
+ // D0 -> RES
+ // D2 -> DC
+ // D8 -> CS
+ // SSD1306Spi        display(D0, D2, D8);
+ // or
+ // SH1106Spi         display(D0, D2);
+
+ // Initialize the OLED display using brzo_i2c
+ // D3 -> SDA
+ // D5 -> SCL
+ // SSD1306Brzo display(0x3c, D3, D5);
+ // or
+ // SH1106Brzo  display(0x3c, D3, D5);
+
+ // Initialize the OLED display using Wire library
+ SSD1306Wire  display(0x3c, D3, D5);
+ // SH1106 display(0x3c, D3, D5);
+
+// Adapted from Adafruit_SSD1306
+void drawLines() {
+  for (int16_t i=0; i<display.getWidth(); i+=4) {
+    display.drawLine(0, 0, i, display.getHeight()-1);
+    display.display();
+    delay(10);
+  }
+  for (int16_t i=0; i<display.getHeight(); i+=4) {
+    display.drawLine(0, 0, display.getWidth()-1, i);
+    display.display();
+    delay(10);
+  }
+  delay(250);
+
+  display.clear();
+  for (int16_t i=0; i<display.getWidth(); i+=4) {
+    display.drawLine(0, display.getHeight()-1, i, 0);
+    display.display();
+    delay(10);
+  }
+  for (int16_t i=display.getHeight()-1; i>=0; i-=4) {
+    display.drawLine(0, display.getHeight()-1, display.getWidth()-1, i);
+    display.display();
+    delay(10);
+  }
+  delay(250);
+
+  display.clear();
+  for (int16_t i=display.getWidth()-1; i>=0; i-=4) {
+    display.drawLine(display.getWidth()-1, display.getHeight()-1, i, 0);
+    display.display();
+    delay(10);
+  }
+  for (int16_t i=display.getHeight()-1; i>=0; i-=4) {
+    display.drawLine(display.getWidth()-1, display.getHeight()-1, 0, i);
+    display.display();
+    delay(10);
+  }
+  delay(250);
+  display.clear();
+  for (int16_t i=0; i<display.getHeight(); i+=4) {
+    display.drawLine(display.getWidth()-1, 0, 0, i);
+    display.display();
+    delay(10);
+  }
+  for (int16_t i=0; i<display.getWidth(); i+=4) {
+    display.drawLine(display.getWidth()-1, 0, i, display.getHeight()-1);
+    display.display();
+    delay(10);
+  }
+  delay(250);
+}
+
+// Adapted from Adafruit_SSD1306
+void drawRect(void) {
+  for (int16_t i=0; i<display.getHeight()/2; i+=2) {
+    display.drawRect(i, i, display.getWidth()-2*i, display.getHeight()-2*i);
+    display.display();
+    delay(10);
+  }
+}
+
+// Adapted from Adafruit_SSD1306
+void fillRect(void) {
+  uint8_t color = 1;
+  for (int16_t i=0; i<display.getHeight()/2; i+=3) {
+    display.setColor((color % 2 == 0) ? BLACK : WHITE); // alternate colors
+    display.fillRect(i, i, display.getWidth() - i*2, display.getHeight() - i*2);
+    display.display();
+    delay(10);
+    color++;
+  }
+  // Reset back to WHITE
+  display.setColor(WHITE);
+}
+
+// Adapted from Adafruit_SSD1306
+void drawCircle(void) {
+  for (int16_t i=0; i<display.getHeight(); i+=2) {
+    display.drawCircle(display.getWidth()/2, display.getHeight()/2, i);
+    display.display();
+    delay(10);
+  }
+  delay(1000);
+  display.clear();
+
+  // This will draw the part of the circel in quadrant 1
+  // Quadrants are numberd like this:
+  //   0010 | 0001
+  //  ------|-----
+  //   0100 | 1000
+  //
+  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00000001);
+  display.display();
+  delay(200);
+  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00000011);
+  display.display();
+  delay(200);
+  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00000111);
+  display.display();
+  delay(200);
+  display.drawCircleQuads(display.getWidth()/2, display.getHeight()/2, display.getHeight()/4, 0b00001111);
+  display.display();
+}
+
+void printBuffer(void) {
+  // Initialize the log buffer
+  // allocate memory to store 8 lines of text and 30 chars per line.
+  display.setLogBuffer(5, 30);
+
+  // Some test data
+  const char* test[] = {
+      "Hello",
+      "World" ,
+      "----",
+      "Show off",
+      "how",
+      "the log buffer",
+      "is",
+      "working.",
+      "Even",
+      "scrolling is",
+      "working"
+  };
+
+  for (uint8_t i = 0; i < 11; i++) {
+    display.clear();
+    // Print to the screen
+    display.println(test[i]);
+    // Draw it to the internal screen buffer
+    display.drawLogBuffer(0, 0);
+    // Display it on the screen
+    display.display();
+    delay(500);
+  }
+}
+
+void setup() {
+  display.init();
+
+  // display.flipScreenVertically();
+
+  display.setContrast(255);
+
+  drawLines();
+  delay(1000);
+  display.clear();
+
+  drawRect();
+  delay(1000);
+  display.clear();
+
+  fillRect();
+  delay(1000);
+  display.clear();
+
+  drawCircle();
+  delay(1000);
+  display.clear();
+
+  printBuffer();
+  delay(1000);
+  display.clear();
+}
+
+void loop() { }
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306OTADemo/SSD1306OTADemo.ino b/lib/esp8266-oled-ssd1306-master/examples/SSD1306OTADemo/SSD1306OTADemo.ino
new file mode 100644
index 00000000..e207d4a9
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306OTADemo/SSD1306OTADemo.ino
@@ -0,0 +1,123 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+// WiFi includes
+ #include <ESP8266WiFi.h>
+
+ // OTA Includes
+ #include <ESP8266mDNS.h>
+ #include <ArduinoOTA.h>
+
+ const char *ssid         = "[Your SSID]";
+ const char *password     = "[Your Password]";
+
+
+// Include the correct display library
+// For a connection via I2C using Wire include
+#include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
+// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
+// For a connection via I2C using brzo_i2c (must be installed) include
+// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Brzo.h"
+// #include "SH1106Brzo.h"
+// For a connection via SPI include
+// #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Spi.h"
+// #include "SH1106SPi.h"
+
+// Use the corresponding display class:
+
+// Initialize the OLED display using SPI
+// D5 -> CLK
+// D7 -> MOSI (DOUT)
+// D0 -> RES
+// D2 -> DC
+// D8 -> CS
+// SSD1306Spi        display(D0, D2, D8);
+// or
+// SH1106Spi         display(D0, D2);
+
+// Initialize the OLED display using brzo_i2c
+// D3 -> SDA
+// D5 -> SCL
+// SSD1306Brzo display(0x3c, D3, D5);
+// or
+// SH1106Brzo  display(0x3c, D3, D5);
+
+// Initialize the OLED display using Wire library
+SSD1306Wire  display(0x3c, D3, D5);
+// SH1106 display(0x3c, D3, D5);
+
+
+void setup() {
+  WiFi.begin ( ssid, password );
+
+  // Wait for connection
+  while ( WiFi.status() != WL_CONNECTED ) {
+    delay ( 10 );
+  }
+
+  display.init();
+  display.flipScreenVertically();
+  display.setContrast(255);
+
+  ArduinoOTA.begin();
+  ArduinoOTA.onStart([]() {
+    display.clear();
+    display.setFont(ArialMT_Plain_10);
+    display.setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
+    display.drawString(display.getWidth()/2, display.getHeight()/2 - 10, "OTA Update");
+    display.display();
+  });
+
+  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
+    display.drawProgressBar(4, 32, 120, 8, progress / (total / 100) );
+    display.display();
+  });
+
+  ArduinoOTA.onEnd([]() {
+    display.clear();
+    display.setFont(ArialMT_Plain_10);
+    display.setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
+    display.drawString(display.getWidth()/2, display.getHeight()/2, "Restart");
+    display.display();
+  });
+
+  // Align text vertical/horizontal center
+  display.setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
+  display.setFont(ArialMT_Plain_10);
+  display.drawString(display.getWidth()/2, display.getHeight()/2, "Ready for OTA:\n" + WiFi.localIP().toString());
+  display.display();
+}
+
+void loop() {
+  ArduinoOTA.handle();
+}
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino b/lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
new file mode 100644
index 00000000..8d715e44
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
@@ -0,0 +1,197 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+ 
+// Include the correct display library
+
+// For a connection via I2C using the Arduino Wire include:
+#include <Wire.h>               // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306Wire.h"        // legacy: #include "SSD1306.h"
+// OR #include "SH1106Wire.h"   // legacy: #include "SH1106.h"
+
+// For a connection via I2C using brzo_i2c (must be installed) include:
+// #include <brzo_i2c.h>        // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Brzo.h"
+// OR #include "SH1106Brzo.h"
+
+// For a connection via SPI include:
+// #include <SPI.h>             // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Spi.h"
+// OR #include "SH1106SPi.h"
+
+
+// Optionally include custom images
+#include "images.h"
+
+
+// Initialize the OLED display using Arduino Wire:
+SSD1306Wire display(0x3c, SDA, SCL);   // ADDRESS, SDA, SCL  -  SDA and SCL usually populate automatically based on your board's pins_arduino.h
+// SSD1306Wire display(0x3c, D3, D5);  // ADDRESS, SDA, SCL  -  If not, they can be specified manually.
+// SSD1306Wire display(0x3c, SDA, SCL, GEOMETRY_128_32);  // ADDRESS, SDA, SCL, OLEDDISPLAY_GEOMETRY  -  Extra param required for 128x32 displays.
+// SH1106 display(0x3c, SDA, SCL);     // ADDRESS, SDA, SCL
+
+// Initialize the OLED display using brzo_i2c:
+// SSD1306Brzo display(0x3c, D3, D5);  // ADDRESS, SDA, SCL
+// or
+// SH1106Brzo display(0x3c, D3, D5);   // ADDRESS, SDA, SCL
+
+// Initialize the OLED display using SPI:
+// D5 -> CLK
+// D7 -> MOSI (DOUT)
+// D0 -> RES
+// D2 -> DC
+// D8 -> CS
+// SSD1306Spi display(D0, D2, D8);  // RES, DC, CS
+// or
+// SH1106Spi display(D0, D2);       // RES, DC
+
+
+#define DEMO_DURATION 3000
+typedef void (*Demo)(void);
+
+int demoMode = 0;
+int counter = 1;
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println();
+
+
+  // Initialising the UI will init the display too.
+  display.init();
+
+  display.flipScreenVertically();
+  display.setFont(ArialMT_Plain_10);
+
+}
+
+void drawFontFaceDemo() {
+    // Font Demo1
+    // create more fonts at http://oleddisplay.squix.ch/
+    display.setTextAlignment(TEXT_ALIGN_LEFT);
+    display.setFont(ArialMT_Plain_10);
+    display.drawString(0, 0, "Hello world");
+    display.setFont(ArialMT_Plain_16);
+    display.drawString(0, 10, "Hello world");
+    display.setFont(ArialMT_Plain_24);
+    display.drawString(0, 26, "Hello world");
+}
+
+void drawTextFlowDemo() {
+    display.setFont(ArialMT_Plain_10);
+    display.setTextAlignment(TEXT_ALIGN_LEFT);
+    display.drawStringMaxWidth(0, 0, 128,
+      "Lorem ipsum\n dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore." );
+}
+
+void drawTextAlignmentDemo() {
+    // Text alignment demo
+  display.setFont(ArialMT_Plain_10);
+
+  // The coordinates define the left starting point of the text
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+  display.drawString(0, 10, "Left aligned (0,10)");
+
+  // The coordinates define the center of the text
+  display.setTextAlignment(TEXT_ALIGN_CENTER);
+  display.drawString(64, 22, "Center aligned (64,22)");
+
+  // The coordinates define the right end of the text
+  display.setTextAlignment(TEXT_ALIGN_RIGHT);
+  display.drawString(128, 33, "Right aligned (128,33)");
+}
+
+void drawRectDemo() {
+      // Draw a pixel at given position
+    for (int i = 0; i < 10; i++) {
+      display.setPixel(i, i);
+      display.setPixel(10 - i, i);
+    }
+    display.drawRect(12, 12, 20, 20);
+
+    // Fill the rectangle
+    display.fillRect(14, 14, 17, 17);
+
+    // Draw a line horizontally
+    display.drawHorizontalLine(0, 40, 20);
+
+    // Draw a line horizontally
+    display.drawVerticalLine(40, 0, 20);
+}
+
+void drawCircleDemo() {
+  for (int i=1; i < 8; i++) {
+    display.setColor(WHITE);
+    display.drawCircle(32, 32, i*3);
+    if (i % 2 == 0) {
+      display.setColor(BLACK);
+    }
+    display.fillCircle(96, 32, 32 - i* 3);
+  }
+}
+
+void drawProgressBarDemo() {
+  int progress = (counter / 5) % 100;
+  // draw the progress bar
+  display.drawProgressBar(0, 32, 120, 10, progress);
+
+  // draw the percentage as String
+  display.setTextAlignment(TEXT_ALIGN_CENTER);
+  display.drawString(64, 15, String(progress) + "%");
+}
+
+void drawImageDemo() {
+    // see http://blog.squix.org/2015/05/esp8266-nodemcu-how-to-create-xbm.html
+    // on how to create xbm files
+    display.drawXbm(34, 14, WiFi_Logo_width, WiFi_Logo_height, WiFi_Logo_bits);
+}
+
+Demo demos[] = {drawFontFaceDemo, drawTextFlowDemo, drawTextAlignmentDemo, drawRectDemo, drawCircleDemo, drawProgressBarDemo, drawImageDemo};
+int demoLength = (sizeof(demos) / sizeof(Demo));
+long timeSinceLastModeSwitch = 0;
+
+void loop() {
+  // clear the display
+  display.clear();
+  // draw the current demo method
+  demos[demoMode]();
+
+  display.setTextAlignment(TEXT_ALIGN_RIGHT);
+  display.drawString(10, 128, String(millis()));
+  // write the buffer to the display
+  display.display();
+
+  if (millis() - timeSinceLastModeSwitch > DEMO_DURATION) {
+    demoMode = (demoMode + 1)  % demoLength;
+    timeSinceLastModeSwitch = millis();
+  }
+  counter++;
+  delay(10);
+}
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/images.h b/lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/images.h
new file mode 100644
index 00000000..50417990
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306SimpleDemo/images.h
@@ -0,0 +1,28 @@
+#define WiFi_Logo_width 60
+#define WiFi_Logo_height 36
+const uint8_t WiFi_Logo_bits[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
+  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
+  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
+  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
+  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
+  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
+  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
+  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
+  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
+  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  };
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/SSD1306TwoScreenDemo.ino b/lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/SSD1306TwoScreenDemo.ino
new file mode 100644
index 00000000..b9595d8d
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/SSD1306TwoScreenDemo.ino
@@ -0,0 +1,75 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+// Include the correct display library
+// For a connection via I2C using Wire include
+#include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
+#include "images.h"
+
+// Initialize the OLED display using Wire library
+SSD1306Wire  display(0x3c, D3, D5);
+SSD1306Wire  display2(0x3c, D1, D2);
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println();
+
+
+  // Initialising the UI will init the display too.
+  display.init();
+  display2.init();
+
+  // This will make sure that multiple instances of a display driver
+  // running on different ports will work together transparently
+  display.setI2cAutoInit(true);
+  display2.setI2cAutoInit(true);
+
+  display.flipScreenVertically();
+  display.setFont(ArialMT_Plain_10);
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+
+  display2.flipScreenVertically();
+  display2.setFont(ArialMT_Plain_10);
+  display2.setTextAlignment(TEXT_ALIGN_LEFT);
+
+}
+
+void loop() {
+  display.clear();
+  display.drawString(0, 0, "Hello world: " + String(millis()));
+  display.display();
+
+  display2.clear();
+  display2.drawString(0, 0, "Hello world: " + String(millis()));
+  display2.display();
+
+  delay(10);
+}
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/images.h b/lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/images.h
new file mode 100644
index 00000000..50417990
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306TwoScreenDemo/images.h
@@ -0,0 +1,28 @@
+#define WiFi_Logo_width 60
+#define WiFi_Logo_height 36
+const uint8_t WiFi_Logo_bits[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
+  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
+  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
+  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
+  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
+  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
+  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
+  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
+  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
+  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  };
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/SSD1306UiDemo.ino b/lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/SSD1306UiDemo.ino
new file mode 100644
index 00000000..72c836bf
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/SSD1306UiDemo.ino
@@ -0,0 +1,194 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+ // Include the correct display library
+ // For a connection via I2C using Wire include
+ #include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+ #include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
+ // or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
+ // For a connection via I2C using brzo_i2c (must be installed) include
+ // #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
+ // #include "SSD1306Brzo.h"
+ // #include "SH1106Brzo.h"
+ // For a connection via SPI include
+ // #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
+ // #include "SSD1306Spi.h"
+ // #include "SH1106SPi.h"
+
+// Include the UI lib
+#include "OLEDDisplayUi.h"
+
+// Include custom images
+
+#include "images.h"
+
+// Use the corresponding display class:
+
+// Initialize the OLED display using SPI
+// D5 -> CLK
+// D7 -> MOSI (DOUT)
+// D0 -> RES
+// D2 -> DC
+// D8 -> CS
+// SSD1306Spi        display(D0, D2, D8);
+// or
+// SH1106Spi         display(D0, D2);
+
+// Initialize the OLED display using brzo_i2c
+// D3 -> SDA
+// D5 -> SCL
+// SSD1306Brzo display(0x3c, D3, D5);
+// or
+// SH1106Brzo  display(0x3c, D3, D5);
+
+// Initialize the OLED display using Wire library
+SSD1306Wire  display(0x3c, D3, D5);
+// SH1106Wire display(0x3c, D3, D5);
+
+OLEDDisplayUi ui     ( &display );
+
+void msOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
+  display->setTextAlignment(TEXT_ALIGN_RIGHT);
+  display->setFont(ArialMT_Plain_10);
+  display->drawString(128, 0, String(millis()));
+}
+
+void drawFrame1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // draw an xbm image.
+  // Please note that everything that should be transitioned
+  // needs to be drawn relative to x and y
+
+  display->drawXbm(x + 34, y + 14, WiFi_Logo_width, WiFi_Logo_height, WiFi_Logo_bits);
+}
+
+void drawFrame2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // Demonstrates the 3 included default sizes. The fonts come from SSD1306Fonts.h file
+  // Besides the default fonts there will be a program to convert TrueType fonts into this format
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->setFont(ArialMT_Plain_10);
+  display->drawString(0 + x, 10 + y, "Arial 10");
+
+  display->setFont(ArialMT_Plain_16);
+  display->drawString(0 + x, 20 + y, "Arial 16");
+
+  display->setFont(ArialMT_Plain_24);
+  display->drawString(0 + x, 34 + y, "Arial 24");
+}
+
+void drawFrame3(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // Text alignment demo
+  display->setFont(ArialMT_Plain_10);
+
+  // The coordinates define the left starting point of the text
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->drawString(0 + x, 11 + y, "Left aligned (0,10)");
+
+  // The coordinates define the center of the text
+  display->setTextAlignment(TEXT_ALIGN_CENTER);
+  display->drawString(64 + x, 22 + y, "Center aligned (64,22)");
+
+  // The coordinates define the right end of the text
+  display->setTextAlignment(TEXT_ALIGN_RIGHT);
+  display->drawString(128 + x, 33 + y, "Right aligned (128,33)");
+}
+
+void drawFrame4(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // Demo for drawStringMaxWidth:
+  // with the third parameter you can define the width after which words will be wrapped.
+  // Currently only spaces and "-" are allowed for wrapping
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->setFont(ArialMT_Plain_10);
+  display->drawStringMaxWidth(0 + x, 10 + y, 128, "Lorem ipsum\n dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore.");
+}
+
+void drawFrame5(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+
+}
+
+// This array keeps function pointers to all frames
+// frames are the single views that slide in
+FrameCallback frames[] = { drawFrame1, drawFrame2, drawFrame3, drawFrame4, drawFrame5 };
+
+// how many frames are there?
+int frameCount = 5;
+
+// Overlays are statically drawn on top of a frame eg. a clock
+OverlayCallback overlays[] = { msOverlay };
+int overlaysCount = 1;
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println();
+
+	// The ESP is capable of rendering 60fps in 80Mhz mode
+	// but that won't give you much time for anything else
+	// run it in 160Mhz mode or just set it to 30 fps
+  ui.setTargetFPS(60);
+
+	// Customize the active and inactive symbol
+  ui.setActiveSymbol(activeSymbol);
+  ui.setInactiveSymbol(inactiveSymbol);
+
+  // You can change this to
+  // TOP, LEFT, BOTTOM, RIGHT
+  ui.setIndicatorPosition(BOTTOM);
+
+  // Defines where the first frame is located in the bar.
+  ui.setIndicatorDirection(LEFT_RIGHT);
+
+  // You can change the transition that is used
+  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
+  ui.setFrameAnimation(SLIDE_LEFT);
+
+  // Add frames
+  ui.setFrames(frames, frameCount);
+
+  // Add overlays
+  ui.setOverlays(overlays, overlaysCount);
+
+  // Initialising the UI will init the display too.
+  ui.init();
+
+  display.flipScreenVertically();
+
+}
+
+
+void loop() {
+  int remainingTimeBudget = ui.update();
+
+  if (remainingTimeBudget > 0) {
+    // You can do some work here
+    // Don't do stuff if you are below your
+    // time budget.
+    delay(remainingTimeBudget);
+  }
+}
diff --git a/lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/images.h b/lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/images.h
new file mode 100644
index 00000000..2489d1e5
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/examples/SSD1306UiDemo/images.h
@@ -0,0 +1,50 @@
+#define WiFi_Logo_width 60
+#define WiFi_Logo_height 36
+const uint8_t WiFi_Logo_bits[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
+  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
+  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
+  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
+  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
+  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
+  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
+  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
+  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
+  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  };
+
+const uint8_t activeSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00011000,
+    B00100100,
+    B01000010,
+    B01000010,
+    B00100100,
+    B00011000
+};
+
+const uint8_t inactiveSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00000000,
+    B00000000,
+    B00011000,
+    B00011000,
+    B00000000,
+    B00000000
+};
diff --git a/lib/esp8266-oled-ssd1306-master/library.json b/lib/esp8266-oled-ssd1306-master/library.json
new file mode 100644
index 00000000..446d8e08
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/library.json
@@ -0,0 +1,29 @@
+{
+  "name": "ESP8266 and ESP32 OLED driver for SSD1306 displays",
+  "version": "4.1.0",
+  "keywords": "ssd1306, oled, display, i2c",
+  "description": "I2C display driver for SSD1306 OLED displays connected to ESP8266, ESP32, Mbed-OS",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/ThingPulse/esp8266-oled-ssd1306"
+  },
+  "authors":
+  [
+    {
+        "name": "Daniel Eichhorn, ThingPulse",
+        "email": "squix78@gmail.com",
+        "url": "https://thingpulse.com"
+    },
+    {
+        "name": "Fabrice Weinberg",
+        "email": "fabrice@weinberg.me"
+    }
+  ],
+  "frameworks": "arduino",
+  "platforms": [
+    "espressif8266",
+    "espressif32",
+    "nordicnrf52"
+  ]
+}
diff --git a/lib/esp8266-oled-ssd1306-master/library.properties b/lib/esp8266-oled-ssd1306-master/library.properties
new file mode 100644
index 00000000..a62c352f
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/library.properties
@@ -0,0 +1,9 @@
+name=ESP8266 and ESP32 OLED driver for SSD1306 displays
+version=4.1.0
+author=ThingPulse, Fabrice Weinberg
+maintainer=ThingPulse <info@thingpulse.com>
+sentence=I2C display driver for SSD1306 OLED displays connected to ESP8266, ESP32, Mbed-OS
+paragraph=The following geometries are currently supported: 128x64, 128x32, 64x48. The init sequence was inspired by Adafruit's library for the same display.
+category=Display
+url=https://github.com/ThingPulse/esp8266-oled-ssd1306
+architectures=esp8266,esp32
diff --git a/lib/esp8266-oled-ssd1306-master/license b/lib/esp8266-oled-ssd1306-master/license
new file mode 100644
index 00000000..706c10fe
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/license
@@ -0,0 +1,24 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 by Daniel Eichhorn
+Copyright (c) 2016 by Fabrice Weinberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+See more at http://blog.squix.ch
diff --git a/lib/esp8266-oled-ssd1306-master/platformio.ini b/lib/esp8266-oled-ssd1306-master/platformio.ini
new file mode 100644
index 00000000..db055d8d
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/platformio.ini
@@ -0,0 +1,19 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/page/projectconf.html
+
+[env:d1_mini]
+platform = espressif8266
+board = d1_mini
+framework = arduino
+upload_speed = 921600
+board_f_cpu = 160000000L
+upload_port = /dev/cu.SLAB_USBtoUART
+monitor_port = /dev/cu.SLAB_USBtoUART
+lib_deps =
diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame1.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..536b570db09931ec634b38777033432276bafed8
GIT binary patch
literal 16026
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

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame2.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8dccbcd0210b5c1dd7bad824982c1ecbf5c1edc2
GIT binary patch
literal 19502
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
N99K<Hh=?45|Jj<OQl0<+

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame3.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..49e07ab53a6bbcfcc5922d5730c8492aaf8ba7bd
GIT binary patch
literal 21777
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
C1xwrj

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame4.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..99cbe1bc41ce7fe01700f5cd00bf04da68f9602a
GIT binary patch
literal 25325
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
L$#fM=#4rEZQ7{~E

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/resources/FontTool.png b/lib/esp8266-oled-ssd1306-master/resources/FontTool.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7bb222bed6067b921d8a3e479b56e4981a185d4
GIT binary patch
literal 14052
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
EUrx=8H~;_u

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/resources/SPI_version.jpg b/lib/esp8266-oled-ssd1306-master/resources/SPI_version.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..115c9f3bccef1177204c88ef8b8cb8f22daa9e7c
GIT binary patch
literal 26912
zcmeFXXH*nj^Do*1NDw6FETBl193&Y?A|N0+j3i;mISGt{pk&EP6af(hM#&k;nUO4U
zfFTG7%z(fM1KjpW@Bf~4KHT?yxNF^Yp54>a)wOGfs@~yO)qVc$d=a3&tFEOEKp+r6
z6Fh+PC8lh(K-ePy(9r<|0RSKcC;=|u0!Tr?n|25lKmgLjAl(n4{(~k1>8}u4fbb6)
zFb5+3kIW22;t!f0lvyO8`%4C_={XD_`m4^LFRuJeGhQo{_@gZ_kLg~a<lpr$xfV+O
zLGyro?@e}q1gwt&EMK$90f6oQ?i)3D0RZ+*@Q?Hl^54IIE%2`e{<Xlr7Wmf!|61Vx
zObh&hTW)%Kx;g-``%WJ24%{*TATKH*Dh^0o7nf1EE(QL$#pM*hpM*33aD`|7jdf^)
z!*l+j!(Z_Hg<U}O^Md~``WOIS0>7~cKy+O~Li{D+-&lt><|WZTbZ!#lPZ<aSA&?CD
zr_PFGf`90SWWs;w_GF@e=>BAqzuE#dNhbS?2BA*!#eZZ*lj;B9gP4hSCOPDHTZHN$
zy_}r%M;{2qL7kJ6|3km|yU*g+ufKu(RVRp`-Vpqa!zjMIA^e*rd-;~>FBwqxf<JWu
z;UWMO68y#gO%whP`odo{2goP>o6qg`AKZ4){Xe*k<U3gWU)=WF2>+&kE%2`e{<Xlr
z7Wmf!|7Tm^H@sj5Pjc|Q@V`T9|2rNS_?ZSnK|3If69a%t)ga920eN(Pneum?hTut0
z3?=FzAtaLi0~d0`^gt#AjCPTOQKY|ONg(zi_>H3oL_zsiAcFag@tnZ>ZZPL>ncqn6
zZ@LMLi2Y4Bg3^D}5HJ>X5iASF#t210?q7Te9T-*nTL$dWKlJaI7+~w^3iI*3eqE1-
z0MG^Q0k;5szyL4@OaTzZg559%x`1!M6mSF#0y^NK0XzWnT>)<(1n>cz!7_$GFMtAY
z01~9k0TVzOFai<*UqA`C21o(Y057Q2Hn0KA0v3Qh@DPvzB!C>CAC$TWo@Kx|kOt;n
zfE)uIkTF0WETsZ;0z+UKE`SpV1P*~*@WcS8z!N|jatERc2mmX<87RXIN(ce3foSmV
z2s|hu;eZIh1h4>a05re{I08jrJ{Ry9xCEhv5JM6m7LZ6V_ZnFHEZDC~@Lv$%0D=KB
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
Vmt>cr&zI7iF#5{vw(shH|JlZ6us8q!

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html b/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html
new file mode 100644
index 00000000..31fbd907
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html
@@ -0,0 +1,664 @@
+<!--The MIT License (MIT)
+
+Copyright (c) 2017 by Xavier Grosjean
+
+Based on work 
+Copyright (c) 2016 by Daniel Eichhorn
+Copyright (c) 2016 by Fabrice Weinberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-->
+<!--
+ Standalone page to draw icons in matrix and generates the map definition with the format required by 
+ library for OLED SD1306 screen: https://github.com/squix78/esp8266-oled-ssd1306
+ 100% quick and dirty vanilla ECS6, no framework or library was injured for this project.
+
+-->
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <style>
+      #form, #chars table {
+        user-select: none; 
+        -moz-user-select: none; 
+        margin-top: 5px;
+      }
+      #chars table, tr, td, th {
+        border-collapse: collapse;
+      }
+      #chars td, th {
+        border: 1px solid #CCC;
+        width: 12px;
+        height: 15px;
+      }
+      #chars th[action] {
+        cursor:pointer;
+      }
+      #chars th[action="up"], #chars th[action="down"], #chars th[action="left"], #chars th[action="right"] {
+        font-size: 10px;
+      }
+      #chars td.on {
+        background-color: #00F;
+      }
+      
+      #addChar, #generate {
+        display: none;
+      }
+      body.started #addChar, body.started #generate {
+        display: inline;
+      }
+      body.started #create {
+        display: none;
+      }
+      #page {
+        position:relative;
+      }
+      #page>div {
+        position: relative;
+        float: left;
+      }
+
+      #output {
+        margin-left: 20px;
+        margin-top: 12px;
+        font-size:12px;
+        user-select: all;
+        -moz-user-select: all;
+        max-width:60%;
+      }
+      
+      #header {
+        margin-top: 10px;
+      }
+      #inputText {
+        width: 100%;
+        height:120px;
+      }
+      
+    </style>
+  </head>
+  <body>
+    <div id="form">
+      <table width="100%">
+        <tr>
+          <td>Font array name:</td><td><input placeholder="Font array name" type="text" id="name" value="My_Font"/></td>
+          <td width="75%" rowspan="5">
+            <textarea id="inputText" placeholder="Or paste a char array font definition here">
+const uint8_t My_Font[] PROGMEM = {
+  0x0A, // Width: 10
+  0x0D, // Height: 13
+  0x01, // First char: 1
+  0x02, // Number of chars: 2
+  // Jump Table:
+  0x00, 0x00, 0x13, 0x0A, // 1
+  0x00, 0x13, 0x14, 0x0A, // 2
+  // Font Data:
+  0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0xC0, // 1
+  0x00, 0x0C, 0x80, 0x0B, 0x70, 0x08, 0x0C, 0x08, 0xF3, 0x0A, 0xF3, 0x0A, 0x0C, 0x08, 0x70, 0x08, 0x80, 0x0B, 0x00, 0x0C, // 2
+};              
+            </textarea></td>
+        </tr>
+        <tr>
+          <td>First char code:</td><td><input placeholder="First char code" type="number" id="code" value="1" min="1"/></td>
+        </tr>
+        <tr>
+          <td>Width:</td><td><input placeholder="Font width" type="number" id="width" value="10"/></td>
+        </tr>
+        <tr>
+          <td>Height:</td><td><input placeholder="Font height" type="number" id="height" value="13" max="64"/></td>
+        </tr>
+        <tr>
+          <td colspan="3"> </td>     <!--slightly improves layout-->
+        </tr>
+        <tr>
+          <td colspan="2">
+            <button id="create">Create</button>
+            <button id="shiftUp">Shift all up</button>
+            <button id="generate">Generate</button>
+            <button id="savetoFile">Save To File</button>
+          </td>
+          <td><input type="file" id="fileinput" />  <button id="parse">Parse</button></td>
+        </tr>
+      </table>
+      <br/>
+    </div>
+    <div id="page">
+      <div id="charxContainer" ondragstart="return false;">
+        <div id="chars"></div><br/>
+        <button id="addChar">Add a character</button>
+      </div>
+      <div id="output">
+        <div class="output" id="header"> </div>
+        <div class="output" id="jump"> </div>
+        <div class="output" id="data"> </div>
+      </div>
+    </div>
+    <script>
+    (function() {
+      let font;
+      
+      class Font {
+        constructor() {
+          this.height = parseInt(document.getElementById('height').value);
+          this.width = parseInt(document.getElementById('width').value);
+          this.currentCharCode = parseInt(document.getElementById('code').value);
+          this.fontContainer = document.getElementById('chars');
+          this.bytesForHeight = (1 + ((this.height - 1) >> 3));  // number of bytes needed for this font height
+          document.body.className = "started";
+          document.getElementById('height').disabled = true;
+          document.getElementById('width').disabled = true;          
+        }
+        
+        // Should we have a Char and a Pixel class ? not sure it's worth it.
+        // Let's use the DOM to store everything for now
+        
+        static updateCaption(element, code) {
+          element.textContent = `Char #${code}`;
+        }
+        
+        // Add a pixel matrix to draw a new character
+        // jumpaData not used for now: some day, use the last byte for optimisation 
+        addChar(jumpData, charData) {
+          let charContainer = this.fontContainer.appendChild(document.createElement("table"));
+          charContainer.setAttribute("code", this.currentCharCode);
+          let caption = charContainer.appendChild(document.createElement("caption"));
+          Font.updateCaption(caption, this.currentCharCode);
+          let header = charContainer.appendChild(document.createElement("tr"));
+          header.innerHTML = '<th  title="Delete this char" action="delete">&cross;</th>'
+              + '<th title="Add a char above" action="add">+</th>'
+              + '<th title="Shift pixels to the left" action="left">&larr;</th>'
+              + '<th title="Shift pixels down" action="down">&darr;</th>'
+              + '<th title="Shift pixels up" action="up">&uarr;</th>'
+              + '<th title="Shift pixels to the right" action="right">&rarr;</th>'
+              + '<th title="Copy from another character" action="copy">&copy;</th>'
+              + '<th title="Reset all pixels" action="clean">&empty;</th>';
+          // If data is provided, decode it to pixel initialization friendly structure
+          let pixelInit = [];
+          if (charData && charData.length) {
+            // charData byte count needs to be a multiple of bytesForHeight. End bytes with value 0 may have been trimmed
+            let missingBytes = charData.length % this.bytesForHeight;
+            for(let b = 0; b < missingBytes ; b++) {
+              charData.push(0);
+            }
+            while(charData.length) {
+              let row = charData.splice(0, this.bytesForHeight).reverse();
+              let pixelRow = [];
+              for (let b = 0; b < row.length; b++) {
+                let mask = 0x80;
+                let byte = row[b];
+                for (let bit = 0; bit < 8; bit++) {
+                  if (byte & mask) {
+                    pixelRow.push(1);
+                  } else {
+                    pixelRow.push(0);
+                  }
+                  mask = mask >> 1;
+                }
+              }
+              pixelRow.splice(0, pixelRow.length - this.height);
+              //Font.output('data', pixelRow);
+              pixelInit.push(pixelRow.reverse());
+            }
+          }
+          
+          for(let r = 0; r < this.height; r++) {
+          	let rowContainer = charContainer.appendChild(document.createElement("tr"));
+            for(let c = 0; c < this.width; c++) {
+          		let pixContainer = rowContainer.appendChild(document.createElement("td"));
+              pixContainer.setAttribute('action', 'toggle');
+          		// If there is some init data, set the pixel accordingly
+              if (pixelInit.length && pixelInit[c]) {
+                if (pixelInit[c][r]) {
+                  pixContainer.className = 'on';
+                }
+              }          		
+            }
+          }
+          this.currentCharCode++;
+          return charContainer;
+        }
+        
+        static togglePixel(pixel) {
+          pixel.className = pixel.className === 'on' ? '': 'on';
+        }
+        
+        // Return anInt as hex string
+        static toHexString(aByte) {
+          let zero = aByte < 16?'0':'';
+          return `0x${zero}${aByte.toString(16).toUpperCase()}`
+        }
+        
+        // Return least significant byte as hex string
+        static getLsB(anInt) {
+          return Font.toHexString(anInt & 0xFF);      
+        }
+        // Return most significant byte as hex string
+        static getMsB(anInt) {
+          return Font.toHexString(anInt>>>8);      
+        }
+       
+        static output(targetId, msg) {
+          let output = document.getElementById(targetId);
+          let line = output.appendChild(document.createElement('div'));
+          line.textContent = msg;
+        }
+        static emptyChars() {
+          document.getElementById('chars').textContent = '';
+        }
+        static emptyOutput() {
+          document.getElementById('header').textContent = '';
+          document.getElementById('jump').textContent = '';
+          document.getElementById('data').textContent = '';
+        }
+		
+        saveFile() {
+          let filename = document.getElementById('name').value.replace(/[^a-zA-Z0-9_$]/g, '_') + ".h";
+          let data = document.getElementById("output").innerText;
+          if(data.length < 10) return;
+          let blobObject = new Blob([data], {type:'text/plain'}); 
+    
+          if(window.navigator.msSaveBlob) {
+            window.navigator.msSaveBlob(blobObject, filename);
+          } else {
+            let a = document.createElement("a");
+            a.setAttribute("href", URL.createObjectURL(blobObject));
+            a.setAttribute("download", filename);
+            if (document.createEvent) {
+              let event = document.createEvent('MouseEvents');
+              event.initEvent('click', true, true);
+              a.dispatchEvent(event);
+            } else {
+              a.click();
+            }
+          }  
+        }
+			
+        // Read from the <td> css class the pixels that need to be on
+        // generates the jump table and font data 
+        generate() {
+          // this.width -= 3;  // hack to narrow an existing font
+          Font.emptyOutput();
+          let chars = this.fontContainer.getElementsByTagName('table');
+          let firstCharCode = parseInt(document.getElementById('code').value);
+          let name = document.getElementById('name').value.replace(/[^a-zA-Z0-9_$]/g, '_');
+          
+          let bits2add = this.bytesForHeight*8 - this.height;  // number of missing bits to fill leftmost byte
+          let charCount = chars.length;
+          let charAddr = 0;
+          // Comments are used when parsing back a generated font
+          Font.output('jump', '  // Jump Table:');
+          Font.output('data', '  // Font Data:');
+          // Browse each character
+          for(let ch = 0; ch < charCount; ch++) {
+            // Fix renumbering in case first char code was modified  
+            Font.updateCaption(chars[ch].getElementsByTagName('caption')[0], ch + firstCharCode);
+            let charBytes = [];
+            let charCode = ch + firstCharCode;
+            let rows = chars[ch].getElementsByTagName('tr');
+            let charNotZero = false;
+            // Browse each column
+            for(let col = 0; col < this.width ; col++) {
+              let bits = ""; // using string because js uses 32b ints when performing bit operations
+              // Browse each row starting from the bottom one, going up, and accumulate pixels in
+              // a string: this rotates the glyph
+              // Beware, row 0 is table headers.
+              for(let r = rows.length-1; r >=1 ; r--) {
+                let pixelState = rows[r].children[col].className;
+                bits += (pixelState === 'on' ? '1': '0');           
+              }
+              // Need to complete missing bits to have a sizeof byte multiple number of bits
+              for(let b = 0; b < bits2add; b++) {
+                bits =  '0' + bits;
+              }
+              // Font.output('data', `  // ${bits}`);  // Debugging help: rotated bitmap
+
+              // read bytes from the end
+              for(let b = bits.length - 1; b >= 7; b -= 8) {
+                //Font.output('data', `  // ${bits.substr(b-7, 8)}`);  // Debugging help: rotated bitmap
+                let byte = parseInt(bits.substr(b-7, 8), 2);
+                if (byte !== 0) {
+                  charNotZero = true;
+                }
+                charBytes.push(Font.toHexString(byte));
+              } 
+            }
+            // Compute the used width of the character:  
+            // rightmost column with pixels plus one
+            // one column is spread over several bytes...
+            let charWidth = 0;
+            for(let i=charBytes.length - 1; i >= 0; i-=this.bytesForHeight) {
+              let sum = 0;
+              for(let j=0; j < this.bytesForHeight; j++) {
+                sum += parseInt(charBytes[i - j], 16);
+              }
+              if(sum !== 0) {
+                charWidth = (i + 1)/this.bytesForHeight + 1;
+                break;
+              }
+            }
+
+            // Memory optim: Remove bytes with value 0 at the end of the array.
+            while(parseInt(charBytes[charBytes.length-1], 16) === 0 && charBytes.length > 1) {
+              charBytes.pop();
+            }
+            if (charNotZero) {
+              Font.output('data', `  ${charBytes.join(', ')},  // ${charCode}`);
+              Font.output('jump', `  ${Font.getMsB(charAddr)}, ${Font.getLsB(charAddr)}, ${Font.toHexString(charBytes.length)}, ${Font.toHexString(charWidth)},  // ${charCode} `);
+              charAddr += charBytes.length;
+            } else {
+              Font.output('jump', `  0xFF, 0xFF, 0x00, ${Font.toHexString(this.width)},  // ${charCode} `);
+            }
+          }
+          Font.output('data', '};');
+          
+          Font.output('header', "// Font generated or edited with the glyphEditor");
+          Font.output('header', `const uint8_t ${name}[] PROGMEM = {`);
+          // Comments are used when parsing back a generated font
+          Font.output('header', `  ${Font.toHexString(this.width)}, // Width: ${this.width}`);
+          Font.output('header', `  ${Font.toHexString(this.height)}, // Height: ${this.height}`);          
+          Font.output('header', `  ${Font.toHexString(firstCharCode)}, // First char: ${firstCharCode}`);
+          Font.output('header', `  ${Font.toHexString(charCount)}, // Number of chars: ${charCount}`);
+        }
+      }
+	  
+      document.getElementById('fileinput').addEventListener('change', function(e) {
+        let f = e.target.files[0]; 
+        if (f) {
+          let r = new FileReader();
+          r.onload = function(e) { 
+            let contents = e.target.result;
+                alert( "Got the file.\n" 
+                +"name: " + f.name + "\n"
+                +"type: " + f.type + "\n"
+                +"size: " + f.size + " bytes\n"
+                +"starts with: " + contents.substr(0, contents.indexOf("\n")) 
+            );
+              document.getElementById("inputText").value = contents;
+          };
+          r.readAsText(f);
+        } else { 
+          alert("Failed to load file");
+        }
+        });
+      
+      document.getElementById('savetoFile').addEventListener('click', function() {
+        font.saveFile();
+      });
+      
+      document.getElementById('shiftUp').addEventListener('click', function() {
+        var chars = document.getElementById("chars");
+        var tables = chars.getElementsByTagName("table");
+        for(var i=0; i< tables.length; i++) {
+          shiftUp(tables[i]);
+        }
+      });
+      
+      document.getElementById('generate').addEventListener('click', function() {
+        font.generate();
+      });
+      document.getElementById('addChar').addEventListener('click', function() {
+        font.addChar();
+      });
+      document.getElementById('inputText').addEventListener('click', function(e) {
+        let target = e.target;
+        target.select();
+      });
+      document.getElementById('chars').addEventListener('mousedown', function(e) {
+        if (e.button !== 0) return;
+        let target = e.target;
+        let action = target.getAttribute('action') || '';
+        if (action === '') return;
+        let result, code, nextContainer, previousContainer, pixels ;
+        let currentContainer = target.parentNode.parentNode;
+        switch(action) {
+          case 'add':
+            code = currentContainer.getAttribute('code');
+            nextContainer = font.addChar();
+            currentContainer.parentNode.insertBefore(nextContainer, currentContainer);
+            do {
+              nextContainer.setAttribute('code', code);
+              Font.updateCaption(nextContainer.getElementsByTagName('caption')[0], code);
+              code ++;
+            } while (nextContainer = nextContainer.nextSibling);
+            break;
+
+          case 'delete':
+            result = confirm("Delete this character ?");
+            if (!result) return;
+            code = currentContainer.getAttribute('code');
+            nextContainer = currentContainer;
+            while (nextContainer = nextContainer.nextSibling) {
+              nextContainer.setAttribute('code', code);
+              Font.updateCaption(nextContainer.getElementsByTagName('caption')[0], code);
+              code ++;
+            }
+            currentContainer.parentNode.removeChild(currentContainer);
+            break;
+
+          // Shift pixels to the left  
+          case 'left':
+            pixels = currentContainer.getElementsByTagName('td');
+            for(p = 0; p < pixels.length; p++) {
+              if((p + 1) % font.width) {
+                pixels[p].className = pixels[p + 1].className;
+              } else {
+                pixels[p].className = '';
+              }
+            }
+            break;
+          
+          // Shift pixels to the right
+          case 'right':
+            pixels = currentContainer.getElementsByTagName('td');
+            for(p = pixels.length-1; p >=0 ; p--) {
+              if(p % font.width) {
+                pixels[p].className = pixels[p - 1].className;
+              } else {
+                pixels[p].className = '';
+              }
+            }
+            break;
+
+          // Shift pixels down
+          case 'down':
+            pixels = currentContainer.getElementsByTagName('td');
+            for(p = pixels.length-1; p >=0 ; p--) {
+              if(p >= font.width) {
+                pixels[p].className = pixels[p - font.width].className;
+              } else {
+                pixels[p].className = '';
+              }
+            }            break;
+
+          // Shift pixels up
+          case 'up':
+            shiftUp(currentContainer);
+            break;
+
+          case 'toggle':
+            Font.togglePixel(target);
+            break;
+
+          case 'clean':
+            result = confirm("Delete the pixels ?");
+            if (!result) return;
+            pixels = currentContainer.getElementsByTagName('td');
+            for (let p = 0; p < pixels.length; p++) {
+              pixels[p].className = '';
+            }
+            break;
+          
+          case 'copy':
+             let charNumber = parseInt(prompt("Source char #: "));
+             let chars = font.fontContainer.getElementsByTagName('table');
+             let tableOffset = charNumber - parseInt(document.getElementById('code').value);
+             let srcPixels = chars[tableOffset].getElementsByTagName('td');
+             let targetPixels = currentContainer.getElementsByTagName('td');
+             for(let i=0; i < srcPixels.length; i++) {
+               // First tds are in the th row, for editing actions. Skip them
+               if (targetPixels[i].parentNode.localName === 'th') continue; // In case we give them css at some point...
+               targetPixels[i].className = srcPixels[i].className;
+             }
+            break;
+          default:
+            // no.
+        }
+        
+      });
+      function shiftUp(container) {
+        var pixels = container.getElementsByTagName('td');
+        for(p = 0; p < pixels.length; p++) {
+          if(p < font.width*(font.height -1)) {
+            pixels[p].className = pixels[p + font.width].className;
+          } else {
+            pixels[p].className = '';
+          }
+        }  
+      }
+      
+      document.getElementById('chars').addEventListener('mouseover', function(e) {
+        let target = e.target;
+        let action = target.getAttribute('action');
+        if (action !== 'toggle' || e.buttons !== 1) return;
+        Font.togglePixel(target);
+      });
+      document.getElementById('chars').addEventListener('dragstart', function() {
+        return false;
+      });
+
+      document.getElementById('create').addEventListener('click', function() {
+      	font = new Font();
+        font.addChar();
+      });
+
+      // parse a char array declaration for an existing font.
+      // parsing heavily relies on comments.
+      document.getElementById('parse').addEventListener('click', function() {
+        if (document.getElementById('chars').childElementCount) {
+          let result = confirm("Confirm you want to overwrite the existing grids ?");
+          if (!result) return;          
+        } 
+        let lines = document.getElementById('inputText').value.split('\n');
+        let name = '';
+        let height = 0;
+        let width = 0;
+        let firstCharCode = 0;
+        let jumpTable = [];
+        let charData = [];
+        let readingJumpTable = false;
+        let readingData = false;
+        
+        for(let l = 0 ; l < lines.length; l++) {
+          // TODO ? keep C compilation directives to copy them (not lowercased :)) to newly generated char array
+          let line = lines[l].trim();
+          //alert(line);
+          let fields;
+
+          // Declaration line: grab the name
+          if (line.indexOf('PROGMEM') > 0) {
+            fields = line.split(' ');
+            name = fields[2].replace(/[\[\]]/g, '');
+            continue;
+          }
+          line = line.toLowerCase();
+          // Todo: could rely on line order...
+          // width line: grab the width
+          if (line.indexOf('width') > 0) {
+            fields = line.split(',');
+            width = fields[0];
+            continue;
+          }
+          // height line: grab the height 
+          if (line.indexOf('height') > 0) {
+            fields = line.split(',');
+            height = fields[0];
+            continue;
+          }
+          // first char code line: grab the first char code 
+          if (line.indexOf('first char') > 0) {
+            fields = line.split(',');
+            firstCharCode = fields[0];
+            continue;
+          }
+          // End of array declaration
+          // TODO warn if more lines: next fonts are ignored
+          if (line.indexOf('};') === 0) {
+            break;
+          }
+          
+          if (readingJumpTable || readingData) {
+            if (line.indexOf('#') !== 0 && line.length !== 0 && line.indexOf('//') !== 0) {
+              line = line.replace(/\/\/.*/, ''); // get rid of end of line comments
+              fields = line.split(',');
+              let newEntry = [];
+              for(let f=0; f < fields.length; f++) {
+                let value = parseInt(fields[f]);
+                if (isNaN(value)) continue;
+                if (readingData) {
+                  charData.push(value);
+                }
+                if (readingJumpTable) {
+                  newEntry.push(value);
+                }
+              }
+              if (readingJumpTable) {
+                jumpTable.push(newEntry);
+              }
+            }            
+          }
+          
+          // Begining of data
+          if (line.indexOf('font data') > 0) {
+            readingData = true;
+            readingJumpTable = false;
+          }
+          // Begining of jump table
+          if (line.indexOf('jump table') > 0) {
+            readingJumpTable = true;
+          }
+        }
+        if (!name || !height || !width || !firstCharCode) {
+          alert("Does not look like a parsable font. Try again.");
+          return;
+        }
+        
+        Font.emptyChars();
+        Font.emptyOutput();
+        document.getElementById('name').value = name;
+        document.getElementById('height').value = parseInt(height);
+        document.getElementById('width').value = parseInt(width);
+        document.getElementById('code').value = parseInt(firstCharCode);
+      	font = new Font();
+      	for(let c = 0 ; c < jumpTable.length; c++) {
+      	  let jumpEntry = jumpTable[c];
+      	  let charEntry = [];
+      	  // displayable character 
+      	  if (jumpEntry[0] !== 255 || jumpEntry[1] !== 255) {
+      	    charEntry = charData.splice(0, jumpEntry[2]);
+          }
+      	  font.addChar(jumpEntry, charEntry);
+        }
+        document.body.className = "started";
+      });        
+      
+      })();
+    </script>  
+  </body>
+</html>
diff --git a/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.png b/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.png
new file mode 100644
index 0000000000000000000000000000000000000000..800efc56f4bd50ba347eab57f3205ec8d0c0dd31
GIT binary patch
literal 68751
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
V=l%V&;(J^#ke61GDt>7i_#ZiQOU?iQ

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/resources/xbmPreview.png b/lib/esp8266-oled-ssd1306-master/resources/xbmPreview.png
new file mode 100644
index 0000000000000000000000000000000000000000..70ea3a53a843f220f18d2ef7cc0698516a990ba6
GIT binary patch
literal 41692
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

literal 0
HcmV?d00001

diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp
new file mode 100644
index 00000000..bf4a5ee0
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp
@@ -0,0 +1,1043 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ * Copyright (c) 2019 by Helmut Tschemernjak - www.radioshuttle.de
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+ /*
+  * TODO Helmut
+  * - test/finish dislplay.printf() on mbed-os
+  * - Finish _putc with drawLogBuffer when running display
+  */
+
+#include "OLEDDisplay.h"
+
+OLEDDisplay::OLEDDisplay() {
+
+	displayWidth = 128;
+	displayHeight = 64;
+	displayBufferSize = displayWidth * displayHeight / 8;
+	color = WHITE;
+	geometry = GEOMETRY_128_64;
+	textAlignment = TEXT_ALIGN_LEFT;
+	fontData = ArialMT_Plain_10;
+	fontTableLookupFunction = DefaultFontTableLookup;
+	buffer = NULL;
+#ifdef OLEDDISPLAY_DOUBLE_BUFFER
+	buffer_back = NULL;
+#endif
+}
+
+OLEDDisplay::~OLEDDisplay() {
+  end();
+}
+
+bool OLEDDisplay::allocateBuffer() {
+
+  logBufferSize = 0;
+  logBufferFilled = 0;
+  logBufferLine = 0;
+  logBufferMaxLines = 0;
+  logBuffer = NULL;
+
+  if (!this->connect()) {
+    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Can't establish connection to display\n");
+    return false;
+  }
+
+  if(this->buffer==NULL) {
+    this->buffer = (uint8_t*) malloc((sizeof(uint8_t) * displayBufferSize) + getBufferOffset());
+    this->buffer += getBufferOffset();
+
+    if(!this->buffer) {
+      DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create display\n");
+      return false;
+    }
+  }
+
+  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+  if(this->buffer_back==NULL) {
+    this->buffer_back = (uint8_t*) malloc((sizeof(uint8_t) * displayBufferSize) + getBufferOffset());
+    this->buffer_back += getBufferOffset();
+
+    if(!this->buffer_back) {
+      DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create back buffer\n");
+      free(this->buffer - getBufferOffset());
+      return false;
+    }
+  }
+  #endif
+
+  return true;
+}
+
+bool OLEDDisplay::init() {
+
+  if(!allocateBuffer()) {
+    return false;
+  }
+
+  sendInitCommands();
+  resetDisplay();
+
+  return true;
+}
+
+void OLEDDisplay::end() {
+  if (this->buffer) { free(this->buffer - getBufferOffset()); this->buffer = NULL; }
+  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+  if (this->buffer_back) { free(this->buffer_back - getBufferOffset()); this->buffer_back = NULL; }
+  #endif
+  if (this->logBuffer != NULL) { free(this->logBuffer); this->logBuffer = NULL; }
+}
+
+void OLEDDisplay::resetDisplay(void) {
+  clear();
+  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+  memset(buffer_back, 1, displayBufferSize);
+  #endif
+  display();
+}
+
+void OLEDDisplay::setColor(OLEDDISPLAY_COLOR color) {
+  this->color = color;
+}
+
+OLEDDISPLAY_COLOR OLEDDisplay::getColor() {
+  return this->color;
+}
+
+void OLEDDisplay::setPixel(int16_t x, int16_t y) {
+  if (x >= 0 && x < this->width() && y >= 0 && y < this->height()) {
+    switch (color) {
+      case WHITE:   buffer[x + (y / 8) * this->width()] |=  (1 << (y & 7)); break;
+      case BLACK:   buffer[x + (y / 8) * this->width()] &= ~(1 << (y & 7)); break;
+      case INVERSE: buffer[x + (y / 8) * this->width()] ^=  (1 << (y & 7)); break;
+    }
+  }
+}
+
+void OLEDDisplay::setPixelColor(int16_t x, int16_t y, OLEDDISPLAY_COLOR color) {
+  if (x >= 0 && x < this->width() && y >= 0 && y < this->height()) {
+    switch (color) {
+      case WHITE:   buffer[x + (y / 8) * this->width()] |=  (1 << (y & 7)); break;
+      case BLACK:   buffer[x + (y / 8) * this->width()] &= ~(1 << (y & 7)); break;
+      case INVERSE: buffer[x + (y / 8) * this->width()] ^=  (1 << (y & 7)); break;
+    }
+  }
+}
+
+void OLEDDisplay::clearPixel(int16_t x, int16_t y) {
+  if (x >= 0 && x < this->width() && y >= 0 && y < this->height()) {
+    switch (color) {
+      case BLACK:   buffer[x + (y >> 3) * this->width()] |=  (1 << (y & 7)); break;
+      case WHITE:   buffer[x + (y >> 3) * this->width()] &= ~(1 << (y & 7)); break;
+      case INVERSE: buffer[x + (y >> 3) * this->width()] ^=  (1 << (y & 7)); break;
+    }
+  }
+}
+
+
+// Bresenham's algorithm - thx wikipedia and Adafruit_GFX
+void OLEDDisplay::drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1) {
+  int16_t steep = abs(y1 - y0) > abs(x1 - x0);
+  if (steep) {
+    _swap_int16_t(x0, y0);
+    _swap_int16_t(x1, y1);
+  }
+
+  if (x0 > x1) {
+    _swap_int16_t(x0, x1);
+    _swap_int16_t(y0, y1);
+  }
+
+  int16_t dx, dy;
+  dx = x1 - x0;
+  dy = abs(y1 - y0);
+
+  int16_t err = dx / 2;
+  int16_t ystep;
+
+  if (y0 < y1) {
+    ystep = 1;
+  } else {
+    ystep = -1;
+  }
+
+  for (; x0<=x1; x0++) {
+    if (steep) {
+      setPixel(y0, x0);
+    } else {
+      setPixel(x0, y0);
+    }
+    err -= dy;
+    if (err < 0) {
+      y0 += ystep;
+      err += dx;
+    }
+  }
+}
+
+void OLEDDisplay::drawRect(int16_t x, int16_t y, int16_t width, int16_t height) {
+  drawHorizontalLine(x, y, width);
+  drawVerticalLine(x, y, height);
+  drawVerticalLine(x + width - 1, y, height);
+  drawHorizontalLine(x, y + height - 1, width);
+}
+
+void OLEDDisplay::fillRect(int16_t xMove, int16_t yMove, int16_t width, int16_t height) {
+  for (int16_t x = xMove; x < xMove + width; x++) {
+    drawVerticalLine(x, yMove, height);
+  }
+}
+
+void OLEDDisplay::drawCircle(int16_t x0, int16_t y0, int16_t radius) {
+  int16_t x = 0, y = radius;
+	int16_t dp = 1 - radius;
+	do {
+		if (dp < 0)
+			dp = dp + (x++) * 2 + 3;
+		else
+			dp = dp + (x++) * 2 - (y--) * 2 + 5;
+
+		setPixel(x0 + x, y0 + y);     //For the 8 octants
+		setPixel(x0 - x, y0 + y);
+		setPixel(x0 + x, y0 - y);
+		setPixel(x0 - x, y0 - y);
+		setPixel(x0 + y, y0 + x);
+		setPixel(x0 - y, y0 + x);
+		setPixel(x0 + y, y0 - x);
+		setPixel(x0 - y, y0 - x);
+
+	} while (x < y);
+
+  setPixel(x0 + radius, y0);
+  setPixel(x0, y0 + radius);
+  setPixel(x0 - radius, y0);
+  setPixel(x0, y0 - radius);
+}
+
+void OLEDDisplay::drawCircleQuads(int16_t x0, int16_t y0, int16_t radius, uint8_t quads) {
+  int16_t x = 0, y = radius;
+  int16_t dp = 1 - radius;
+  while (x < y) {
+    if (dp < 0)
+      dp = dp + (x++) * 2 + 3;
+    else
+      dp = dp + (x++) * 2 - (y--) * 2 + 5;
+    if (quads & 0x1) {
+      setPixel(x0 + x, y0 - y);
+      setPixel(x0 + y, y0 - x);
+    }
+    if (quads & 0x2) {
+      setPixel(x0 - y, y0 - x);
+      setPixel(x0 - x, y0 - y);
+    }
+    if (quads & 0x4) {
+      setPixel(x0 - y, y0 + x);
+      setPixel(x0 - x, y0 + y);
+    }
+    if (quads & 0x8) {
+      setPixel(x0 + x, y0 + y);
+      setPixel(x0 + y, y0 + x);
+    }
+  }
+  if (quads & 0x1 && quads & 0x8) {
+    setPixel(x0 + radius, y0);
+  }
+  if (quads & 0x4 && quads & 0x8) {
+    setPixel(x0, y0 + radius);
+  }
+  if (quads & 0x2 && quads & 0x4) {
+    setPixel(x0 - radius, y0);
+  }
+  if (quads & 0x1 && quads & 0x2) {
+    setPixel(x0, y0 - radius);
+  }
+}
+
+
+void OLEDDisplay::fillCircle(int16_t x0, int16_t y0, int16_t radius) {
+  int16_t x = 0, y = radius;
+	int16_t dp = 1 - radius;
+	do {
+		if (dp < 0)
+      dp = dp + (x++) * 2 + 3;
+    else
+      dp = dp + (x++) * 2 - (y--) * 2 + 5;
+
+    drawHorizontalLine(x0 - x, y0 - y, 2*x);
+    drawHorizontalLine(x0 - x, y0 + y, 2*x);
+    drawHorizontalLine(x0 - y, y0 - x, 2*y);
+    drawHorizontalLine(x0 - y, y0 + x, 2*y);
+
+
+	} while (x < y);
+  drawHorizontalLine(x0 - radius, y0, 2 * radius);
+
+}
+
+void OLEDDisplay::drawHorizontalLine(int16_t x, int16_t y, int16_t length) {
+  if (y < 0 || y >= this->height()) { return; }
+
+  if (x < 0) {
+    length += x;
+    x = 0;
+  }
+
+  if ( (x + length) > this->width()) {
+    length = (this->width() - x);
+  }
+
+  if (length <= 0) { return; }
+
+  uint8_t * bufferPtr = buffer;
+  bufferPtr += (y >> 3) * this->width();
+  bufferPtr += x;
+
+  uint8_t drawBit = 1 << (y & 7);
+
+  switch (color) {
+    case WHITE:   while (length--) {
+        *bufferPtr++ |= drawBit;
+      }; break;
+    case BLACK:   drawBit = ~drawBit;   while (length--) {
+        *bufferPtr++ &= drawBit;
+      }; break;
+    case INVERSE: while (length--) {
+        *bufferPtr++ ^= drawBit;
+      }; break;
+  }
+}
+
+void OLEDDisplay::drawVerticalLine(int16_t x, int16_t y, int16_t length) {
+  if (x < 0 || x >= this->width()) return;
+
+  if (y < 0) {
+    length += y;
+    y = 0;
+  }
+
+  if ( (y + length) > this->height()) {
+    length = (this->height() - y);
+  }
+
+  if (length <= 0) return;
+
+
+  uint8_t yOffset = y & 7;
+  uint8_t drawBit;
+  uint8_t *bufferPtr = buffer;
+
+  bufferPtr += (y >> 3) * this->width();
+  bufferPtr += x;
+
+  if (yOffset) {
+    yOffset = 8 - yOffset;
+    drawBit = ~(0xFF >> (yOffset));
+
+    if (length < yOffset) {
+      drawBit &= (0xFF >> (yOffset - length));
+    }
+
+    switch (color) {
+      case WHITE:   *bufferPtr |=  drawBit; break;
+      case BLACK:   *bufferPtr &= ~drawBit; break;
+      case INVERSE: *bufferPtr ^=  drawBit; break;
+    }
+
+    if (length < yOffset) return;
+
+    length -= yOffset;
+    bufferPtr += this->width();
+  }
+
+  if (length >= 8) {
+    switch (color) {
+      case WHITE:
+      case BLACK:
+        drawBit = (color == WHITE) ? 0xFF : 0x00;
+        do {
+          *bufferPtr = drawBit;
+          bufferPtr += this->width();
+          length -= 8;
+        } while (length >= 8);
+        break;
+      case INVERSE:
+        do {
+          *bufferPtr = ~(*bufferPtr);
+          bufferPtr += this->width();
+          length -= 8;
+        } while (length >= 8);
+        break;
+    }
+  }
+
+  if (length > 0) {
+    drawBit = (1 << (length & 7)) - 1;
+    switch (color) {
+      case WHITE:   *bufferPtr |=  drawBit; break;
+      case BLACK:   *bufferPtr &= ~drawBit; break;
+      case INVERSE: *bufferPtr ^=  drawBit; break;
+    }
+  }
+}
+
+void OLEDDisplay::drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress) {
+  uint16_t radius = height / 2;
+  uint16_t xRadius = x + radius;
+  uint16_t yRadius = y + radius;
+  uint16_t doubleRadius = 2 * radius;
+  uint16_t innerRadius = radius - 2;
+
+  setColor(WHITE);
+  drawCircleQuads(xRadius, yRadius, radius, 0b00000110);
+  drawHorizontalLine(xRadius, y, width - doubleRadius + 1);
+  drawHorizontalLine(xRadius, y + height, width - doubleRadius + 1);
+  drawCircleQuads(x + width - radius, yRadius, radius, 0b00001001);
+
+  uint16_t maxProgressWidth = (width - doubleRadius + 1) * progress / 100;
+
+  fillCircle(xRadius, yRadius, innerRadius);
+  fillRect(xRadius + 1, y + 2, maxProgressWidth, height - 3);
+  fillCircle(xRadius + maxProgressWidth, yRadius, innerRadius);
+}
+
+void OLEDDisplay::drawFastImage(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const uint8_t *image) {
+  drawInternal(xMove, yMove, width, height, image, 0, 0);
+}
+
+void OLEDDisplay::drawXbm(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const uint8_t *xbm) {
+  int16_t widthInXbm = (width + 7) / 8;
+  uint8_t data = 0;
+
+  for(int16_t y = 0; y < height; y++) {
+    for(int16_t x = 0; x < width; x++ ) {
+      if (x & 7) {
+        data >>= 1; // Move a bit
+      } else {  // Read new data every 8 bit
+        data = pgm_read_byte(xbm + (x / 8) + y * widthInXbm);
+      }
+      // if there is a bit draw it
+      if (data & 0x01) {
+        setPixel(xMove + x, yMove + y);
+      }
+    }
+  }
+}
+
+void OLEDDisplay::drawIco16x16(int16_t xMove, int16_t yMove, const char *ico, bool inverse) {
+  uint16_t data;
+
+  for(int16_t y = 0; y < 16; y++) {
+    data = pgm_read_byte(ico + (y << 1)) + (pgm_read_byte(ico + (y << 1) + 1) << 8);
+    for(int16_t x = 0; x < 16; x++ ) {
+      if ((data & 0x01) ^ inverse) {
+        setPixelColor(xMove + x, yMove + y, WHITE);
+      } else {
+        setPixelColor(xMove + x, yMove + y, BLACK);
+      }
+      data >>= 1; // Move a bit
+    }
+  }
+}
+
+void OLEDDisplay::drawStringInternal(int16_t xMove, int16_t yMove, char* text, uint16_t textLength, uint16_t textWidth) {
+  uint8_t textHeight       = pgm_read_byte(fontData + HEIGHT_POS);
+  uint8_t firstChar        = pgm_read_byte(fontData + FIRST_CHAR_POS);
+  uint16_t sizeOfJumpTable = pgm_read_byte(fontData + CHAR_NUM_POS)  * JUMPTABLE_BYTES;
+
+  uint16_t cursorX         = 0;
+  uint16_t cursorY         = 0;
+
+  switch (textAlignment) {
+    case TEXT_ALIGN_CENTER_BOTH:
+      yMove -= textHeight >> 1;
+    // Fallthrough
+    case TEXT_ALIGN_CENTER:
+      xMove -= textWidth >> 1; // divide by 2
+      break;
+    case TEXT_ALIGN_RIGHT:
+      xMove -= textWidth;
+      break;
+    case TEXT_ALIGN_LEFT:
+      break;
+  }
+
+  // Don't draw anything if it is not on the screen.
+  if (xMove + textWidth  < 0 || xMove > this->width() ) {return;}
+  if (yMove + textHeight < 0 || yMove > this->width() ) {return;}
+
+  for (uint16_t j = 0; j < textLength; j++) {
+    int16_t xPos = xMove + cursorX;
+    int16_t yPos = yMove + cursorY;
+
+    uint8_t code = text[j];
+    if (code >= firstChar) {
+      uint8_t charCode = code - firstChar;
+
+      // 4 Bytes per char code
+      uint8_t msbJumpToChar    = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES );                  // MSB  \ JumpAddress
+      uint8_t lsbJumpToChar    = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_LSB);   // LSB /
+      uint8_t charByteSize     = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_SIZE);  // Size
+      uint8_t currentCharWidth = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_WIDTH); // Width
+
+      // Test if the char is drawable
+      if (!(msbJumpToChar == 255 && lsbJumpToChar == 255)) {
+        // Get the position of the char data
+        uint16_t charDataPosition = JUMPTABLE_START + sizeOfJumpTable + ((msbJumpToChar << 8) + lsbJumpToChar);
+        drawInternal(xPos, yPos, currentCharWidth, textHeight, fontData, charDataPosition, charByteSize);
+      }
+
+      cursorX += currentCharWidth;
+    }
+  }
+}
+
+
+void OLEDDisplay::drawString(int16_t xMove, int16_t yMove, String strUser) {
+  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
+
+  // char* text must be freed!
+  char* text = utf8ascii(strUser);
+
+  uint16_t yOffset = 0;
+  // If the string should be centered vertically too
+  // we need to now how heigh the string is.
+  if (textAlignment == TEXT_ALIGN_CENTER_BOTH) {
+    uint16_t lb = 0;
+    // Find number of linebreaks in text
+    for (uint16_t i=0;text[i] != 0; i++) {
+      lb += (text[i] == 10);
+    }
+    // Calculate center
+    yOffset = (lb * lineHeight) / 2;
+  }
+
+  uint16_t line = 0;
+  char* textPart = strtok(text,"\n");
+  while (textPart != NULL) {
+    uint16_t length = strlen(textPart);
+    drawStringInternal(xMove, yMove - yOffset + (line++) * lineHeight, textPart, length, getStringWidth(textPart, length));
+    textPart = strtok(NULL, "\n");
+  }
+  free(text);
+}
+
+void OLEDDisplay::drawStringf( int16_t x, int16_t y, char* buffer, String format, ... )
+{
+  va_list myargs;
+  va_start(myargs, format);
+  vsprintf(buffer, format.c_str(), myargs);
+  va_end(myargs);
+  drawString( x, y, buffer );
+}
+
+void OLEDDisplay::drawStringMaxWidth(int16_t xMove, int16_t yMove, uint16_t maxLineWidth, String strUser) {
+  uint16_t firstChar  = pgm_read_byte(fontData + FIRST_CHAR_POS);
+  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
+
+  char* text = utf8ascii(strUser);
+
+  uint16_t length = strlen(text);
+  uint16_t lastDrawnPos = 0;
+  uint16_t lineNumber = 0;
+  uint16_t strWidth = 0;
+
+  uint16_t preferredBreakpoint = 0;
+  uint16_t widthAtBreakpoint = 0;
+
+  for (uint16_t i = 0; i < length; i++) {
+    strWidth += pgm_read_byte(fontData + JUMPTABLE_START + (text[i] - firstChar) * JUMPTABLE_BYTES + JUMPTABLE_WIDTH);
+
+    // Always try to break on a space or dash
+    if (text[i] == ' ' || text[i]== '-') {
+      preferredBreakpoint = i;
+      widthAtBreakpoint = strWidth;
+    }
+
+    if (strWidth >= maxLineWidth) {
+      if (preferredBreakpoint == 0) {
+        preferredBreakpoint = i;
+        widthAtBreakpoint = strWidth;
+      }
+      drawStringInternal(xMove, yMove + (lineNumber++) * lineHeight , &text[lastDrawnPos], preferredBreakpoint - lastDrawnPos, widthAtBreakpoint);
+      lastDrawnPos = preferredBreakpoint + 1;
+      // It is possible that we did not draw all letters to i so we need
+      // to account for the width of the chars from `i - preferredBreakpoint`
+      // by calculating the width we did not draw yet.
+      strWidth = strWidth - widthAtBreakpoint;
+      preferredBreakpoint = 0;
+    }
+  }
+
+  // Draw last part if needed
+  if (lastDrawnPos < length) {
+    drawStringInternal(xMove, yMove + lineNumber * lineHeight , &text[lastDrawnPos], length - lastDrawnPos, getStringWidth(&text[lastDrawnPos], length - lastDrawnPos));
+  }
+
+  free(text);
+}
+
+uint16_t OLEDDisplay::getStringWidth(const char* text, uint16_t length) {
+  uint16_t firstChar        = pgm_read_byte(fontData + FIRST_CHAR_POS);
+
+  uint16_t stringWidth = 0;
+  uint16_t maxWidth = 0;
+
+  while (length--) {
+    stringWidth += pgm_read_byte(fontData + JUMPTABLE_START + (text[length] - firstChar) * JUMPTABLE_BYTES + JUMPTABLE_WIDTH);
+    if (text[length] == 10) {
+      maxWidth = max(maxWidth, stringWidth);
+      stringWidth = 0;
+    }
+  }
+
+  return max(maxWidth, stringWidth);
+}
+
+uint16_t OLEDDisplay::getStringWidth(String strUser) {
+  char* text = utf8ascii(strUser);
+  uint16_t length = strlen(text);
+  uint16_t width = getStringWidth(text, length);
+  free(text);
+  return width;
+}
+
+void OLEDDisplay::setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment) {
+  this->textAlignment = textAlignment;
+}
+
+void OLEDDisplay::setFont(const uint8_t *fontData) {
+  this->fontData = fontData;
+}
+
+void OLEDDisplay::displayOn(void) {
+  sendCommand(DISPLAYON);
+}
+
+void OLEDDisplay::displayOff(void) {
+  sendCommand(DISPLAYOFF);
+}
+
+void OLEDDisplay::invertDisplay(void) {
+  sendCommand(INVERTDISPLAY);
+}
+
+void OLEDDisplay::normalDisplay(void) {
+  sendCommand(NORMALDISPLAY);
+}
+
+void OLEDDisplay::setContrast(uint8_t contrast, uint8_t precharge, uint8_t comdetect) {
+  sendCommand(SETPRECHARGE); //0xD9
+  sendCommand(precharge); //0xF1 default, to lower the contrast, put 1-1F
+  sendCommand(SETCONTRAST);
+  sendCommand(contrast); // 0-255
+  sendCommand(SETVCOMDETECT); //0xDB, (additionally needed to lower the contrast)
+  sendCommand(comdetect);	//0x40 default, to lower the contrast, put 0
+  sendCommand(DISPLAYALLON_RESUME);
+  sendCommand(NORMALDISPLAY);
+  sendCommand(DISPLAYON);
+}
+
+void OLEDDisplay::setBrightness(uint8_t brightness) {
+  uint8_t contrast = brightness;
+  if (brightness < 128) {
+    // Magic values to get a smooth/ step-free transition
+    contrast = brightness * 1.171;
+  } else {
+    contrast = brightness * 1.171 - 43;
+  }
+
+  uint8_t precharge = 241;
+  if (brightness == 0) {
+    precharge = 0;
+  }
+  uint8_t comdetect = brightness / 8;
+
+  setContrast(contrast, precharge, comdetect);
+}
+
+void OLEDDisplay::resetOrientation() {
+  sendCommand(SEGREMAP);
+  sendCommand(COMSCANINC);           //Reset screen rotation or mirroring
+}
+
+void OLEDDisplay::flipScreenVertically() {
+  sendCommand(SEGREMAP | 0x01);
+  sendCommand(COMSCANDEC);           //Rotate screen 180 Deg
+}
+
+void OLEDDisplay::mirrorScreen() {
+  sendCommand(SEGREMAP);
+  sendCommand(COMSCANDEC);           //Mirror screen
+}
+
+void OLEDDisplay::clear(void) {
+  memset(buffer, 0, displayBufferSize);
+}
+
+void OLEDDisplay::drawLogBuffer(uint16_t xMove, uint16_t yMove) {
+  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
+  // Always align left
+  setTextAlignment(TEXT_ALIGN_LEFT);
+
+  // State values
+  uint16_t length   = 0;
+  uint16_t line     = 0;
+  uint16_t lastPos  = 0;
+
+  for (uint16_t i=0;i<this->logBufferFilled;i++){
+    // Everytime we have a \n print
+    if (this->logBuffer[i] == 10) {
+      length++;
+      // Draw string on line `line` from lastPos to length
+      // Passing 0 as the lenght because we are in TEXT_ALIGN_LEFT
+      drawStringInternal(xMove, yMove + (line++) * lineHeight, &this->logBuffer[lastPos], length, 0);
+      // Remember last pos
+      lastPos = i;
+      // Reset length
+      length = 0;
+    } else {
+      // Count chars until next linebreak
+      length++;
+    }
+  }
+  // Draw the remaining string
+  if (length > 0) {
+    drawStringInternal(xMove, yMove + line * lineHeight, &this->logBuffer[lastPos], length, 0);
+  }
+}
+
+uint16_t OLEDDisplay::getWidth(void) {
+  return displayWidth;
+}
+
+uint16_t OLEDDisplay::getHeight(void) {
+  return displayHeight;
+}
+
+bool OLEDDisplay::setLogBuffer(uint16_t lines, uint16_t chars){
+  if (logBuffer != NULL) free(logBuffer);
+  uint16_t size = lines * chars;
+  if (size > 0) {
+    this->logBufferLine     = 0;      // Lines printed
+    this->logBufferFilled   = 0;      // Nothing stored yet
+    this->logBufferMaxLines = lines;  // Lines max printable
+    this->logBufferSize     = size;   // Total number of characters the buffer can hold
+    this->logBuffer         = (char *) malloc(size * sizeof(uint8_t));
+    if(!this->logBuffer) {
+      DEBUG_OLEDDISPLAY("[OLEDDISPLAY][setLogBuffer] Not enough memory to create log buffer\n");
+      return false;
+    }
+  }
+  return true;
+}
+
+size_t OLEDDisplay::write(uint8_t c) {
+  if (this->logBufferSize > 0) {
+    // Don't waste space on \r\n line endings, dropping \r
+    if (c == 13) return 1;
+
+    // convert UTF-8 character to font table index
+    c = (this->fontTableLookupFunction)(c);
+    // drop unknown character
+    if (c == 0) return 1;
+
+    bool maxLineNotReached = this->logBufferLine < this->logBufferMaxLines;
+    bool bufferNotFull = this->logBufferFilled < this->logBufferSize;
+
+    // Can we write to the buffer?
+    if (bufferNotFull && maxLineNotReached) {
+      this->logBuffer[logBufferFilled] = c;
+      this->logBufferFilled++;
+      // Keep track of lines written
+      if (c == 10) this->logBufferLine++;
+    } else {
+      // Max line number is reached
+      if (!maxLineNotReached) this->logBufferLine--;
+
+      // Find the end of the first line
+      uint16_t firstLineEnd = 0;
+      for (uint16_t i=0;i<this->logBufferFilled;i++) {
+        if (this->logBuffer[i] == 10){
+          // Include last char too
+          firstLineEnd = i + 1;
+          break;
+        }
+      }
+      // If there was a line ending
+      if (firstLineEnd > 0) {
+        // Calculate the new logBufferFilled value
+        this->logBufferFilled = logBufferFilled - firstLineEnd;
+        // Now we move the lines infront of the buffer
+        memcpy(this->logBuffer, &this->logBuffer[firstLineEnd], logBufferFilled);
+      } else {
+        // Let's reuse the buffer if it was full
+        if (!bufferNotFull) {
+          this->logBufferFilled = 0;
+        }// else {
+        //  Nothing to do here
+        //}
+      }
+      write(c);
+    }
+  }
+  // We are always writing all uint8_t to the buffer
+  return 1;
+}
+
+size_t OLEDDisplay::write(const char* str) {
+  if (str == NULL) return 0;
+  size_t length = strlen(str);
+  for (size_t i = 0; i < length; i++) {
+    write(str[i]);
+  }
+  return length;
+}
+
+#ifdef __MBED__
+int OLEDDisplay::_putc(int c) {
+
+	if (!fontData)
+		return 1;
+	if (!logBufferSize) {
+		uint8_t textHeight = pgm_read_byte(fontData + HEIGHT_POS);
+		uint16_t lines =  this->displayHeight / textHeight;
+		uint16_t chars =   2 * (this->displayWidth / textHeight);
+
+		if (this->displayHeight % textHeight)
+			lines++;
+		if (this->displayWidth % textHeight)
+			chars++;
+		setLogBuffer(lines, chars);
+	}
+
+	return this->write((uint8_t)c);
+}
+#endif
+
+// Private functions
+void OLEDDisplay::setGeometry(OLEDDISPLAY_GEOMETRY g, uint16_t width, uint16_t height) {
+  this->geometry = g;
+
+  switch (g) {
+    case GEOMETRY_128_64:
+      this->displayWidth = 128;
+      this->displayHeight = 64;
+      break;
+    case GEOMETRY_128_32:
+      this->displayWidth = 128;
+      this->displayHeight = 32;
+      break;
+    case GEOMETRY_64_48:
+      this->displayWidth = 64;
+      this->displayHeight = 48;
+      break;
+    case GEOMETRY_64_32:
+      this->displayWidth = 64;
+      this->displayHeight = 32;
+      break;
+    case GEOMETRY_RAWMODE:
+      this->displayWidth = width > 0 ? width : 128;
+      this->displayHeight = height > 0 ? height : 64;
+      break;
+  }
+  this->displayBufferSize = displayWidth * displayHeight / 8;
+}
+
+void OLEDDisplay::sendInitCommands(void) {
+  if (geometry == GEOMETRY_RAWMODE)
+  	return;
+  sendCommand(DISPLAYOFF);
+  sendCommand(SETDISPLAYCLOCKDIV);
+  sendCommand(0xF0); // Increase speed of the display max ~96Hz
+  sendCommand(SETMULTIPLEX);
+  sendCommand(this->height() - 1);
+  sendCommand(SETDISPLAYOFFSET);
+  sendCommand(0x00);
+  if(geometry == GEOMETRY_64_32)
+    sendCommand(0x00);  
+  else
+    sendCommand(SETSTARTLINE);
+  sendCommand(CHARGEPUMP);
+  sendCommand(0x14);
+  sendCommand(MEMORYMODE);
+  sendCommand(0x00);
+  sendCommand(SEGREMAP);
+  sendCommand(COMSCANINC);
+  sendCommand(SETCOMPINS);
+
+  if (geometry == GEOMETRY_128_64 || geometry == GEOMETRY_64_48 || geometry == GEOMETRY_64_32) {
+    sendCommand(0x12);
+  } else if (geometry == GEOMETRY_128_32) {
+    sendCommand(0x02);
+  }
+
+  sendCommand(SETCONTRAST);
+
+  if (geometry == GEOMETRY_128_64 || geometry == GEOMETRY_64_48 || geometry == GEOMETRY_64_32) {
+    sendCommand(0xCF);
+  } else if (geometry == GEOMETRY_128_32) {
+    sendCommand(0x8F);
+  }
+
+  sendCommand(SETPRECHARGE);
+  sendCommand(0xF1);
+  sendCommand(SETVCOMDETECT); //0xDB, (additionally needed to lower the contrast)
+  sendCommand(0x40);	        //0x40 default, to lower the contrast, put 0
+  sendCommand(DISPLAYALLON_RESUME);
+  sendCommand(NORMALDISPLAY);
+  sendCommand(0x2e);            // stop scroll
+  sendCommand(DISPLAYON);
+}
+
+void inline OLEDDisplay::drawInternal(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const uint8_t *data, uint16_t offset, uint16_t bytesInData) {
+  if (width < 0 || height < 0) return;
+  if (yMove + height < 0 || yMove > this->height())  return;
+  if (xMove + width  < 0 || xMove > this->width())   return;
+
+  uint8_t  rasterHeight = 1 + ((height - 1) >> 3); // fast ceil(height / 8.0)
+  int8_t   yOffset      = yMove & 7;
+
+  bytesInData = bytesInData == 0 ? width * rasterHeight : bytesInData;
+
+  int16_t initYMove   = yMove;
+  int8_t  initYOffset = yOffset;
+
+
+  for (uint16_t i = 0; i < bytesInData; i++) {
+
+    // Reset if next horizontal drawing phase is started.
+    if ( i % rasterHeight == 0) {
+      yMove   = initYMove;
+      yOffset = initYOffset;
+    }
+
+    uint8_t currentByte = pgm_read_byte(data + offset + i);
+
+    int16_t xPos = xMove + (i / rasterHeight);
+    int16_t yPos = ((yMove >> 3) + (i % rasterHeight)) * this->width();
+
+//    int16_t yScreenPos = yMove + yOffset;
+    int16_t dataPos    = xPos  + yPos;
+
+    if (dataPos >=  0  && dataPos < displayBufferSize &&
+        xPos    >=  0  && xPos    < this->width() ) {
+
+      if (yOffset >= 0) {
+        switch (this->color) {
+          case WHITE:   buffer[dataPos] |= currentByte << yOffset; break;
+          case BLACK:   buffer[dataPos] &= ~(currentByte << yOffset); break;
+          case INVERSE: buffer[dataPos] ^= currentByte << yOffset; break;
+        }
+
+        if (dataPos < (displayBufferSize - this->width())) {
+          switch (this->color) {
+            case WHITE:   buffer[dataPos + this->width()] |= currentByte >> (8 - yOffset); break;
+            case BLACK:   buffer[dataPos + this->width()] &= ~(currentByte >> (8 - yOffset)); break;
+            case INVERSE: buffer[dataPos + this->width()] ^= currentByte >> (8 - yOffset); break;
+          }
+        }
+      } else {
+        // Make new offset position
+        yOffset = -yOffset;
+
+        switch (this->color) {
+          case WHITE:   buffer[dataPos] |= currentByte >> yOffset; break;
+          case BLACK:   buffer[dataPos] &= ~(currentByte >> yOffset); break;
+          case INVERSE: buffer[dataPos] ^= currentByte >> yOffset; break;
+        }
+
+        // Prepare for next iteration by moving one block up
+        yMove -= 8;
+
+        // and setting the new yOffset
+        yOffset = 8 - yOffset;
+      }
+#ifndef __MBED__
+      yield();
+#endif
+    }
+  }
+}
+
+// You need to free the char!
+char* OLEDDisplay::utf8ascii(String str) {
+  uint16_t k = 0;
+  uint16_t length = str.length() + 1;
+
+  // Copy the string into a char array
+  char* s = (char*) malloc(length * sizeof(char));
+  if(!s) {
+    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][utf8ascii] Can't allocate another char array. Drop support for UTF-8.\n");
+    return (char*) str.c_str();
+  }
+  str.toCharArray(s, length);
+
+  length--;
+
+  for (uint16_t i=0; i < length; i++) {
+    char c = (this->fontTableLookupFunction)(s[i]);
+    if (c!=0) {
+      s[k++]=c;
+    }
+  }
+
+  s[k]=0;
+
+  // This will leak 's' be sure to free it in the calling function.
+  return s;
+}
+
+void OLEDDisplay::setFontTableLookupFunction(FontTableLookupFunction function) {
+  this->fontTableLookupFunction = function;
+}
+
+
+char DefaultFontTableLookup(const uint8_t ch) {
+    // UTF-8 to font table index converter
+    // Code form http://playground.arduino.cc/Main/Utf8ascii
+	static uint8_t LASTCHAR;
+
+	if (ch < 128) { // Standard ASCII-set 0..0x7F handling
+		LASTCHAR = 0;
+		return ch;
+	}
+
+	uint8_t last = LASTCHAR;   // get last char
+	LASTCHAR = ch;
+
+	switch (last) {    // conversion depnding on first UTF8-character
+		case 0xC2: return (uint8_t) ch;
+		case 0xC3: return (uint8_t) (ch | 0xC0);
+		case 0x82: if (ch == 0xAC) return (uint8_t) 0x80;    // special case Euro-symbol
+	}
+
+	return (uint8_t) 0; // otherwise: return zero, if character has to be ignored
+}
diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h
new file mode 100644
index 00000000..8500b761
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h
@@ -0,0 +1,383 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ * Copyright (c) 2019 by Helmut Tschemernjak - www.radioshuttle.de
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef OLEDDISPLAY_h
+#define OLEDDISPLAY_h
+
+#ifdef ARDUINO
+#include <Arduino.h>
+#elif __MBED__
+#define pgm_read_byte(addr)   (*(const unsigned char *)(addr))
+
+#include <mbed.h>
+#define delay(x)	wait_ms(x)
+#define yield()		void()
+
+/*
+ * This is a little Arduino String emulation to keep the OLEDDisplay
+ * library code in common between Arduino and mbed-os
+ */
+class String {
+public:
+	String(const char *s) { _str = s; };
+	int length() { return strlen(_str); };
+	const char *c_str() { return _str; };
+    void toCharArray(char *buf, unsigned int bufsize, unsigned int index = 0) const {
+		memcpy(buf, _str + index,  std::min(bufsize, strlen(_str)));
+	};
+private:
+	const char *_str;
+};
+
+#else
+#error "Unkown operating system"
+#endif
+
+#include "OLEDDisplayFonts.h"
+
+//#define DEBUG_OLEDDISPLAY(...) Serial.printf( __VA_ARGS__ )
+//#define DEBUG_OLEDDISPLAY(...) dprintf("%s",  __VA_ARGS__ )
+
+#ifndef DEBUG_OLEDDISPLAY
+#define DEBUG_OLEDDISPLAY(...)
+#endif
+
+// Use DOUBLE BUFFERING by default
+#ifndef OLEDDISPLAY_REDUCE_MEMORY
+#define OLEDDISPLAY_DOUBLE_BUFFER
+#endif
+
+// Header Values
+#define JUMPTABLE_BYTES 4
+
+#define JUMPTABLE_LSB   1
+#define JUMPTABLE_SIZE  2
+#define JUMPTABLE_WIDTH 3
+#define JUMPTABLE_START 4
+
+#define WIDTH_POS 0
+#define HEIGHT_POS 1
+#define FIRST_CHAR_POS 2
+#define CHAR_NUM_POS 3
+
+
+// Display commands
+#define CHARGEPUMP 0x8D
+#define COLUMNADDR 0x21
+#define COMSCANDEC 0xC8
+#define COMSCANINC 0xC0
+#define DISPLAYALLON 0xA5
+#define DISPLAYALLON_RESUME 0xA4
+#define DISPLAYOFF 0xAE
+#define DISPLAYON 0xAF
+#define EXTERNALVCC 0x1
+#define INVERTDISPLAY 0xA7
+#define MEMORYMODE 0x20
+#define NORMALDISPLAY 0xA6
+#define PAGEADDR 0x22
+#define SEGREMAP 0xA0
+#define SETCOMPINS 0xDA
+#define SETCONTRAST 0x81
+#define SETDISPLAYCLOCKDIV 0xD5
+#define SETDISPLAYOFFSET 0xD3
+#define SETHIGHCOLUMN 0x10
+#define SETLOWCOLUMN 0x00
+#define SETMULTIPLEX 0xA8
+#define SETPRECHARGE 0xD9
+#define SETSEGMENTREMAP 0xA1
+#define SETSTARTLINE 0x40
+#define SETVCOMDETECT 0xDB
+#define SWITCHCAPVCC 0x2
+
+#ifndef _swap_int16_t
+#define _swap_int16_t(a, b) { int16_t t = a; a = b; b = t; }
+#endif
+
+enum OLEDDISPLAY_COLOR {
+  BLACK = 0,
+  WHITE = 1,
+  INVERSE = 2
+};
+
+enum OLEDDISPLAY_TEXT_ALIGNMENT {
+  TEXT_ALIGN_LEFT = 0,
+  TEXT_ALIGN_RIGHT = 1,
+  TEXT_ALIGN_CENTER = 2,
+  TEXT_ALIGN_CENTER_BOTH = 3
+};
+
+
+enum OLEDDISPLAY_GEOMETRY {
+  GEOMETRY_128_64   = 0,
+  GEOMETRY_128_32   = 1,
+  GEOMETRY_64_48    = 2,
+  GEOMETRY_64_32    = 3,
+  GEOMETRY_RAWMODE  = 4
+};
+
+enum HW_I2C {
+  I2C_ONE,
+  I2C_TWO
+};
+
+typedef char (*FontTableLookupFunction)(const uint8_t ch);
+char DefaultFontTableLookup(const uint8_t ch);
+
+
+#ifdef ARDUINO
+class OLEDDisplay : public Print  {
+#elif __MBED__
+class OLEDDisplay : public Stream {
+#else
+#error "Unkown operating system"
+#endif
+
+  public:
+	OLEDDisplay();
+    virtual ~OLEDDisplay();
+
+	uint16_t width(void) const { return displayWidth; };
+	uint16_t height(void) const { return displayHeight; };
+
+    // Use this to resume after a deep sleep without resetting the display (what init() would do).
+    // Returns true if connection to the display was established and the buffer allocated, false otherwise.
+    bool allocateBuffer();
+
+    // Allocates the buffer and initializes the driver & display. Resets the display!
+    // Returns false if buffer allocation failed, true otherwise.
+    bool init();
+
+    // Free the memory used by the display
+    void end();
+
+    // Cycle through the initialization
+    void resetDisplay(void);
+
+    /* Drawing functions */
+    // Sets the color of all pixel operations
+    void setColor(OLEDDISPLAY_COLOR color);
+
+    // Returns the current color.
+    OLEDDISPLAY_COLOR getColor();
+
+    // Draw a pixel at given position
+    void setPixel(int16_t x, int16_t y);
+
+    // Draw a pixel at given position and color
+    void setPixelColor(int16_t x, int16_t y, OLEDDISPLAY_COLOR color);
+
+    // Clear a pixel at given position FIXME: INVERSE is untested with this function
+    void clearPixel(int16_t x, int16_t y);
+
+    // Draw a line from position 0 to position 1
+    void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1);
+
+    // Draw the border of a rectangle at the given location
+    void drawRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+    // Fill the rectangle
+    void fillRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+    // Draw the border of a circle
+    void drawCircle(int16_t x, int16_t y, int16_t radius);
+
+    // Draw all Quadrants specified in the quads bit mask
+    void drawCircleQuads(int16_t x0, int16_t y0, int16_t radius, uint8_t quads);
+
+    // Fill circle
+    void fillCircle(int16_t x, int16_t y, int16_t radius);
+
+    // Draw a line horizontally
+    void drawHorizontalLine(int16_t x, int16_t y, int16_t length);
+
+    // Draw a line vertically
+    void drawVerticalLine(int16_t x, int16_t y, int16_t length);
+
+    // Draws a rounded progress bar with the outer dimensions given by width and height. Progress is
+    // a unsigned byte value between 0 and 100
+    void drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress);
+
+    // Draw a bitmap in the internal image format
+    void drawFastImage(int16_t x, int16_t y, int16_t width, int16_t height, const uint8_t *image);
+
+    // Draw a XBM
+    void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, const uint8_t *xbm);
+
+    // Draw icon 16x16 xbm format
+    void drawIco16x16(int16_t x, int16_t y, const char *ico, bool inverse = false);
+
+    /* Text functions */
+
+    // Draws a string at the given location
+    void drawString(int16_t x, int16_t y, String text);
+
+    // Draws a formatted string (like printf) at the given location
+    void drawStringf(int16_t x, int16_t y, char* buffer, String format, ... );
+
+    // Draws a String with a maximum width at the given location.
+    // If the given String is wider than the specified width
+    // The text will be wrapped to the next line at a space or dash
+    void drawStringMaxWidth(int16_t x, int16_t y, uint16_t maxLineWidth, String text);
+
+    // Returns the width of the const char* with the current
+    // font settings
+    uint16_t getStringWidth(const char* text, uint16_t length);
+
+    // Convencience method for the const char version
+    uint16_t getStringWidth(String text);
+
+    // Specifies relative to which anchor point
+    // the text is rendered. Available constants:
+    // TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER_BOTH
+    void setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment);
+
+    // Sets the current font. Available default fonts
+    // ArialMT_Plain_10, ArialMT_Plain_16, ArialMT_Plain_24
+    void setFont(const uint8_t *fontData);
+
+    // Set the function that will convert utf-8 to font table index
+    void setFontTableLookupFunction(FontTableLookupFunction function);
+
+    /* Display functions */
+
+    // Turn the display on
+    void displayOn(void);
+
+    // Turn the display offs
+    void displayOff(void);
+
+    // Inverted display mode
+    void invertDisplay(void);
+
+    // Normal display mode
+    void normalDisplay(void);
+
+    // Set display contrast
+    // really low brightness & contrast: contrast = 10, precharge = 5, comdetect = 0
+    // normal brightness & contrast:  contrast = 100
+    void setContrast(uint8_t contrast, uint8_t precharge = 241, uint8_t comdetect = 64);
+
+    // Convenience method to access
+    void setBrightness(uint8_t);
+
+    // Reset display rotation or mirroring
+    void resetOrientation();
+
+    // Turn the display upside down
+    void flipScreenVertically();
+
+    // Mirror the display (to be used in a mirror or as a projector)
+    void mirrorScreen();
+
+    // Write the buffer to the display memory
+    virtual void display(void) = 0;
+
+    // Clear the local pixel buffer
+    void clear(void);
+
+    // Log buffer implementation
+
+    // This will define the lines and characters you can
+    // print to the screen. When you exeed the buffer size (lines * chars)
+    // the output may be truncated due to the size constraint.
+    bool setLogBuffer(uint16_t lines, uint16_t chars);
+
+    // Draw the log buffer at position (x, y)
+    void drawLogBuffer(uint16_t x, uint16_t y);
+
+    // Get screen geometry
+    uint16_t getWidth(void);
+    uint16_t getHeight(void);
+
+    // Implement needed function to be compatible with Print class
+    size_t write(uint8_t c);
+    size_t write(const char* s);
+	
+    // Implement needed function to be compatible with Stream class
+#ifdef __MBED__
+	int _putc(int c);
+	int _getc() { return -1; };
+#endif
+
+
+    uint8_t            *buffer;
+
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+    uint8_t            *buffer_back;
+    #endif
+
+  protected:
+
+    OLEDDISPLAY_GEOMETRY geometry;
+
+    uint16_t  displayWidth;
+    uint16_t  displayHeight;
+    uint16_t  displayBufferSize;
+
+    // Set the correct height, width and buffer for the geometry
+    void setGeometry(OLEDDISPLAY_GEOMETRY g, uint16_t width = 0, uint16_t height = 0);
+
+    OLEDDISPLAY_TEXT_ALIGNMENT   textAlignment;
+    OLEDDISPLAY_COLOR            color;
+
+    const uint8_t	 *fontData;
+
+    // State values for logBuffer
+    uint16_t   logBufferSize;
+    uint16_t   logBufferFilled;
+    uint16_t   logBufferLine;
+    uint16_t   logBufferMaxLines;
+    char      *logBuffer;
+
+
+	// the header size of the buffer used, e.g. for the SPI command header
+	virtual int getBufferOffset(void) = 0;
+	
+    // Send a command to the display (low level function)
+    virtual void sendCommand(uint8_t com) {(void)com;};
+
+    // Connect to the display
+    virtual bool connect() { return false; };
+
+    // Send all the init commands
+    void sendInitCommands();
+
+    // converts utf8 characters to extended ascii
+    char* utf8ascii(String s);
+
+    void inline drawInternal(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const uint8_t *data, uint16_t offset, uint16_t bytesInData) __attribute__((always_inline));
+
+    void drawStringInternal(int16_t xMove, int16_t yMove, char* text, uint16_t textLength, uint16_t textWidth);
+	
+	FontTableLookupFunction fontTableLookupFunction;
+};
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayFonts.h b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayFonts.h
new file mode 100644
index 00000000..abc61ba1
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayFonts.h
@@ -0,0 +1,1278 @@
+#ifndef OLEDDISPLAYFONTS_h
+#define OLEDDISPLAYFONTS_h
+
+#ifdef __MBED__
+#define PROGMEM
+#endif
+
+const uint8_t ArialMT_Plain_10[] PROGMEM = {
+  0x0A, // Width: 10
+  0x0D, // Height: 13
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table:
+  0xFF, 0xFF, 0x00, 0x03,  // 32:65535
+  0x00, 0x00, 0x04, 0x03,  // 33:0
+  0x00, 0x04, 0x05, 0x04,  // 34:4
+  0x00, 0x09, 0x09, 0x06,  // 35:9
+  0x00, 0x12, 0x0A, 0x06,  // 36:18
+  0x00, 0x1C, 0x10, 0x09,  // 37:28
+  0x00, 0x2C, 0x0E, 0x07,  // 38:44
+  0x00, 0x3A, 0x01, 0x02,  // 39:58
+  0x00, 0x3B, 0x06, 0x03,  // 40:59
+  0x00, 0x41, 0x06, 0x03,  // 41:65
+  0x00, 0x47, 0x05, 0x04,  // 42:71
+  0x00, 0x4C, 0x09, 0x06,  // 43:76
+  0x00, 0x55, 0x04, 0x03,  // 44:85
+  0x00, 0x59, 0x03, 0x03,  // 45:89
+  0x00, 0x5C, 0x04, 0x03,  // 46:92
+  0x00, 0x60, 0x05, 0x03,  // 47:96
+  0x00, 0x65, 0x0A, 0x06,  // 48:101
+  0x00, 0x6F, 0x08, 0x06,  // 49:111
+  0x00, 0x77, 0x0A, 0x06,  // 50:119
+  0x00, 0x81, 0x0A, 0x06,  // 51:129
+  0x00, 0x8B, 0x0B, 0x06,  // 52:139
+  0x00, 0x96, 0x0A, 0x06,  // 53:150
+  0x00, 0xA0, 0x0A, 0x06,  // 54:160
+  0x00, 0xAA, 0x09, 0x06,  // 55:170
+  0x00, 0xB3, 0x0A, 0x06,  // 56:179
+  0x00, 0xBD, 0x0A, 0x06,  // 57:189
+  0x00, 0xC7, 0x04, 0x03,  // 58:199
+  0x00, 0xCB, 0x04, 0x03,  // 59:203
+  0x00, 0xCF, 0x0A, 0x06,  // 60:207
+  0x00, 0xD9, 0x09, 0x06,  // 61:217
+  0x00, 0xE2, 0x09, 0x06,  // 62:226
+  0x00, 0xEB, 0x0B, 0x06,  // 63:235
+  0x00, 0xF6, 0x14, 0x0A,  // 64:246
+  0x01, 0x0A, 0x0E, 0x07,  // 65:266
+  0x01, 0x18, 0x0C, 0x07,  // 66:280
+  0x01, 0x24, 0x0C, 0x07,  // 67:292
+  0x01, 0x30, 0x0B, 0x07,  // 68:304
+  0x01, 0x3B, 0x0C, 0x07,  // 69:315
+  0x01, 0x47, 0x09, 0x06,  // 70:327
+  0x01, 0x50, 0x0D, 0x08,  // 71:336
+  0x01, 0x5D, 0x0C, 0x07,  // 72:349
+  0x01, 0x69, 0x04, 0x03,  // 73:361
+  0x01, 0x6D, 0x08, 0x05,  // 74:365
+  0x01, 0x75, 0x0E, 0x07,  // 75:373
+  0x01, 0x83, 0x0C, 0x06,  // 76:387
+  0x01, 0x8F, 0x10, 0x08,  // 77:399
+  0x01, 0x9F, 0x0C, 0x07,  // 78:415
+  0x01, 0xAB, 0x0E, 0x08,  // 79:427
+  0x01, 0xB9, 0x0B, 0x07,  // 80:441
+  0x01, 0xC4, 0x0E, 0x08,  // 81:452
+  0x01, 0xD2, 0x0C, 0x07,  // 82:466
+  0x01, 0xDE, 0x0C, 0x07,  // 83:478
+  0x01, 0xEA, 0x0B, 0x06,  // 84:490
+  0x01, 0xF5, 0x0C, 0x07,  // 85:501
+  0x02, 0x01, 0x0D, 0x07,  // 86:513
+  0x02, 0x0E, 0x11, 0x09,  // 87:526
+  0x02, 0x1F, 0x0E, 0x07,  // 88:543
+  0x02, 0x2D, 0x0D, 0x07,  // 89:557
+  0x02, 0x3A, 0x0C, 0x06,  // 90:570
+  0x02, 0x46, 0x06, 0x03,  // 91:582
+  0x02, 0x4C, 0x06, 0x03,  // 92:588
+  0x02, 0x52, 0x04, 0x03,  // 93:594
+  0x02, 0x56, 0x09, 0x05,  // 94:598
+  0x02, 0x5F, 0x0C, 0x06,  // 95:607
+  0x02, 0x6B, 0x03, 0x03,  // 96:619
+  0x02, 0x6E, 0x0A, 0x06,  // 97:622
+  0x02, 0x78, 0x0A, 0x06,  // 98:632
+  0x02, 0x82, 0x0A, 0x05,  // 99:642
+  0x02, 0x8C, 0x0A, 0x06,  // 100:652
+  0x02, 0x96, 0x0A, 0x06,  // 101:662
+  0x02, 0xA0, 0x05, 0x03,  // 102:672
+  0x02, 0xA5, 0x0A, 0x06,  // 103:677
+  0x02, 0xAF, 0x0A, 0x06,  // 104:687
+  0x02, 0xB9, 0x04, 0x02,  // 105:697
+  0x02, 0xBD, 0x04, 0x02,  // 106:701
+  0x02, 0xC1, 0x08, 0x05,  // 107:705
+  0x02, 0xC9, 0x04, 0x02,  // 108:713
+  0x02, 0xCD, 0x10, 0x08,  // 109:717
+  0x02, 0xDD, 0x0A, 0x06,  // 110:733
+  0x02, 0xE7, 0x0A, 0x06,  // 111:743
+  0x02, 0xF1, 0x0A, 0x06,  // 112:753
+  0x02, 0xFB, 0x0A, 0x06,  // 113:763
+  0x03, 0x05, 0x05, 0x03,  // 114:773
+  0x03, 0x0A, 0x08, 0x05,  // 115:778
+  0x03, 0x12, 0x06, 0x03,  // 116:786
+  0x03, 0x18, 0x0A, 0x06,  // 117:792
+  0x03, 0x22, 0x09, 0x05,  // 118:802
+  0x03, 0x2B, 0x0E, 0x07,  // 119:811
+  0x03, 0x39, 0x0A, 0x05,  // 120:825
+  0x03, 0x43, 0x09, 0x05,  // 121:835
+  0x03, 0x4C, 0x0A, 0x05,  // 122:844
+  0x03, 0x56, 0x06, 0x03,  // 123:854
+  0x03, 0x5C, 0x04, 0x03,  // 124:860
+  0x03, 0x60, 0x05, 0x03,  // 125:864
+  0x03, 0x65, 0x09, 0x06,  // 126:869
+  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 128:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 129:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 130:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 131:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 132:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 133:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 134:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 135:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 136:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 137:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 138:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 139:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 140:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 141:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 142:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 143:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 144:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 145:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 146:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 147:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 148:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 149:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 150:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 151:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 152:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 153:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 154:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 155:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 156:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 157:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 158:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 159:65535
+  0xFF, 0xFF, 0x00, 0x03,  // 160:65535
+  0x03, 0x6E, 0x04, 0x03,  // 161:878
+  0x03, 0x72, 0x0A, 0x06,  // 162:882
+  0x03, 0x7C, 0x0C, 0x06,  // 163:892
+  0x03, 0x88, 0x0A, 0x06,  // 164:904
+  0x03, 0x92, 0x0A, 0x06,  // 165:914
+  0x03, 0x9C, 0x04, 0x03,  // 166:924
+  0x03, 0xA0, 0x0A, 0x06,  // 167:928
+  0x03, 0xAA, 0x05, 0x03,  // 168:938
+  0x03, 0xAF, 0x0D, 0x07,  // 169:943
+  0x03, 0xBC, 0x07, 0x04,  // 170:956
+  0x03, 0xC3, 0x0A, 0x06,  // 171:963
+  0x03, 0xCD, 0x09, 0x06,  // 172:973
+  0x03, 0xD6, 0x03, 0x03,  // 173:982
+  0x03, 0xD9, 0x0D, 0x07,  // 174:985
+  0x03, 0xE6, 0x0B, 0x06,  // 175:998
+  0x03, 0xF1, 0x07, 0x04,  // 176:1009
+  0x03, 0xF8, 0x0A, 0x05,  // 177:1016
+  0x04, 0x02, 0x05, 0x03,  // 178:1026
+  0x04, 0x07, 0x05, 0x03,  // 179:1031
+  0x04, 0x0C, 0x05, 0x03,  // 180:1036
+  0x04, 0x11, 0x0A, 0x06,  // 181:1041
+  0x04, 0x1B, 0x09, 0x05,  // 182:1051
+  0x04, 0x24, 0x03, 0x03,  // 183:1060
+  0x04, 0x27, 0x06, 0x03,  // 184:1063
+  0x04, 0x2D, 0x05, 0x03,  // 185:1069
+  0x04, 0x32, 0x07, 0x04,  // 186:1074
+  0x04, 0x39, 0x0A, 0x06,  // 187:1081
+  0x04, 0x43, 0x10, 0x08,  // 188:1091
+  0x04, 0x53, 0x10, 0x08,  // 189:1107
+  0x04, 0x63, 0x10, 0x08,  // 190:1123
+  0x04, 0x73, 0x0A, 0x06,  // 191:1139
+  0x04, 0x7D, 0x0E, 0x07,  // 192:1149
+  0x04, 0x8B, 0x0E, 0x07,  // 193:1163
+  0x04, 0x99, 0x0E, 0x07,  // 194:1177
+  0x04, 0xA7, 0x0E, 0x07,  // 195:1191
+  0x04, 0xB5, 0x0E, 0x07,  // 196:1205
+  0x04, 0xC3, 0x0E, 0x07,  // 197:1219
+  0x04, 0xD1, 0x12, 0x0A,  // 198:1233
+  0x04, 0xE3, 0x0C, 0x07,  // 199:1251
+  0x04, 0xEF, 0x0C, 0x07,  // 200:1263
+  0x04, 0xFB, 0x0C, 0x07,  // 201:1275
+  0x05, 0x07, 0x0C, 0x07,  // 202:1287
+  0x05, 0x13, 0x0C, 0x07,  // 203:1299
+  0x05, 0x1F, 0x05, 0x03,  // 204:1311
+  0x05, 0x24, 0x04, 0x03,  // 205:1316
+  0x05, 0x28, 0x04, 0x03,  // 206:1320
+  0x05, 0x2C, 0x05, 0x03,  // 207:1324
+  0x05, 0x31, 0x0B, 0x07,  // 208:1329
+  0x05, 0x3C, 0x0C, 0x07,  // 209:1340
+  0x05, 0x48, 0x0E, 0x08,  // 210:1352
+  0x05, 0x56, 0x0E, 0x08,  // 211:1366
+  0x05, 0x64, 0x0E, 0x08,  // 212:1380
+  0x05, 0x72, 0x0E, 0x08,  // 213:1394
+  0x05, 0x80, 0x0E, 0x08,  // 214:1408
+  0x05, 0x8E, 0x0A, 0x06,  // 215:1422
+  0x05, 0x98, 0x0D, 0x08,  // 216:1432
+  0x05, 0xA5, 0x0C, 0x07,  // 217:1445
+  0x05, 0xB1, 0x0C, 0x07,  // 218:1457
+  0x05, 0xBD, 0x0C, 0x07,  // 219:1469
+  0x05, 0xC9, 0x0C, 0x07,  // 220:1481
+  0x05, 0xD5, 0x0D, 0x07,  // 221:1493
+  0x05, 0xE2, 0x0B, 0x07,  // 222:1506
+  0x05, 0xED, 0x0C, 0x06,  // 223:1517
+  0x05, 0xF9, 0x0A, 0x06,  // 224:1529
+  0x06, 0x03, 0x0A, 0x06,  // 225:1539
+  0x06, 0x0D, 0x0A, 0x06,  // 226:1549
+  0x06, 0x17, 0x0A, 0x06,  // 227:1559
+  0x06, 0x21, 0x0A, 0x06,  // 228:1569
+  0x06, 0x2B, 0x0A, 0x06,  // 229:1579
+  0x06, 0x35, 0x10, 0x09,  // 230:1589
+  0x06, 0x45, 0x0A, 0x05,  // 231:1605
+  0x06, 0x4F, 0x0A, 0x06,  // 232:1615
+  0x06, 0x59, 0x0A, 0x06,  // 233:1625
+  0x06, 0x63, 0x0A, 0x06,  // 234:1635
+  0x06, 0x6D, 0x0A, 0x06,  // 235:1645
+  0x06, 0x77, 0x05, 0x03,  // 236:1655
+  0x06, 0x7C, 0x04, 0x03,  // 237:1660
+  0x06, 0x80, 0x05, 0x03,  // 238:1664
+  0x06, 0x85, 0x05, 0x03,  // 239:1669
+  0x06, 0x8A, 0x0A, 0x06,  // 240:1674
+  0x06, 0x94, 0x0A, 0x06,  // 241:1684
+  0x06, 0x9E, 0x0A, 0x06,  // 242:1694
+  0x06, 0xA8, 0x0A, 0x06,  // 243:1704
+  0x06, 0xB2, 0x0A, 0x06,  // 244:1714
+  0x06, 0xBC, 0x0A, 0x06,  // 245:1724
+  0x06, 0xC6, 0x0A, 0x06,  // 246:1734
+  0x06, 0xD0, 0x09, 0x05,  // 247:1744
+  0x06, 0xD9, 0x0A, 0x06,  // 248:1753
+  0x06, 0xE3, 0x0A, 0x06,  // 249:1763
+  0x06, 0xED, 0x0A, 0x06,  // 250:1773
+  0x06, 0xF7, 0x0A, 0x06,  // 251:1783
+  0x07, 0x01, 0x0A, 0x06,  // 252:1793
+  0x07, 0x0B, 0x09, 0x05,  // 253:1803
+  0x07, 0x14, 0x0A, 0x06,  // 254:1812
+  0x07, 0x1E, 0x09, 0x05,  // 255:1822
+
+  // Font Data:
+  0x00,0x00,0xF8,0x02,  // 33
+  0x38,0x00,0x00,0x00,0x38, // 34
+  0xA0,0x03,0xE0,0x00,0xB8,0x03,0xE0,0x00,0xB8, // 35
+  0x30,0x01,0x28,0x02,0xF8,0x07,0x48,0x02,0x90,0x01,  // 36
+  0x00,0x00,0x30,0x00,0x48,0x00,0x30,0x03,0xC0,0x00,0xB0,0x01,0x48,0x02,0x80,0x01,  // 37
+  0x80,0x01,0x50,0x02,0x68,0x02,0xA8,0x02,0x18,0x01,0x80,0x03,0x80,0x02,  // 38
+  0x38, // 39
+  0xE0,0x03,0x10,0x04,0x08,0x08,  // 40
+  0x08,0x08,0x10,0x04,0xE0,0x03,  // 41
+  0x28,0x00,0x18,0x00,0x28, // 42
+  0x40,0x00,0x40,0x00,0xF0,0x01,0x40,0x00,0x40, // 43
+  0x00,0x00,0x00,0x06,  // 44
+  0x80,0x00,0x80, // 45
+  0x00,0x00,0x00,0x02,  // 46
+  0x00,0x03,0xE0,0x00,0x18, // 47
+  0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01,  // 48
+  0x00,0x00,0x20,0x00,0x10,0x00,0xF8,0x03,  // 49
+  0x10,0x02,0x08,0x03,0x88,0x02,0x48,0x02,0x30,0x02,  // 50
+  0x10,0x01,0x08,0x02,0x48,0x02,0x48,0x02,0xB0,0x01,  // 51
+  0xC0,0x00,0xA0,0x00,0x90,0x00,0x88,0x00,0xF8,0x03,0x80, // 52
+  0x60,0x01,0x38,0x02,0x28,0x02,0x28,0x02,0xC8,0x01,  // 53
+  0xF0,0x01,0x28,0x02,0x28,0x02,0x28,0x02,0xD0,0x01,  // 54
+  0x08,0x00,0x08,0x03,0xC8,0x00,0x38,0x00,0x08, // 55
+  0xB0,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0xB0,0x01,  // 56
+  0x70,0x01,0x88,0x02,0x88,0x02,0x88,0x02,0xF0,0x01,  // 57
+  0x00,0x00,0x20,0x02,  // 58
+  0x00,0x00,0x20,0x06,  // 59
+  0x00,0x00,0x40,0x00,0xA0,0x00,0xA0,0x00,0x10,0x01,  // 60
+  0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0, // 61
+  0x00,0x00,0x10,0x01,0xA0,0x00,0xA0,0x00,0x40, // 62
+  0x10,0x00,0x08,0x00,0x08,0x00,0xC8,0x02,0x48,0x00,0x30, // 63
+  0x00,0x00,0xC0,0x03,0x30,0x04,0xD0,0x09,0x28,0x0A,0x28,0x0A,0xC8,0x0B,0x68,0x0A,0x10,0x05,0xE0,0x04,  // 64
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x00,0xC0,0x01,0x00,0x02,  // 65
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0xF0,0x01,  // 66
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x10,0x01,  // 67
+  0x00,0x00,0xF8,0x03,0x08,0x02,0x08,0x02,0x10,0x01,0xE0, // 68
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0x48,0x02,  // 69
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x08, // 70
+  0x00,0x00,0xE0,0x00,0x10,0x01,0x08,0x02,0x48,0x02,0x50,0x01,0xC0, // 71
+  0x00,0x00,0xF8,0x03,0x40,0x00,0x40,0x00,0x40,0x00,0xF8,0x03,  // 72
+  0x00,0x00,0xF8,0x03,  // 73
+  0x00,0x03,0x00,0x02,0x00,0x02,0xF8,0x01,  // 74
+  0x00,0x00,0xF8,0x03,0x80,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02,  // 75
+  0x00,0x00,0xF8,0x03,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,  // 76
+  0x00,0x00,0xF8,0x03,0x30,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x30,0x00,0xF8,0x03,  // 77
+  0x00,0x00,0xF8,0x03,0x30,0x00,0x40,0x00,0x80,0x01,0xF8,0x03,  // 78
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01,  // 79
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x48,0x00,0x30, // 80
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x03,0x08,0x03,0xF0,0x02,  // 81
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0xC8,0x00,0x30,0x03,  // 82
+  0x00,0x00,0x30,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0x90,0x01,  // 83
+  0x00,0x00,0x08,0x00,0x08,0x00,0xF8,0x03,0x08,0x00,0x08, // 84
+  0x00,0x00,0xF8,0x01,0x00,0x02,0x00,0x02,0x00,0x02,0xF8,0x01,  // 85
+  0x08,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x80,0x01,0x70,0x00,0x08, // 86
+  0x18,0x00,0xE0,0x01,0x00,0x02,0xF0,0x01,0x08,0x00,0xF0,0x01,0x00,0x02,0xE0,0x01,0x18, // 87
+  0x00,0x02,0x08,0x01,0x90,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02,  // 88
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC0,0x03,0x20,0x00,0x10,0x00,0x08, // 89
+  0x08,0x03,0x88,0x02,0xC8,0x02,0x68,0x02,0x38,0x02,0x18,0x02,  // 90
+  0x00,0x00,0xF8,0x0F,0x08,0x08,  // 91
+  0x18,0x00,0xE0,0x00,0x00,0x03,  // 92
+  0x08,0x08,0xF8,0x0F,  // 93
+  0x40,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x40, // 94
+  0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,  // 95
+  0x08,0x00,0x10, // 96
+  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x02,0xE0,0x03,  // 97
+  0x00,0x00,0xF8,0x03,0x20,0x02,0x20,0x02,0xC0,0x01,  // 98
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0x40,0x01,  // 99
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xF8,0x03,  // 100
+  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02,  // 101
+  0x20,0x00,0xF0,0x03,0x28, // 102
+  0x00,0x00,0xC0,0x05,0x20,0x0A,0x20,0x0A,0xE0,0x07,  // 103
+  0x00,0x00,0xF8,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 104
+  0x00,0x00,0xE8,0x03,  // 105
+  0x00,0x08,0xE8,0x07,  // 106
+  0xF8,0x03,0x80,0x00,0xC0,0x01,0x20,0x02,  // 107
+  0x00,0x00,0xF8,0x03,  // 108
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 109
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 110
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xC0,0x01,  // 111
+  0x00,0x00,0xE0,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01,  // 112
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xE0,0x0F,  // 113
+  0x00,0x00,0xE0,0x03,0x20, // 114
+  0x40,0x02,0xA0,0x02,0xA0,0x02,0x20,0x01,  // 115
+  0x20,0x00,0xF8,0x03,0x20,0x02,  // 116
+  0x00,0x00,0xE0,0x01,0x00,0x02,0x00,0x02,0xE0,0x03,  // 117
+  0x20,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x20, // 118
+  0xE0,0x01,0x00,0x02,0xC0,0x01,0x20,0x00,0xC0,0x01,0x00,0x02,0xE0,0x01,  // 119
+  0x20,0x02,0x40,0x01,0x80,0x00,0x40,0x01,0x20,0x02,  // 120
+  0x20,0x00,0xC0,0x09,0x00,0x06,0xC0,0x01,0x20, // 121
+  0x20,0x02,0x20,0x03,0xA0,0x02,0x60,0x02,0x20,0x02,  // 122
+  0x80,0x00,0x78,0x0F,0x08,0x08,  // 123
+  0x00,0x00,0xF8,0x0F,  // 124
+  0x08,0x08,0x78,0x0F,0x80, // 125
+  0xC0,0x00,0x40,0x00,0xC0,0x00,0x80,0x00,0xC0, // 126
+  0x00,0x00,0xA0,0x0F,  // 161
+  0x00,0x00,0xC0,0x01,0xA0,0x0F,0x78,0x02,0x40,0x01,  // 162
+  0x40,0x02,0x70,0x03,0xC8,0x02,0x48,0x02,0x08,0x02,0x10,0x02,  // 163
+  0x00,0x00,0xE0,0x01,0x20,0x01,0x20,0x01,0xE0,0x01,  // 164
+  0x48,0x01,0x70,0x01,0xC0,0x03,0x70,0x01,0x48,0x01,  // 165
+  0x00,0x00,0x38,0x0F,  // 166
+  0xD0,0x04,0x28,0x09,0x48,0x09,0x48,0x0A,0x90,0x05,  // 167
+  0x08,0x00,0x00,0x00,0x08, // 168
+  0xE0,0x00,0x10,0x01,0x48,0x02,0xA8,0x02,0xA8,0x02,0x10,0x01,0xE0, // 169
+  0x68,0x00,0x68,0x00,0x68,0x00,0x78, // 170
+  0x00,0x00,0x80,0x01,0x40,0x02,0x80,0x01,0x40,0x02,  // 171
+  0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0xE0, // 172
+  0x80,0x00,0x80, // 173
+  0xE0,0x00,0x10,0x01,0xE8,0x02,0x68,0x02,0xC8,0x02,0x10,0x01,0xE0, // 174
+  0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, // 175
+  0x00,0x00,0x38,0x00,0x28,0x00,0x38, // 176
+  0x40,0x02,0x40,0x02,0xF0,0x03,0x40,0x02,0x40,0x02,  // 177
+  0x48,0x00,0x68,0x00,0x58, // 178
+  0x48,0x00,0x58,0x00,0x68, // 179
+  0x00,0x00,0x10,0x00,0x08, // 180
+  0x00,0x00,0xE0,0x0F,0x00,0x02,0x00,0x02,0xE0,0x03,  // 181
+  0x70,0x00,0xF8,0x0F,0x08,0x00,0xF8,0x0F,0x08, // 182
+  0x00,0x00,0x40, // 183
+  0x00,0x00,0x00,0x14,0x00,0x18,  // 184
+  0x00,0x00,0x10,0x00,0x78, // 185
+  0x30,0x00,0x48,0x00,0x48,0x00,0x30, // 186
+  0x00,0x00,0x40,0x02,0x80,0x01,0x40,0x02,0x80,0x01,  // 187
+  0x00,0x00,0x10,0x02,0x78,0x01,0xC0,0x00,0x20,0x01,0x90,0x01,0xC8,0x03,0x00,0x01,  // 188
+  0x00,0x00,0x10,0x02,0x78,0x01,0x80,0x00,0x60,0x00,0x50,0x02,0x48,0x03,0xC0,0x02,  // 189
+  0x48,0x00,0x58,0x00,0x68,0x03,0x80,0x00,0x60,0x01,0x90,0x01,0xC8,0x03,0x00,0x01,  // 190
+  0x00,0x00,0x00,0x06,0x00,0x09,0xA0,0x09,0x00,0x04,  // 191
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 192
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02,  // 193
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 194
+  0x00,0x02,0xC2,0x01,0xB1,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02,  // 195
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x88,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 196
+  0x00,0x02,0xC0,0x01,0xBE,0x00,0x8A,0x00,0xBE,0x00,0xC0,0x01,0x00,0x02,  // 197
+  0x00,0x03,0xC0,0x00,0xE0,0x00,0x98,0x00,0x88,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,  // 198
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x16,0x08,0x1A,0x10,0x01,  // 199
+  0x00,0x00,0xF8,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02,  // 200
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x4A,0x02,0x49,0x02,0x48,0x02,  // 201
+  0x00,0x00,0xFA,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02,  // 202
+  0x00,0x00,0xF8,0x03,0x4A,0x02,0x48,0x02,0x4A,0x02,0x48,0x02,  // 203
+  0x00,0x00,0xF9,0x03,0x02, // 204
+  0x02,0x00,0xF9,0x03,  // 205
+  0x01,0x00,0xFA,0x03,  // 206
+  0x02,0x00,0xF8,0x03,0x02, // 207
+  0x40,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x10,0x01,0xE0, // 208
+  0x00,0x00,0xFA,0x03,0x31,0x00,0x42,0x00,0x81,0x01,0xF8,0x03,  // 209
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x09,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01,  // 210
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x08,0x02,0xF0,0x01,  // 211
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x0A,0x02,0xF0,0x01,  // 212
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x09,0x02,0x0A,0x02,0x09,0x02,0xF0,0x01,  // 213
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x08,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01,  // 214
+  0x10,0x01,0xA0,0x00,0xE0,0x00,0xA0,0x00,0x10,0x01,  // 215
+  0x00,0x00,0xF0,0x02,0x08,0x03,0xC8,0x02,0x28,0x02,0x18,0x03,0xE8, // 216
+  0x00,0x00,0xF8,0x01,0x01,0x02,0x02,0x02,0x00,0x02,0xF8,0x01,  // 217
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x00,0x02,0xF8,0x01,  // 218
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x02,0x02,0xF8,0x01,  // 219
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x00,0x02,0x02,0x02,0xF8,0x01,  // 220
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC2,0x03,0x21,0x00,0x10,0x00,0x08, // 221
+  0x00,0x00,0xF8,0x03,0x10,0x01,0x10,0x01,0x10,0x01,0xE0, // 222
+  0x00,0x00,0xF0,0x03,0x08,0x01,0x48,0x02,0xB0,0x02,0x80,0x01,  // 223
+  0x00,0x00,0x00,0x03,0xA4,0x02,0xA8,0x02,0xE0,0x03,  // 224
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE0,0x03,  // 225
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE8,0x03,  // 226
+  0x00,0x00,0x08,0x03,0xA4,0x02,0xA8,0x02,0xE4,0x03,  // 227
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA0,0x02,0xE8,0x03,  // 228
+  0x00,0x00,0x00,0x03,0xAE,0x02,0xAA,0x02,0xEE,0x03,  // 229
+  0x00,0x00,0x40,0x03,0xA0,0x02,0xA0,0x02,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02,  // 230
+  0x00,0x00,0xC0,0x01,0x20,0x16,0x20,0x1A,0x40,0x01,  // 231
+  0x00,0x00,0xC0,0x01,0xA4,0x02,0xA8,0x02,0xC0,0x02,  // 232
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC0,0x02,  // 233
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC8,0x02,  // 234
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA0,0x02,0xC8,0x02,  // 235
+  0x00,0x00,0xE4,0x03,0x08, // 236
+  0x08,0x00,0xE4,0x03,  // 237
+  0x08,0x00,0xE4,0x03,0x08, // 238
+  0x08,0x00,0xE0,0x03,0x08, // 239
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x38,0x02,0xE0,0x01,  // 240
+  0x00,0x00,0xE8,0x03,0x24,0x00,0x28,0x00,0xC4,0x03,  // 241
+  0x00,0x00,0xC0,0x01,0x24,0x02,0x28,0x02,0xC0,0x01,  // 242
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC0,0x01,  // 243
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC8,0x01,  // 244
+  0x00,0x00,0xC8,0x01,0x24,0x02,0x28,0x02,0xC4,0x01,  // 245
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x20,0x02,0xC8,0x01,  // 246
+  0x40,0x00,0x40,0x00,0x50,0x01,0x40,0x00,0x40, // 247
+  0x00,0x00,0xC0,0x02,0xA0,0x03,0x60,0x02,0xA0,0x01,  // 248
+  0x00,0x00,0xE0,0x01,0x04,0x02,0x08,0x02,0xE0,0x03,  // 249
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x04,0x02,0xE0,0x03,  // 250
+  0x00,0x00,0xE8,0x01,0x04,0x02,0x08,0x02,0xE0,0x03,  // 251
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x00,0x02,0xE8,0x03,  // 252
+  0x20,0x00,0xC0,0x09,0x08,0x06,0xC4,0x01,0x20, // 253
+  0x00,0x00,0xF8,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01,  // 254
+  0x20,0x00,0xC8,0x09,0x00,0x06,0xC8,0x01,0x20  // 255
+};
+
+const uint8_t ArialMT_Plain_16[] PROGMEM = {
+  0x10, // Width: 16
+  0x13, // Height: 19
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table:
+  0xFF, 0xFF, 0x00, 0x04,  // 32:65535
+  0x00, 0x00, 0x08, 0x04,  // 33:0
+  0x00, 0x08, 0x0D, 0x06,  // 34:8
+  0x00, 0x15, 0x1A, 0x09,  // 35:21
+  0x00, 0x2F, 0x17, 0x09,  // 36:47
+  0x00, 0x46, 0x26, 0x0E,  // 37:70
+  0x00, 0x6C, 0x1D, 0x0B,  // 38:108
+  0x00, 0x89, 0x04, 0x03,  // 39:137
+  0x00, 0x8D, 0x0C, 0x05,  // 40:141
+  0x00, 0x99, 0x0B, 0x05,  // 41:153
+  0x00, 0xA4, 0x0D, 0x06,  // 42:164
+  0x00, 0xB1, 0x17, 0x09,  // 43:177
+  0x00, 0xC8, 0x09, 0x04,  // 44:200
+  0x00, 0xD1, 0x0B, 0x05,  // 45:209
+  0x00, 0xDC, 0x08, 0x04,  // 46:220
+  0x00, 0xE4, 0x0A, 0x04,  // 47:228
+  0x00, 0xEE, 0x17, 0x09,  // 48:238
+  0x01, 0x05, 0x11, 0x09,  // 49:261
+  0x01, 0x16, 0x17, 0x09,  // 50:278
+  0x01, 0x2D, 0x17, 0x09,  // 51:301
+  0x01, 0x44, 0x17, 0x09,  // 52:324
+  0x01, 0x5B, 0x17, 0x09,  // 53:347
+  0x01, 0x72, 0x17, 0x09,  // 54:370
+  0x01, 0x89, 0x16, 0x09,  // 55:393
+  0x01, 0x9F, 0x17, 0x09,  // 56:415
+  0x01, 0xB6, 0x17, 0x09,  // 57:438
+  0x01, 0xCD, 0x05, 0x04,  // 58:461
+  0x01, 0xD2, 0x06, 0x04,  // 59:466
+  0x01, 0xD8, 0x17, 0x09,  // 60:472
+  0x01, 0xEF, 0x17, 0x09,  // 61:495
+  0x02, 0x06, 0x17, 0x09,  // 62:518
+  0x02, 0x1D, 0x16, 0x09,  // 63:541
+  0x02, 0x33, 0x2F, 0x10,  // 64:563
+  0x02, 0x62, 0x1D, 0x0B,  // 65:610
+  0x02, 0x7F, 0x1D, 0x0B,  // 66:639
+  0x02, 0x9C, 0x20, 0x0C,  // 67:668
+  0x02, 0xBC, 0x20, 0x0C,  // 68:700
+  0x02, 0xDC, 0x1D, 0x0B,  // 69:732
+  0x02, 0xF9, 0x19, 0x0A,  // 70:761
+  0x03, 0x12, 0x20, 0x0C,  // 71:786
+  0x03, 0x32, 0x1D, 0x0C,  // 72:818
+  0x03, 0x4F, 0x05, 0x04,  // 73:847
+  0x03, 0x54, 0x14, 0x08,  // 74:852
+  0x03, 0x68, 0x1D, 0x0B,  // 75:872
+  0x03, 0x85, 0x17, 0x09,  // 76:901
+  0x03, 0x9C, 0x23, 0x0D,  // 77:924
+  0x03, 0xBF, 0x1D, 0x0C,  // 78:959
+  0x03, 0xDC, 0x20, 0x0C,  // 79:988
+  0x03, 0xFC, 0x1C, 0x0B,  // 80:1020
+  0x04, 0x18, 0x20, 0x0C,  // 81:1048
+  0x04, 0x38, 0x1D, 0x0C,  // 82:1080
+  0x04, 0x55, 0x1D, 0x0B,  // 83:1109
+  0x04, 0x72, 0x19, 0x0A,  // 84:1138
+  0x04, 0x8B, 0x1D, 0x0C,  // 85:1163
+  0x04, 0xA8, 0x1C, 0x0B,  // 86:1192
+  0x04, 0xC4, 0x2B, 0x0F,  // 87:1220
+  0x04, 0xEF, 0x20, 0x0B,  // 88:1263
+  0x05, 0x0F, 0x19, 0x0B,  // 89:1295
+  0x05, 0x28, 0x1A, 0x0A,  // 90:1320
+  0x05, 0x42, 0x0C, 0x04,  // 91:1346
+  0x05, 0x4E, 0x0B, 0x04,  // 92:1358
+  0x05, 0x59, 0x09, 0x04,  // 93:1369
+  0x05, 0x62, 0x14, 0x08,  // 94:1378
+  0x05, 0x76, 0x1B, 0x09,  // 95:1398
+  0x05, 0x91, 0x07, 0x05,  // 96:1425
+  0x05, 0x98, 0x17, 0x09,  // 97:1432
+  0x05, 0xAF, 0x17, 0x09,  // 98:1455
+  0x05, 0xC6, 0x14, 0x08,  // 99:1478
+  0x05, 0xDA, 0x17, 0x09,  // 100:1498
+  0x05, 0xF1, 0x17, 0x09,  // 101:1521
+  0x06, 0x08, 0x0A, 0x04,  // 102:1544
+  0x06, 0x12, 0x17, 0x09,  // 103:1554
+  0x06, 0x29, 0x14, 0x09,  // 104:1577
+  0x06, 0x3D, 0x05, 0x04,  // 105:1597
+  0x06, 0x42, 0x06, 0x04,  // 106:1602
+  0x06, 0x48, 0x17, 0x08,  // 107:1608
+  0x06, 0x5F, 0x05, 0x04,  // 108:1631
+  0x06, 0x64, 0x23, 0x0D,  // 109:1636
+  0x06, 0x87, 0x14, 0x09,  // 110:1671
+  0x06, 0x9B, 0x17, 0x09,  // 111:1691
+  0x06, 0xB2, 0x17, 0x09,  // 112:1714
+  0x06, 0xC9, 0x18, 0x09,  // 113:1737
+  0x06, 0xE1, 0x0D, 0x05,  // 114:1761
+  0x06, 0xEE, 0x14, 0x08,  // 115:1774
+  0x07, 0x02, 0x0B, 0x04,  // 116:1794
+  0x07, 0x0D, 0x14, 0x09,  // 117:1805
+  0x07, 0x21, 0x13, 0x08,  // 118:1825
+  0x07, 0x34, 0x1F, 0x0C,  // 119:1844
+  0x07, 0x53, 0x14, 0x08,  // 120:1875
+  0x07, 0x67, 0x13, 0x08,  // 121:1895
+  0x07, 0x7A, 0x14, 0x08,  // 122:1914
+  0x07, 0x8E, 0x0F, 0x05,  // 123:1934
+  0x07, 0x9D, 0x06, 0x04,  // 124:1949
+  0x07, 0xA3, 0x0E, 0x05,  // 125:1955
+  0x07, 0xB1, 0x17, 0x09,  // 126:1969
+  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 128:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 129:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 130:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 131:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 132:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 133:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 134:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 135:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 136:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 137:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 138:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 139:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 140:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 141:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 142:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 143:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 144:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 145:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 146:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 147:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 148:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 149:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 150:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 151:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 152:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 153:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 154:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 155:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 156:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 157:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 158:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 159:65535
+  0xFF, 0xFF, 0x00, 0x04,  // 160:65535
+  0x07, 0xC8, 0x09, 0x05,  // 161:1992
+  0x07, 0xD1, 0x17, 0x09,  // 162:2001
+  0x07, 0xE8, 0x17, 0x09,  // 163:2024
+  0x07, 0xFF, 0x14, 0x09,  // 164:2047
+  0x08, 0x13, 0x1A, 0x09,  // 165:2067
+  0x08, 0x2D, 0x06, 0x04,  // 166:2093
+  0x08, 0x33, 0x17, 0x09,  // 167:2099
+  0x08, 0x4A, 0x07, 0x05,  // 168:2122
+  0x08, 0x51, 0x23, 0x0C,  // 169:2129
+  0x08, 0x74, 0x0E, 0x06,  // 170:2164
+  0x08, 0x82, 0x14, 0x09,  // 171:2178
+  0x08, 0x96, 0x17, 0x09,  // 172:2198
+  0x08, 0xAD, 0x0B, 0x05,  // 173:2221
+  0x08, 0xB8, 0x23, 0x0C,  // 174:2232
+  0x08, 0xDB, 0x19, 0x09,  // 175:2267
+  0x08, 0xF4, 0x0D, 0x06,  // 176:2292
+  0x09, 0x01, 0x17, 0x09,  // 177:2305
+  0x09, 0x18, 0x0E, 0x05,  // 178:2328
+  0x09, 0x26, 0x0D, 0x05,  // 179:2342
+  0x09, 0x33, 0x0A, 0x05,  // 180:2355
+  0x09, 0x3D, 0x17, 0x09,  // 181:2365
+  0x09, 0x54, 0x19, 0x09,  // 182:2388
+  0x09, 0x6D, 0x08, 0x05,  // 183:2413
+  0x09, 0x75, 0x0C, 0x05,  // 184:2421
+  0x09, 0x81, 0x0B, 0x05,  // 185:2433
+  0x09, 0x8C, 0x0D, 0x06,  // 186:2444
+  0x09, 0x99, 0x17, 0x09,  // 187:2457
+  0x09, 0xB0, 0x26, 0x0D,  // 188:2480
+  0x09, 0xD6, 0x26, 0x0D,  // 189:2518
+  0x09, 0xFC, 0x26, 0x0D,  // 190:2556
+  0x0A, 0x22, 0x1A, 0x0A,  // 191:2594
+  0x0A, 0x3C, 0x1D, 0x0B,  // 192:2620
+  0x0A, 0x59, 0x1D, 0x0B,  // 193:2649
+  0x0A, 0x76, 0x1D, 0x0B,  // 194:2678
+  0x0A, 0x93, 0x1D, 0x0B,  // 195:2707
+  0x0A, 0xB0, 0x1D, 0x0B,  // 196:2736
+  0x0A, 0xCD, 0x1D, 0x0B,  // 197:2765
+  0x0A, 0xEA, 0x2C, 0x10,  // 198:2794
+  0x0B, 0x16, 0x20, 0x0C,  // 199:2838
+  0x0B, 0x36, 0x1D, 0x0B,  // 200:2870
+  0x0B, 0x53, 0x1D, 0x0B,  // 201:2899
+  0x0B, 0x70, 0x1D, 0x0B,  // 202:2928
+  0x0B, 0x8D, 0x1D, 0x0B,  // 203:2957
+  0x0B, 0xAA, 0x05, 0x04,  // 204:2986
+  0x0B, 0xAF, 0x07, 0x04,  // 205:2991
+  0x0B, 0xB6, 0x0A, 0x04,  // 206:2998
+  0x0B, 0xC0, 0x07, 0x04,  // 207:3008
+  0x0B, 0xC7, 0x20, 0x0C,  // 208:3015
+  0x0B, 0xE7, 0x1D, 0x0C,  // 209:3047
+  0x0C, 0x04, 0x20, 0x0C,  // 210:3076
+  0x0C, 0x24, 0x20, 0x0C,  // 211:3108
+  0x0C, 0x44, 0x20, 0x0C,  // 212:3140
+  0x0C, 0x64, 0x20, 0x0C,  // 213:3172
+  0x0C, 0x84, 0x20, 0x0C,  // 214:3204
+  0x0C, 0xA4, 0x17, 0x09,  // 215:3236
+  0x0C, 0xBB, 0x20, 0x0C,  // 216:3259
+  0x0C, 0xDB, 0x1D, 0x0C,  // 217:3291
+  0x0C, 0xF8, 0x1D, 0x0C,  // 218:3320
+  0x0D, 0x15, 0x1D, 0x0C,  // 219:3349
+  0x0D, 0x32, 0x1D, 0x0C,  // 220:3378
+  0x0D, 0x4F, 0x19, 0x0B,  // 221:3407
+  0x0D, 0x68, 0x1D, 0x0B,  // 222:3432
+  0x0D, 0x85, 0x17, 0x0A,  // 223:3461
+  0x0D, 0x9C, 0x17, 0x09,  // 224:3484
+  0x0D, 0xB3, 0x17, 0x09,  // 225:3507
+  0x0D, 0xCA, 0x17, 0x09,  // 226:3530
+  0x0D, 0xE1, 0x17, 0x09,  // 227:3553
+  0x0D, 0xF8, 0x17, 0x09,  // 228:3576
+  0x0E, 0x0F, 0x17, 0x09,  // 229:3599
+  0x0E, 0x26, 0x29, 0x0E,  // 230:3622
+  0x0E, 0x4F, 0x14, 0x08,  // 231:3663
+  0x0E, 0x63, 0x17, 0x09,  // 232:3683
+  0x0E, 0x7A, 0x17, 0x09,  // 233:3706
+  0x0E, 0x91, 0x17, 0x09,  // 234:3729
+  0x0E, 0xA8, 0x17, 0x09,  // 235:3752
+  0x0E, 0xBF, 0x05, 0x04,  // 236:3775
+  0x0E, 0xC4, 0x07, 0x04,  // 237:3780
+  0x0E, 0xCB, 0x0A, 0x04,  // 238:3787
+  0x0E, 0xD5, 0x07, 0x04,  // 239:3797
+  0x0E, 0xDC, 0x17, 0x09,  // 240:3804
+  0x0E, 0xF3, 0x14, 0x09,  // 241:3827
+  0x0F, 0x07, 0x17, 0x09,  // 242:3847
+  0x0F, 0x1E, 0x17, 0x09,  // 243:3870
+  0x0F, 0x35, 0x17, 0x09,  // 244:3893
+  0x0F, 0x4C, 0x17, 0x09,  // 245:3916
+  0x0F, 0x63, 0x17, 0x09,  // 246:3939
+  0x0F, 0x7A, 0x17, 0x09,  // 247:3962
+  0x0F, 0x91, 0x17, 0x0A,  // 248:3985
+  0x0F, 0xA8, 0x14, 0x09,  // 249:4008
+  0x0F, 0xBC, 0x14, 0x09,  // 250:4028
+  0x0F, 0xD0, 0x14, 0x09,  // 251:4048
+  0x0F, 0xE4, 0x14, 0x09,  // 252:4068
+  0x0F, 0xF8, 0x13, 0x08,  // 253:4088
+  0x10, 0x0B, 0x17, 0x09,  // 254:4107
+  0x10, 0x22, 0x13, 0x08,  // 255:4130
+
+  // Font Data:
+  0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x5F,  // 33
+  0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78, // 34
+  0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,  // 35
+  0x00,0x00,0x00,0xE0,0x10,0x00,0x10,0x21,0x00,0x08,0x41,0x00,0xFC,0xFF,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 36
+  0x00,0x00,0x00,0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x61,0x00,0xF0,0x18,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x30,0x3C,0x00,0x08,0x42,0x00,0x00,0x42,0x00,0x00,0x42,0x00,0x00,0x3C,  // 37
+  0x00,0x00,0x00,0x00,0x1C,0x00,0x70,0x22,0x00,0x88,0x41,0x00,0x08,0x43,0x00,0x88,0x44,0x00,0x70,0x28,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0x00,0x44, // 38
+  0x00,0x00,0x00,0x78,  // 39
+  0x00,0x00,0x00,0x80,0x3F,0x00,0x70,0xC0,0x01,0x08,0x00,0x02,  // 40
+  0x00,0x00,0x00,0x08,0x00,0x02,0x70,0xC0,0x01,0x80,0x3F, // 41
+  0x10,0x00,0x00,0xD0,0x00,0x00,0x38,0x00,0x00,0xD0,0x00,0x00,0x10, // 42
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0xC0,0x1F,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01, // 44
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,  // 46
+  0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18,  // 47
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xE0,0x1F, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0xF8,0x7F, // 49
+  0x00,0x00,0x00,0x20,0x40,0x00,0x10,0x60,0x00,0x08,0x50,0x00,0x08,0x48,0x00,0x08,0x44,0x00,0x10,0x43,0x00,0xE0,0x40, // 50
+  0x00,0x00,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x88,0x41,0x00,0xF0,0x22,0x00,0x00,0x1C, // 51
+  0x00,0x0C,0x00,0x00,0x0A,0x00,0x00,0x09,0x00,0xC0,0x08,0x00,0x20,0x08,0x00,0x10,0x08,0x00,0xF8,0x7F,0x00,0x00,0x08, // 52
+  0x00,0x00,0x00,0xC0,0x11,0x00,0xB8,0x20,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x08,0x21,0x00,0x08,0x1E, // 53
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x21,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x10,0x21,0x00,0x20,0x1E, // 54
+  0x00,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x78,0x00,0x08,0x07,0x00,0xC8,0x00,0x00,0x28,0x00,0x00,0x18,  // 55
+  0x00,0x00,0x00,0x60,0x1C,0x00,0x90,0x22,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 56
+  0x00,0x00,0x00,0xE0,0x11,0x00,0x10,0x22,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x10,0x22,0x00,0xE0,0x1F, // 57
+  0x00,0x00,0x00,0x40,0x40, // 58
+  0x00,0x00,0x00,0x40,0xC0,0x01,  // 59
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x40,0x10, // 60
+  0x00,0x00,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08, // 61
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x00,0x02, // 62
+  0x00,0x00,0x00,0x60,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x08,0x5C,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0,  // 63
+  0x00,0x00,0x00,0x00,0x3F,0x00,0xC0,0x40,0x00,0x20,0x80,0x00,0x10,0x1E,0x01,0x10,0x21,0x01,0x88,0x40,0x02,0x48,0x40,0x02,0x48,0x40,0x02,0x48,0x20,0x02,0x88,0x7C,0x02,0xC8,0x43,0x02,0x10,0x40,0x02,0x10,0x20,0x01,0x60,0x10,0x01,0x80,0x8F, // 64
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 65
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 66
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,  // 67
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 68
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 69
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08, // 70
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x12,0x00,0x00,0x0E,  // 71
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0xF8,0x7F, // 72
+  0x00,0x00,0x00,0xF8,0x7F, // 73
+  0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0xF8,0x3F,  // 74
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x04,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0x80,0x03,0x00,0x40,0x04,0x00,0x20,0x18,0x00,0x10,0x20,0x00,0x08,0x40, // 75
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 76
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0xF8,0x7F, // 77
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x04,0x00,0x00,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 78
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 79
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0,  // 80
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x50,0x00,0x08,0x50,0x00,0x10,0x20,0x00,0x20,0x70,0x00,0xC0,0x4F,  // 81
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x06,0x00,0x08,0x1A,0x00,0x10,0x21,0x00,0xE0,0x40, // 82
+  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 83
+  0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0x7F,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 84
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 85
+  0x00,0x00,0x00,0x18,0x00,0x00,0xE0,0x00,0x00,0x00,0x07,0x00,0x00,0x18,0x00,0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x07,0x00,0xE0,0x00,0x00,0x18,  // 86
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x03,0x00,0x70,0x00,0x00,0x08,0x00,0x00,0x70,0x00,0x00,0x80,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 87
+  0x00,0x40,0x00,0x08,0x20,0x00,0x10,0x10,0x00,0x60,0x0C,0x00,0x80,0x02,0x00,0x00,0x01,0x00,0x80,0x02,0x00,0x60,0x0C,0x00,0x10,0x10,0x00,0x08,0x20,0x00,0x00,0x40,  // 88
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x00,0x7E,0x00,0x80,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 89
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x88,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40,  // 90
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x08,0x00,0x02,0x08,0x00,0x02,  // 91
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60, // 92
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF8,0xFF,0x03, // 93
+  0x00,0x01,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0x08,0x00,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x01,  // 94
+  0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 95
+  0x00,0x00,0x00,0x08,0x00,0x00,0x10, // 96
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 97
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 98
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,  // 99
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xF8,0x7F, // 100
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 101
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x48,0x00,0x00,0x48,  // 102
+  0x00,0x00,0x00,0x00,0x1F,0x01,0x80,0x20,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x80,0x20,0x01,0xC0,0xFF, // 103
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,  // 104
+  0x00,0x00,0x00,0xC8,0x7F, // 105
+  0x00,0x00,0x02,0xC8,0xFF,0x01,  // 106
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x06,0x00,0x00,0x19,0x00,0x80,0x20,0x00,0x40,0x40, // 107
+  0x00,0x00,0x00,0xF8,0x7F, // 108
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 109
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,  // 110
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 111
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 112
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xC0,0xFF,0x03,  // 113
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40, // 114
+  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x38,  // 115
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x40,0x40,0x00,0x40,0x40, // 116
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 117
+  0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0, // 118
+  0xC0,0x00,0x00,0x00,0x1F,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1F,0x00,0xC0, // 119
+  0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x40,0x40,  // 120
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x00,0xE0,0x01,0x00,0x38,0x00,0x00,0x07,0x00,0xC0, // 121
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x40,0x44,0x00,0x40,0x43,0x00,0xC0,0x40,0x00,0x40,0x40,  // 122
+  0x00,0x04,0x00,0x00,0x04,0x00,0xF0,0xFB,0x01,0x08,0x00,0x02,0x08,0x00,0x02, // 123
+  0x00,0x00,0x00,0xF8,0xFF,0x03,  // 124
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF0,0xFB,0x01,0x00,0x04,0x00,0x00,0x04,  // 125
+  0x00,0x02,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01, // 126
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0xFF,0x03, // 161
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x03,0x40,0xF0,0x00,0x40,0x4E,0x00,0xC0,0x41,0x00,0xB8,0x20,0x00,0x00,0x11, // 162
+  0x00,0x41,0x00,0xE0,0x31,0x00,0x10,0x2F,0x00,0x08,0x21,0x00,0x08,0x21,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x20,0x20, // 163
+  0x00,0x00,0x00,0x40,0x0B,0x00,0x80,0x04,0x00,0x40,0x08,0x00,0x40,0x08,0x00,0x80,0x04,0x00,0x40,0x0B,  // 164
+  0x08,0x0A,0x00,0x10,0x0A,0x00,0x60,0x0A,0x00,0x80,0x0B,0x00,0x00,0x7E,0x00,0x80,0x0B,0x00,0x60,0x0A,0x00,0x10,0x0A,0x00,0x08,0x0A,  // 165
+  0x00,0x00,0x00,0xF8,0xF1,0x03,  // 166
+  0x00,0x86,0x00,0x70,0x09,0x01,0xC8,0x10,0x02,0x88,0x10,0x02,0x08,0x21,0x02,0x08,0x61,0x02,0x30,0xD2,0x01,0x00,0x0C, // 167
+  0x08,0x00,0x00,0x00,0x00,0x00,0x08, // 168
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xC8,0x47,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x48,0x44,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 169
+  0xD0,0x00,0x00,0x48,0x01,0x00,0x28,0x01,0x00,0x28,0x01,0x00,0xF0,0x01,  // 170
+  0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,  // 171
+  0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x0F, // 172
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 173
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xE8,0x4F,0x00,0x28,0x41,0x00,0x28,0x41,0x00,0x28,0x43,0x00,0x28,0x45,0x00,0xC8,0x48,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 174
+  0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04, // 175
+  0x00,0x00,0x00,0x30,0x00,0x00,0x48,0x00,0x00,0x48,0x00,0x00,0x30, // 176
+  0x00,0x00,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0xE0,0x4F,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41, // 177
+  0x10,0x01,0x00,0x88,0x01,0x00,0x48,0x01,0x00,0x48,0x01,0x00,0x30,0x01,  // 178
+  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x28,0x01,0x00,0xD8, // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08,  // 180
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 181
+  0xF0,0x00,0x00,0xF8,0x00,0x00,0xF8,0x01,0x00,0xF8,0x01,0x00,0xF8,0xFF,0x03,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0xFF,0x03,0x08, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,  // 183
+  0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x80,0x02,0x00,0x00,0x03,  // 184
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0xF8,0x01, // 185
+  0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0xF0, // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04, // 187
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x21,0x00,0x00,0x10,0x00,0x00,0x0C,0x00,0x00,0x02,0x00,0x80,0x01,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20,  // 188
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x31,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x60,0x44,0x00,0x10,0x62,0x00,0x08,0x52,0x00,0x00,0x52,0x00,0x00,0x4C,  // 189
+  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x41,0x00,0x28,0x21,0x00,0xD8,0x18,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20,  // 190
+  0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x10,0x01,0x00,0x08,0x02,0x40,0x07,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0xC0,  // 191
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x71,0x04,0x00,0x0A,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 192
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x0A,0x04,0x00,0x71,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 193
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x71,0x04,0x00,0x82,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 194
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x72,0x04,0x00,0x81,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 195
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x08,0x04,0x00,0x72,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 196
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x7E,0x04,0x00,0x0A,0x04,0x00,0x7E,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 197
+  0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x06,0x00,0x80,0x05,0x00,0x60,0x04,0x00,0x18,0x04,0x00,0x08,0x04,0x00,0x08,0x04,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,  // 198
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x02,0x08,0xC0,0x02,0x08,0x40,0x03,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,  // 199
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 200
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 201
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 202
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 203
+  0x01,0x00,0x00,0xFA,0x7F, // 204
+  0x00,0x00,0x00,0xFA,0x7F,0x00,0x01, // 205
+  0x02,0x00,0x00,0xF9,0x7F,0x00,0x01,0x00,0x00,0x02,  // 206
+  0x02,0x00,0x00,0xF8,0x7F,0x00,0x02, // 207
+  0x00,0x02,0x00,0xF8,0x7F,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 208
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x82,0x00,0x00,0x01,0x03,0x00,0x02,0x04,0x00,0x01,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 209
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 210
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 211
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 212
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 213
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 214
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x07,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x40,0x10, // 215
+  0x00,0x00,0x00,0xC0,0x4F,0x00,0x20,0x30,0x00,0x10,0x30,0x00,0x08,0x4C,0x00,0x08,0x42,0x00,0x08,0x41,0x00,0xC8,0x40,0x00,0x30,0x20,0x00,0x30,0x10,0x00,0xC8,0x0F,  // 216
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 217
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 218
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 219
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 220
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x02,0x7E,0x00,0x81,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 221
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x40,0x08,0x00,0x80,0x07, // 222
+  0x00,0x00,0x00,0xE0,0x7F,0x00,0x10,0x00,0x00,0x08,0x20,0x00,0x88,0x43,0x00,0x70,0x42,0x00,0x00,0x44,0x00,0x00,0x38, // 223
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 224
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 225
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x42,0x00,0x50,0x22,0x00,0x80,0x7F, // 226
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x48,0x22,0x00,0x80,0x7F, // 227
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 228
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x5C,0x44,0x00,0x54,0x44,0x00,0x5C,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 229
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x3F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 230
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x02,0x40,0xC0,0x02,0x40,0x40,0x03,0x80,0x20,  // 231
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x48,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 232
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 233
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x44,0x00,0x90,0x24,0x00,0x00,0x17, // 234
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 235
+  0x08,0x00,0x00,0xD0,0x7F, // 236
+  0x00,0x00,0x00,0xD0,0x7F,0x00,0x08, // 237
+  0x10,0x00,0x00,0xC8,0x7F,0x00,0x08,0x00,0x00,0x10,  // 238
+  0x10,0x00,0x00,0xC0,0x7F,0x00,0x10, // 239
+  0x00,0x00,0x00,0x00,0x1F,0x00,0xA0,0x20,0x00,0x68,0x40,0x00,0x58,0x40,0x00,0x70,0x40,0x00,0xE8,0x20,0x00,0x00,0x1F, // 240
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x90,0x00,0x00,0x48,0x00,0x00,0x50,0x00,0x00,0x48,0x00,0x00,0x80,0x7F,  // 241
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 242
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 243
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x48,0x40,0x00,0x90,0x20,0x00,0x00,0x1F, // 244
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x88,0x20,0x00,0x00,0x1F, // 245
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 246
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x80,0x0A,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 247
+  0x00,0x00,0x00,0x00,0x5F,0x00,0x80,0x30,0x00,0x40,0x48,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x80,0x21,0x00,0x40,0x1F, // 248
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 249
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x08,0x20,0x00,0xC0,0x7F,  // 250
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x10,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xC0,0x7F,  // 251
+  0x00,0x00,0x00,0xD0,0x3F,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 252
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x10,0xE0,0x01,0x08,0x38,0x00,0x00,0x07,0x00,0xC0, // 253
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 254
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x10,0x38,0x02,0x00,0xE0,0x01,0x10,0x38,0x00,0x00,0x07,0x00,0xC0  // 255
+};
+const uint8_t ArialMT_Plain_24[] PROGMEM = {
+  0x18, // Width: 24
+  0x1C, // Height: 28
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table:
+  0xFF, 0xFF, 0x00, 0x07,  // 32:65535
+  0x00, 0x00, 0x13, 0x07,  // 33:0
+  0x00, 0x13, 0x1A, 0x09,  // 34:19
+  0x00, 0x2D, 0x33, 0x0D,  // 35:45
+  0x00, 0x60, 0x2F, 0x0D,  // 36:96
+  0x00, 0x8F, 0x4F, 0x15,  // 37:143
+  0x00, 0xDE, 0x3B, 0x10,  // 38:222
+  0x01, 0x19, 0x0A, 0x05,  // 39:281
+  0x01, 0x23, 0x1C, 0x08,  // 40:291
+  0x01, 0x3F, 0x1B, 0x08,  // 41:319
+  0x01, 0x5A, 0x21, 0x09,  // 42:346
+  0x01, 0x7B, 0x32, 0x0E,  // 43:379
+  0x01, 0xAD, 0x10, 0x07,  // 44:429
+  0x01, 0xBD, 0x1B, 0x08,  // 45:445
+  0x01, 0xD8, 0x0F, 0x07,  // 46:472
+  0x01, 0xE7, 0x19, 0x07,  // 47:487
+  0x02, 0x00, 0x2F, 0x0D,  // 48:512
+  0x02, 0x2F, 0x23, 0x0D,  // 49:559
+  0x02, 0x52, 0x2F, 0x0D,  // 50:594
+  0x02, 0x81, 0x2F, 0x0D,  // 51:641
+  0x02, 0xB0, 0x2F, 0x0D,  // 52:688
+  0x02, 0xDF, 0x2F, 0x0D,  // 53:735
+  0x03, 0x0E, 0x2F, 0x0D,  // 54:782
+  0x03, 0x3D, 0x2D, 0x0D,  // 55:829
+  0x03, 0x6A, 0x2F, 0x0D,  // 56:874
+  0x03, 0x99, 0x2F, 0x0D,  // 57:921
+  0x03, 0xC8, 0x0F, 0x07,  // 58:968
+  0x03, 0xD7, 0x10, 0x07,  // 59:983
+  0x03, 0xE7, 0x2F, 0x0E,  // 60:999
+  0x04, 0x16, 0x2F, 0x0E,  // 61:1046
+  0x04, 0x45, 0x2E, 0x0E,  // 62:1093
+  0x04, 0x73, 0x2E, 0x0D,  // 63:1139
+  0x04, 0xA1, 0x5B, 0x18,  // 64:1185
+  0x04, 0xFC, 0x3B, 0x10,  // 65:1276
+  0x05, 0x37, 0x3B, 0x10,  // 66:1335
+  0x05, 0x72, 0x3F, 0x11,  // 67:1394
+  0x05, 0xB1, 0x3F, 0x11,  // 68:1457
+  0x05, 0xF0, 0x3B, 0x10,  // 69:1520
+  0x06, 0x2B, 0x35, 0x0F,  // 70:1579
+  0x06, 0x60, 0x43, 0x13,  // 71:1632
+  0x06, 0xA3, 0x3B, 0x11,  // 72:1699
+  0x06, 0xDE, 0x0F, 0x07,  // 73:1758
+  0x06, 0xED, 0x27, 0x0C,  // 74:1773
+  0x07, 0x14, 0x3F, 0x10,  // 75:1812
+  0x07, 0x53, 0x2F, 0x0D,  // 76:1875
+  0x07, 0x82, 0x43, 0x14,  // 77:1922
+  0x07, 0xC5, 0x3B, 0x11,  // 78:1989
+  0x08, 0x00, 0x47, 0x13,  // 79:2048
+  0x08, 0x47, 0x3A, 0x10,  // 80:2119
+  0x08, 0x81, 0x47, 0x13,  // 81:2177
+  0x08, 0xC8, 0x3F, 0x11,  // 82:2248
+  0x09, 0x07, 0x3B, 0x10,  // 83:2311
+  0x09, 0x42, 0x35, 0x0F,  // 84:2370
+  0x09, 0x77, 0x3B, 0x11,  // 85:2423
+  0x09, 0xB2, 0x39, 0x10,  // 86:2482
+  0x09, 0xEB, 0x59, 0x17,  // 87:2539
+  0x0A, 0x44, 0x3B, 0x10,  // 88:2628
+  0x0A, 0x7F, 0x3D, 0x10,  // 89:2687
+  0x0A, 0xBC, 0x37, 0x0F,  // 90:2748
+  0x0A, 0xF3, 0x14, 0x07,  // 91:2803
+  0x0B, 0x07, 0x1B, 0x07,  // 92:2823
+  0x0B, 0x22, 0x18, 0x07,  // 93:2850
+  0x0B, 0x3A, 0x2A, 0x0B,  // 94:2874
+  0x0B, 0x64, 0x34, 0x0D,  // 95:2916
+  0x0B, 0x98, 0x11, 0x08,  // 96:2968
+  0x0B, 0xA9, 0x2F, 0x0D,  // 97:2985
+  0x0B, 0xD8, 0x33, 0x0D,  // 98:3032
+  0x0C, 0x0B, 0x2B, 0x0C,  // 99:3083
+  0x0C, 0x36, 0x2F, 0x0D,  // 100:3126
+  0x0C, 0x65, 0x2F, 0x0D,  // 101:3173
+  0x0C, 0x94, 0x1A, 0x07,  // 102:3220
+  0x0C, 0xAE, 0x2F, 0x0D,  // 103:3246
+  0x0C, 0xDD, 0x2F, 0x0D,  // 104:3293
+  0x0D, 0x0C, 0x0F, 0x05,  // 105:3340
+  0x0D, 0x1B, 0x10, 0x05,  // 106:3355
+  0x0D, 0x2B, 0x2F, 0x0C,  // 107:3371
+  0x0D, 0x5A, 0x0F, 0x05,  // 108:3418
+  0x0D, 0x69, 0x47, 0x14,  // 109:3433
+  0x0D, 0xB0, 0x2F, 0x0D,  // 110:3504
+  0x0D, 0xDF, 0x2F, 0x0D,  // 111:3551
+  0x0E, 0x0E, 0x33, 0x0D,  // 112:3598
+  0x0E, 0x41, 0x30, 0x0D,  // 113:3649
+  0x0E, 0x71, 0x1E, 0x08,  // 114:3697
+  0x0E, 0x8F, 0x2B, 0x0C,  // 115:3727
+  0x0E, 0xBA, 0x1B, 0x07,  // 116:3770
+  0x0E, 0xD5, 0x2F, 0x0D,  // 117:3797
+  0x0F, 0x04, 0x2A, 0x0C,  // 118:3844
+  0x0F, 0x2E, 0x42, 0x11,  // 119:3886
+  0x0F, 0x70, 0x2B, 0x0C,  // 120:3952
+  0x0F, 0x9B, 0x2A, 0x0C,  // 121:3995
+  0x0F, 0xC5, 0x2B, 0x0C,  // 122:4037
+  0x0F, 0xF0, 0x1C, 0x08,  // 123:4080
+  0x10, 0x0C, 0x10, 0x06,  // 124:4108
+  0x10, 0x1C, 0x1B, 0x08,  // 125:4124
+  0x10, 0x37, 0x32, 0x0E,  // 126:4151
+  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 128:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 129:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 130:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 131:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 132:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 133:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 134:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 135:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 136:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 137:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 138:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 139:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 140:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 141:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 142:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 143:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 144:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 145:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 146:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 147:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 148:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 149:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 150:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 151:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 152:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 153:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 154:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 155:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 156:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 157:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 158:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 159:65535
+  0xFF, 0xFF, 0x00, 0x07,  // 160:65535
+  0x10, 0x69, 0x14, 0x08,  // 161:4201
+  0x10, 0x7D, 0x2B, 0x0D,  // 162:4221
+  0x10, 0xA8, 0x2F, 0x0D,  // 163:4264
+  0x10, 0xD7, 0x33, 0x0D,  // 164:4311
+  0x11, 0x0A, 0x31, 0x0D,  // 165:4362
+  0x11, 0x3B, 0x10, 0x06,  // 166:4411
+  0x11, 0x4B, 0x2F, 0x0D,  // 167:4427
+  0x11, 0x7A, 0x19, 0x08,  // 168:4474
+  0x11, 0x93, 0x46, 0x12,  // 169:4499
+  0x11, 0xD9, 0x1A, 0x09,  // 170:4569
+  0x11, 0xF3, 0x27, 0x0D,  // 171:4595
+  0x12, 0x1A, 0x2F, 0x0E,  // 172:4634
+  0x12, 0x49, 0x1B, 0x08,  // 173:4681
+  0x12, 0x64, 0x46, 0x12,  // 174:4708
+  0x12, 0xAA, 0x31, 0x0D,  // 175:4778
+  0x12, 0xDB, 0x1E, 0x0A,  // 176:4827
+  0x12, 0xF9, 0x33, 0x0D,  // 177:4857
+  0x13, 0x2C, 0x1A, 0x08,  // 178:4908
+  0x13, 0x46, 0x1A, 0x08,  // 179:4934
+  0x13, 0x60, 0x19, 0x08,  // 180:4960
+  0x13, 0x79, 0x2F, 0x0E,  // 181:4985
+  0x13, 0xA8, 0x31, 0x0D,  // 182:5032
+  0x13, 0xD9, 0x12, 0x08,  // 183:5081
+  0x13, 0xEB, 0x18, 0x08,  // 184:5099
+  0x14, 0x03, 0x16, 0x08,  // 185:5123
+  0x14, 0x19, 0x1E, 0x09,  // 186:5145
+  0x14, 0x37, 0x2E, 0x0D,  // 187:5175
+  0x14, 0x65, 0x4F, 0x14,  // 188:5221
+  0x14, 0xB4, 0x4B, 0x14,  // 189:5300
+  0x14, 0xFF, 0x4B, 0x14,  // 190:5375
+  0x15, 0x4A, 0x33, 0x0F,  // 191:5450
+  0x15, 0x7D, 0x3B, 0x10,  // 192:5501
+  0x15, 0xB8, 0x3B, 0x10,  // 193:5560
+  0x15, 0xF3, 0x3B, 0x10,  // 194:5619
+  0x16, 0x2E, 0x3B, 0x10,  // 195:5678
+  0x16, 0x69, 0x3B, 0x10,  // 196:5737
+  0x16, 0xA4, 0x3B, 0x10,  // 197:5796
+  0x16, 0xDF, 0x5B, 0x18,  // 198:5855
+  0x17, 0x3A, 0x3F, 0x11,  // 199:5946
+  0x17, 0x79, 0x3B, 0x10,  // 200:6009
+  0x17, 0xB4, 0x3B, 0x10,  // 201:6068
+  0x17, 0xEF, 0x3B, 0x10,  // 202:6127
+  0x18, 0x2A, 0x3B, 0x10,  // 203:6186
+  0x18, 0x65, 0x11, 0x07,  // 204:6245
+  0x18, 0x76, 0x11, 0x07,  // 205:6262
+  0x18, 0x87, 0x15, 0x07,  // 206:6279
+  0x18, 0x9C, 0x15, 0x07,  // 207:6300
+  0x18, 0xB1, 0x3F, 0x11,  // 208:6321
+  0x18, 0xF0, 0x3B, 0x11,  // 209:6384
+  0x19, 0x2B, 0x47, 0x13,  // 210:6443
+  0x19, 0x72, 0x47, 0x13,  // 211:6514
+  0x19, 0xB9, 0x47, 0x13,  // 212:6585
+  0x1A, 0x00, 0x47, 0x13,  // 213:6656
+  0x1A, 0x47, 0x47, 0x13,  // 214:6727
+  0x1A, 0x8E, 0x2B, 0x0E,  // 215:6798
+  0x1A, 0xB9, 0x47, 0x13,  // 216:6841
+  0x1B, 0x00, 0x3B, 0x11,  // 217:6912
+  0x1B, 0x3B, 0x3B, 0x11,  // 218:6971
+  0x1B, 0x76, 0x3B, 0x11,  // 219:7030
+  0x1B, 0xB1, 0x3B, 0x11,  // 220:7089
+  0x1B, 0xEC, 0x3D, 0x10,  // 221:7148
+  0x1C, 0x29, 0x3A, 0x10,  // 222:7209
+  0x1C, 0x63, 0x37, 0x0F,  // 223:7267
+  0x1C, 0x9A, 0x2F, 0x0D,  // 224:7322
+  0x1C, 0xC9, 0x2F, 0x0D,  // 225:7369
+  0x1C, 0xF8, 0x2F, 0x0D,  // 226:7416
+  0x1D, 0x27, 0x2F, 0x0D,  // 227:7463
+  0x1D, 0x56, 0x2F, 0x0D,  // 228:7510
+  0x1D, 0x85, 0x2F, 0x0D,  // 229:7557
+  0x1D, 0xB4, 0x53, 0x15,  // 230:7604
+  0x1E, 0x07, 0x2B, 0x0C,  // 231:7687
+  0x1E, 0x32, 0x2F, 0x0D,  // 232:7730
+  0x1E, 0x61, 0x2F, 0x0D,  // 233:7777
+  0x1E, 0x90, 0x2F, 0x0D,  // 234:7824
+  0x1E, 0xBF, 0x2F, 0x0D,  // 235:7871
+  0x1E, 0xEE, 0x11, 0x07,  // 236:7918
+  0x1E, 0xFF, 0x11, 0x07,  // 237:7935
+  0x1F, 0x10, 0x15, 0x07,  // 238:7952
+  0x1F, 0x25, 0x15, 0x07,  // 239:7973
+  0x1F, 0x3A, 0x2F, 0x0D,  // 240:7994
+  0x1F, 0x69, 0x2F, 0x0D,  // 241:8041
+  0x1F, 0x98, 0x2F, 0x0D,  // 242:8088
+  0x1F, 0xC7, 0x2F, 0x0D,  // 243:8135
+  0x1F, 0xF6, 0x2F, 0x0D,  // 244:8182
+  0x20, 0x25, 0x2F, 0x0D,  // 245:8229
+  0x20, 0x54, 0x2F, 0x0D,  // 246:8276
+  0x20, 0x83, 0x32, 0x0D,  // 247:8323
+  0x20, 0xB5, 0x33, 0x0F,  // 248:8373
+  0x20, 0xE8, 0x2F, 0x0D,  // 249:8424
+  0x21, 0x17, 0x2F, 0x0D,  // 250:8471
+  0x21, 0x46, 0x2F, 0x0D,  // 251:8518
+  0x21, 0x75, 0x2F, 0x0D,  // 252:8565
+  0x21, 0xA4, 0x2A, 0x0C,  // 253:8612
+  0x21, 0xCE, 0x2F, 0x0D,  // 254:8654
+  0x21, 0xFD, 0x2A, 0x0C,  // 255:8701
+
+  // Font Data:
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x33,0x00,0xE0,0xFF,0x33, // 33
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,  // 34
+  0x00,0x0C,0x03,0x00,0x00,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x03,0x00,0x00,0x0C,0x03, // 35
+  0x00,0x00,0x00,0x00,0x80,0x07,0x06,0x00,0xC0,0x0F,0x1E,0x00,0xC0,0x18,0x1C,0x00,0x60,0x18,0x38,0x00,0x60,0x30,0x30,0x00,0xF0,0xFF,0xFF,0x00,0x60,0x30,0x30,0x00,0x60,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0xC1,0x1F,0x00,0x00,0x81,0x07, // 36
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x00,0x60,0x30,0x38,0x00,0xC0,0x1F,0x1E,0x00,0x80,0x8F,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x8F,0x0F,0x00,0xC0,0xC3,0x1F,0x00,0xE0,0x60,0x30,0x00,0x20,0x20,0x20,0x00,0x00,0x20,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 37
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0xC0,0x0F,0x00,0x80,0xE3,0x1C,0x00,0xC0,0x77,0x38,0x00,0xE0,0x3C,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x78,0x30,0x00,0xE0,0xEC,0x38,0x00,0xC0,0x8F,0x1B,0x00,0x80,0x03,0x1F,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xC0,0x38,0x00,0x00,0x00,0x10, // 38
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,  // 39
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x0F,0x00,0x00,0xFE,0x7F,0x00,0x80,0x0F,0xF0,0x01,0xC0,0x01,0x80,0x03,0x60,0x00,0x00,0x06,0x20,0x00,0x00,0x04,  // 40
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x04,0x60,0x00,0x00,0x06,0xC0,0x01,0x80,0x03,0x80,0x0F,0xF0,0x01,0x00,0xFE,0x7F,0x00,0x00,0xF0,0x0F, // 41
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x04,0x00,0x00,0x80,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x80,0x04,0x00,0x00,0x80, // 42
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xFF,0x0F,0x00,0x00,0xFF,0x0F,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,  // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x03,0x00,0x00,0xF0,0x01,  // 44
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 46
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x3F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60, // 47
+  0x00,0x00,0x00,0x00,0x00,0xFE,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x01,0x1C,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x03, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 49
+  0x00,0x00,0x00,0x00,0x00,0x03,0x30,0x00,0xC0,0x03,0x38,0x00,0xC0,0x00,0x3C,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x33,0x00,0x60,0x80,0x31,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x30,0x00,0xC0,0x30,0x30,0x00,0xC0,0x1F,0x30,0x00,0x00,0x0F,0x30, // 50
+  0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x00,0xC0,0x01,0x0E,0x00,0xC0,0x00,0x1C,0x00,0x60,0x00,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x0F,0x00,0x00,0x80,0x07, // 51
+  0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x03,0x00,0x00,0x3C,0x03,0x00,0x00,0x0E,0x03,0x00,0x80,0x07,0x03,0x00,0xC0,0x01,0x03,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x03, // 52
+  0x00,0x00,0x00,0x00,0x00,0x30,0x06,0x00,0x80,0x3F,0x0E,0x00,0xE0,0x1F,0x18,0x00,0x60,0x08,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x18,0x1C,0x00,0x60,0xF0,0x0F,0x00,0x00,0xE0,0x03, // 53
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x63,0x1C,0x00,0xC0,0x30,0x38,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0xE0,0x30,0x18,0x00,0xC0,0xF1,0x0F,0x00,0x80,0xC1,0x07, // 54
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x3C,0x00,0x60,0x80,0x3F,0x00,0x60,0xE0,0x03,0x00,0x60,0x78,0x00,0x00,0x60,0x0E,0x00,0x00,0x60,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60, // 55
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x80,0xC7,0x1F,0x00,0xC0,0x6F,0x18,0x00,0xE0,0x38,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xE0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 56
+  0x00,0x00,0x00,0x00,0x00,0x1F,0x0C,0x00,0x80,0x7F,0x1C,0x00,0xC0,0x61,0x38,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x18,0x00,0xC0,0x31,0x1E,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x01, // 57
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 58
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x03,0x00,0x06,0xF0,0x01,  // 59
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x04,0x01,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x03,0x06, // 60
+  0x00,0x00,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01, // 61
+  0x00,0x00,0x00,0x00,0x00,0x03,0x06,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x04,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x20,  // 62
+  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x33,0x00,0x60,0xE0,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x00,0x07,  // 63
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x0F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x1E,0xF0,0x00,0x00,0x07,0xC0,0x01,0x80,0xC3,0x87,0x01,0xC0,0xF1,0x9F,0x03,0xC0,0x38,0x18,0x03,0xC0,0x0C,0x30,0x03,0x60,0x0E,0x30,0x06,0x60,0x06,0x30,0x06,0x60,0x06,0x18,0x06,0x60,0x06,0x0C,0x06,0x60,0x0C,0x1E,0x06,0x60,0xF8,0x3F,0x06,0xE0,0xFE,0x31,0x06,0xC0,0x0E,0x30,0x06,0xC0,0x01,0x18,0x03,0x80,0x03,0x1C,0x03,0x00,0x07,0x8F,0x01,0x00,0xFE,0x87,0x01,0x00,0xF8,0xC1,0x00,0x00,0x00,0x40, // 64
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 65
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x78,0x30,0x00,0xC0,0xFF,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 66
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 67
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 68
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 69
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60, // 70
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x60,0x30,0x00,0x60,0x60,0x30,0x00,0xE0,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0x61,0x18,0x00,0x80,0xE3,0x0F,0x00,0x00,0xE2,0x0F, // 71
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 72
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 73
+  0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0xE0,0xFF,0x1F,0x00,0xE0,0xFF,0x0F, // 74
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE7,0x01,0x00,0x80,0x83,0x07,0x00,0xC0,0x01,0x0F,0x00,0xE0,0x00,0x1E,0x00,0x60,0x00,0x38,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 75
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 76
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x07,0x00,0x00,0xFE,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 77
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 78
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 79
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0xC0,0x30,0x00,0x00,0xC0,0x3F,0x00,0x00,0x00,0x0F,  // 80
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x0C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x36,0x00,0xE0,0x00,0x3C,0x00,0xC0,0x00,0x1C,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x3F,0x00,0x00,0xFF,0x77,0x00,0x00,0xFC,0x61, // 81
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x70,0x00,0x00,0x60,0xF0,0x00,0x00,0x60,0xF0,0x03,0x00,0x60,0xB0,0x07,0x00,0xE0,0x18,0x1F,0x00,0xC0,0x1F,0x3C,0x00,0x80,0x0F,0x30,0x00,0x00,0x00,0x20, // 82
+  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x70,0x30,0x00,0xC0,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 83
+  0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 84
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 85
+  0x20,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xF8,0x01,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0x20, // 86
+  0x60,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x80,0xFF,0x00,0x00,0x00,0xF8,0x0F,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x80,0x3F,0x00,0x00,0xF8,0x0F,0x00,0x80,0xFF,0x00,0x00,0xE0,0x07,0x00,0x00,0x60, // 87
+  0x00,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x60,0x00,0x3C,0x00,0xE0,0x01,0x1E,0x00,0xC0,0x83,0x07,0x00,0x00,0xCF,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0x38,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0xCF,0x03,0x00,0xC0,0x03,0x07,0x00,0xE0,0x01,0x1E,0x00,0x60,0x00,0x3C,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 88
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x3C,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 89
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 90
+  0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,  // 91
+  0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 92
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,  // 93
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xE0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x20,  // 94
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,  // 95
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x80, // 96
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 97
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 98
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 99
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 100
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 101
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x60,0x06,  // 102
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x83,0x01,0x00,0xF8,0x8F,0x03,0x00,0x1C,0x1C,0x07,0x00,0x0E,0x38,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x0C,0x18,0x07,0x00,0x18,0x8C,0x03,0x00,0xFE,0xFF,0x01,0x00,0xFE,0xFF, // 103
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 104
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F, // 105
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x60,0xFE,0xFF,0x07,0x60,0xFE,0xFF,0x03,  // 106
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xF0,0x01,0x00,0x00,0x98,0x07,0x00,0x00,0x0C,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x02,0x30,0x00,0x00,0x00,0x20, // 107
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 108
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 109
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 110
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 111
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 112
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,  // 113
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,  // 114
+  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x31,0x00,0x00,0xC6,0x31,0x00,0x00,0x8E,0x39,0x00,0x00,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 115
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 116
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 117
+  0x00,0x06,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xF8,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 118
+  0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x7C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xF0,0x03,0x00,0x00,0x7E,0x00,0x00,0x00,0x0E,  // 119
+  0x00,0x02,0x20,0x00,0x00,0x06,0x30,0x00,0x00,0x1E,0x3C,0x00,0x00,0x38,0x0E,0x00,0x00,0xF0,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x07,0x00,0x00,0x38,0x0E,0x00,0x00,0x1C,0x3C,0x00,0x00,0x0E,0x30,0x00,0x00,0x02,0x20, // 120
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0x00,0xC0,0x1F,0x00,0x00,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 121
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x00,0xE6,0x30,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 122
+  0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x03,0x00,0xC0,0x7F,0xFE,0x03,0xE0,0x3F,0xFC,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,  // 123
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x0F,0xE0,0xFF,0xFF,0x0F,  // 124
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0x3F,0xFC,0x07,0xC0,0x7F,0xFF,0x03,0x00,0xC0,0x03,0x00,0x00,0x80,0x01, // 125
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,  // 126
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE6,0xFF,0x07,0x00,0xE6,0xFF,0x07,  // 161
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x9C,0x07,0x00,0x0E,0x78,0x00,0x00,0x06,0x3F,0x00,0x00,0xF6,0x30,0x00,0x00,0x0E,0x30,0x00,0xE0,0x0D,0x1C,0x00,0x00,0x1C,0x0E,0x00,0x00,0x10,0x06, // 162
+  0x00,0x60,0x10,0x00,0x00,0x60,0x38,0x00,0x00,0x7F,0x1C,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xE0,0x19,0x00,0x60,0x60,0x18,0x00,0x60,0x60,0x18,0x00,0x60,0x60,0x30,0x00,0xE0,0x00,0x30,0x00,0xC0,0x01,0x30,0x00,0x80,0x01,0x38,0x00,0x00,0x00,0x10, // 163
+  0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x00,0x00,0xF7,0x0E,0x00,0x00,0xFE,0x07,0x00,0x00,0x0C,0x03,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x0C,0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xF7,0x0E,0x00,0x00,0x02,0x04, // 164
+  0xE0,0x60,0x06,0x00,0xC0,0x61,0x06,0x00,0x80,0x67,0x06,0x00,0x00,0x7E,0x06,0x00,0x00,0x7C,0x06,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x7C,0x06,0x00,0x00,0x7E,0x06,0x00,0x80,0x67,0x06,0x00,0xC0,0x61,0x06,0x00,0xE0,0x60,0x06,0x00,0x20, // 165
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x7F,0xF8,0x0F,0xE0,0x7F,0xF8,0x0F,  // 166
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0xF3,0xC1,0x00,0xC0,0x1F,0xC3,0x03,0xE0,0x0C,0x07,0x03,0x60,0x1C,0x06,0x06,0x60,0x18,0x0C,0x06,0x60,0x30,0x1C,0x06,0xE0,0x70,0x38,0x07,0xC0,0xE1,0xF4,0x03,0x80,0xC1,0xE7,0x01,0x00,0x80,0x03, // 167
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 168
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x79,0x1C,0x00,0xC0,0xFE,0x19,0x00,0x60,0x86,0x31,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x87,0x33,0x00,0xC0,0x86,0x19,0x00,0xC0,0x85,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8,  // 169
+  0x00,0x00,0x00,0x00,0xC0,0x1C,0x00,0x00,0xE0,0x3E,0x00,0x00,0x60,0x32,0x00,0x00,0x60,0x32,0x00,0x00,0xE0,0x3F,0x00,0x00,0xC0,0x3F,  // 170
+  0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x84,0x10,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x04,0x10, // 171
+  0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFC,0x01, // 172
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 173
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x01,0x1C,0x00,0xC0,0xFE,0x1B,0x00,0x60,0xFE,0x33,0x00,0x60,0x66,0x30,0x00,0x60,0x66,0x30,0x00,0x60,0xE6,0x30,0x00,0x60,0xFE,0x31,0x00,0x60,0x3C,0x33,0x00,0xC0,0x00,0x1A,0x00,0xC0,0x01,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8,  // 174
+  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C, // 175
+  0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x40,0x04,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x40,0x04,0x00,0x00,0x80,0x03,  // 176
+  0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0xFF,0x3F,0x00,0x00,0xFF,0x3F,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30, // 177
+  0x40,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x38,0x00,0x00,0x20,0x2C,0x00,0x00,0x20,0x26,0x00,0x00,0xE0,0x23,0x00,0x00,0xC0,0x21,  // 178
+  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x00,0x00,0x20,0x22,0x00,0x00,0xE0,0x3D,0x00,0x00,0xC0,0x1D,  // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 180
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x00,0x1C,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x1C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 181
+  0x00,0x0F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,  // 183
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0xC0,0x02,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,  // 184
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,  // 185
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xE0,0x38,0x00,0x00,0x60,0x30,0x00,0x00,0xE0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F,  // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x84,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,  // 187
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x38,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x0C,0x00,0xC0,0x01,0x0E,0x00,0xE0,0x80,0x0B,0x00,0x60,0xC0,0x08,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,0x00,0x00,0x00,0x08, // 188
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x30,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x4E,0x20,0x00,0x00,0x67,0x30,0x00,0xC0,0x21,0x38,0x00,0xE0,0x20,0x2C,0x00,0x60,0x20,0x26,0x00,0x00,0xE0,0x27,0x00,0x00,0xC0,0x21, // 189
+  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x20,0x00,0x20,0x22,0x30,0x00,0xE0,0x3D,0x38,0x00,0xC0,0x1D,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x0E,0x0C,0x00,0x00,0x07,0x0E,0x00,0x80,0x83,0x0B,0x00,0xE0,0xC0,0x08,0x00,0x60,0xE0,0x3F,0x00,0x20,0xE0,0x3F,0x00,0x00,0x00,0x08, // 190
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0xF8,0x03,0x00,0x00,0x1E,0x03,0x00,0x00,0x07,0x07,0x00,0xE6,0x03,0x06,0x00,0xE6,0x01,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xC0, // 191
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x82,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE8,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 192
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE8,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x82,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 193
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x88,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x08,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 194
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x0C,0xFE,0x01,0x00,0x8E,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xEC,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0E,0xFE,0x01,0x00,0x06,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 195
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x8C,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0C,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 196
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x9C,0x8F,0x01,0x00,0xE2,0x83,0x01,0x00,0x62,0x80,0x01,0x00,0xE2,0x83,0x01,0x00,0x9C,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 197
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x01,0x00,0x00,0xBC,0x01,0x00,0x00,0x8F,0x01,0x00,0xC0,0x83,0x01,0x00,0xE0,0x80,0x01,0x00,0x60,0x80,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 198
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x02,0x60,0x00,0x30,0x02,0x60,0x00,0xF0,0x02,0x60,0x00,0xB0,0x03,0x60,0x00,0x30,0x01,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 199
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 200
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 201
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 202
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 203
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xEE,0xFF,0x3F,0x00,0x08, // 204
+  0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0xEE,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x02, // 205
+  0x08,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x08, // 206
+  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x0C, // 207
+  0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 208
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x8C,0x03,0x00,0x00,0x0E,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x70,0x00,0x00,0x0C,0xE0,0x01,0x00,0x0C,0x80,0x03,0x00,0x0E,0x00,0x0F,0x00,0x06,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 209
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x62,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 210
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 211
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x68,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xE8,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 212
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xCC,0x00,0x18,0x00,0xEE,0x00,0x38,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0xE6,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 213
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xEC,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 214
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x03,0x00,0x00,0x8E,0x03,0x00,0x00,0xDC,0x01,0x00,0x00,0xF8,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xDC,0x01,0x00,0x00,0x8E,0x03,0x00,0x00,0x06,0x03, // 215
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x21,0x00,0x00,0xFF,0x77,0x00,0x80,0x07,0x3F,0x00,0xC0,0x01,0x1E,0x00,0xC0,0x00,0x1F,0x00,0xE0,0x80,0x3B,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x70,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0xE0,0x0E,0x38,0x00,0xC0,0x07,0x18,0x00,0xC0,0x03,0x1C,0x00,0xE0,0x07,0x0F,0x00,0x70,0xFF,0x07,0x00,0x20,0xFC,0x01, // 216
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x02,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 217
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x02,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 218
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x08,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x08,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 219
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 220
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0xF0,0x3F,0x00,0x0E,0xF0,0x3F,0x00,0x06,0x3C,0x00,0x00,0x02,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 221
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x07,0x00,0x00,0x86,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0xF8,  // 222
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x3F,0x00,0xC0,0xFF,0x3F,0x00,0xC0,0x00,0x00,0x00,0x60,0x00,0x08,0x00,0x60,0x00,0x1C,0x00,0x60,0x00,0x38,0x00,0xE0,0x78,0x30,0x00,0xC0,0x7F,0x30,0x00,0x80,0xC7,0x30,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x0F, // 223
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x20,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 224
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x80,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x18,0x00,0x20,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 225
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x80,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0x60,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0x80,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 226
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0xC0,0x1C,0x1F,0x00,0xE0,0x8C,0x39,0x00,0x60,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xC0,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xE0,0xCE,0x0C,0x00,0x60,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 227
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0xC0,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xC0,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 228
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x70,0x86,0x31,0x00,0x88,0x86,0x31,0x00,0x88,0xC6,0x30,0x00,0x88,0xC6,0x18,0x00,0x70,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 229
+  0x00,0x00,0x00,0x00,0x00,0x10,0x0F,0x00,0x00,0x9C,0x1F,0x00,0x00,0xCC,0x39,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0x66,0x18,0x00,0x00,0x6E,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xFC,0x1F,0x00,0x00,0xCC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xE0,0x04, // 230
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x02,0x00,0x06,0x30,0x02,0x00,0x06,0xF0,0x02,0x00,0x06,0xB0,0x03,0x00,0x0E,0x38,0x01,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 231
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x20,0xCE,0x38,0x00,0x60,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 232
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x80,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x20,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 233
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x80,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0x80,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 234
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 235
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0xE0,0xFE,0x3F,0x00,0x80, // 236
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0x20, // 237
+  0x80,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0x80, // 238
+  0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0xC0, // 239
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1D,0x1C,0x00,0xA0,0x0F,0x38,0x00,0xA0,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0F,0x38,0x00,0x20,0x1F,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xE0,0x07, // 240
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0xC0,0xFE,0x3F,0x00,0xE0,0x18,0x00,0x00,0x60,0x0C,0x00,0x00,0x60,0x06,0x00,0x00,0xC0,0x06,0x00,0x00,0xC0,0x06,0x00,0x00,0xE0,0x0E,0x00,0x00,0x60,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 241
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x20,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 242
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x20,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 243
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x80,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0x80,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 244
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0xC0,0x1C,0x1C,0x00,0xE0,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xE0,0x1C,0x1C,0x00,0x60,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 245
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 246
+  0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0xB6,0x01,0x00,0x00,0xB6,0x01,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,  // 247
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x67,0x00,0x00,0xF8,0x7F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x3F,0x00,0x00,0x86,0x33,0x00,0x00,0xE6,0x31,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xFF,0x0F,0x00,0x00,0xF3,0x07, // 248
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x20,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 249
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x18,0x00,0x20,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 250
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x80,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0x80,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 251
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0xC0,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 252
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x80,0x00,0xFE,0x03,0xE0,0x00,0xFC,0x00,0x60,0xC0,0x1F,0x00,0x20,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 253
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x00,0x1C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x03, // 254
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0xC0,0xF0,0x01,0x06,0xC0,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0xC0,0xC0,0x1F,0x00,0xC0,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06 // 255
+};
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp
new file mode 100644
index 00000000..6fcfafbf
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp
@@ -0,0 +1,468 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ * Copyright (c) 2019 by Helmut Tschemernjak - www.radioshuttle.de
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#include "OLEDDisplayUi.h"
+
+void LoadingDrawDefault(OLEDDisplay *display, LoadingStage* stage, uint8_t progress) {
+      display->setTextAlignment(TEXT_ALIGN_CENTER);
+      display->setFont(ArialMT_Plain_10);
+      display->drawString(64, 18, stage->process);
+      display->drawProgressBar(4, 32, 120, 8, progress);
+};
+
+
+OLEDDisplayUi::OLEDDisplayUi(OLEDDisplay *display) {
+  this->display = display;
+	
+  indicatorPosition = BOTTOM;
+  indicatorDirection = LEFT_RIGHT;
+  activeSymbol = ANIMATION_activeSymbol;
+  inactiveSymbol = ANIMATION_inactiveSymbol;
+  frameAnimationDirection   = SLIDE_RIGHT;
+  lastTransitionDirection = 1;
+  frameCount = 0;
+  nextFrameNumber = -1;
+  overlayCount = 0;
+  indicatorDrawState = 1;
+  loadingDrawFunction = LoadingDrawDefault;
+  updateInterval = 33;
+  state.lastUpdate = 0;
+  state.ticksSinceLastStateSwitch = 0;
+  state.frameState = FIXED;
+  state.currentFrame = 0;
+  state.frameTransitionDirection = 1;
+  state.isIndicatorDrawen = true;
+  state.manuelControll = false;
+  state.userData = NULL;
+  shouldDrawIndicators = true;
+  autoTransition = true;
+  setTimePerFrame(5000);
+  setTimePerTransition(500);
+}
+
+void OLEDDisplayUi::init() {
+  this->display->init();
+}
+
+void OLEDDisplayUi::setTargetFPS(uint8_t fps){
+  this->updateInterval = ((float) 1.0 / (float) fps) * 1000;
+
+  this->ticksPerFrame = timePerFrame / updateInterval;
+  this->ticksPerTransition = timePerTransition / updateInterval;
+}
+
+// -/------ Automatic controll ------\-
+
+void OLEDDisplayUi::enableAutoTransition(){
+  this->autoTransition = true;
+}
+void OLEDDisplayUi::disableAutoTransition(){
+  this->autoTransition = false;
+}
+void OLEDDisplayUi::setAutoTransitionForwards(){
+  this->state.frameTransitionDirection = 1;
+  this->lastTransitionDirection = 1;
+}
+void OLEDDisplayUi::setAutoTransitionBackwards(){
+  this->state.frameTransitionDirection = -1;
+  this->lastTransitionDirection = -1;
+}
+void OLEDDisplayUi::setTimePerFrame(uint16_t time){
+  this->timePerFrame = time;
+  this->ticksPerFrame = timePerFrame / updateInterval;
+}
+void OLEDDisplayUi::setTimePerTransition(uint16_t time){
+  this->timePerTransition = time;
+  this->ticksPerTransition = timePerTransition / updateInterval;
+}
+
+// -/------ Customize indicator position and style -------\-
+void OLEDDisplayUi::enableIndicator(){
+  this->state.isIndicatorDrawen = true;
+}
+
+void OLEDDisplayUi::disableIndicator(){
+  this->state.isIndicatorDrawen = false;
+}
+
+void OLEDDisplayUi::enableAllIndicators(){
+  this->shouldDrawIndicators = true;
+}
+
+void OLEDDisplayUi::disableAllIndicators(){
+  this->shouldDrawIndicators = false;
+}
+
+void OLEDDisplayUi::setIndicatorPosition(IndicatorPosition pos) {
+  this->indicatorPosition = pos;
+}
+void OLEDDisplayUi::setIndicatorDirection(IndicatorDirection dir) {
+  this->indicatorDirection = dir;
+}
+void OLEDDisplayUi::setActiveSymbol(const uint8_t* symbol) {
+  this->activeSymbol = symbol;
+}
+void OLEDDisplayUi::setInactiveSymbol(const uint8_t* symbol) {
+  this->inactiveSymbol = symbol;
+}
+
+
+// -/----- Frame settings -----\-
+void OLEDDisplayUi::setFrameAnimation(AnimationDirection dir) {
+  this->frameAnimationDirection = dir;
+}
+void OLEDDisplayUi::setFrames(FrameCallback* frameFunctions, uint8_t frameCount) {
+  this->frameFunctions = frameFunctions;
+  this->frameCount     = frameCount;
+  this->resetState();
+}
+
+// -/----- Overlays ------\-
+void OLEDDisplayUi::setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount){
+  this->overlayFunctions = overlayFunctions;
+  this->overlayCount     = overlayCount;
+}
+
+// -/----- Loading Process -----\-
+
+void OLEDDisplayUi::setLoadingDrawFunction(LoadingDrawFunction loadingDrawFunction) {
+  this->loadingDrawFunction = loadingDrawFunction;
+}
+
+void OLEDDisplayUi::runLoadingProcess(LoadingStage* stages, uint8_t stagesCount) {
+  uint8_t progress = 0;
+  uint8_t increment = 100 / stagesCount;
+
+  for (uint8_t i = 0; i < stagesCount; i++) {
+    display->clear();
+    this->loadingDrawFunction(this->display, &stages[i], progress);
+    display->display();
+
+    stages[i].callback();
+
+    progress += increment;
+    yield();
+  }
+
+  display->clear();
+  this->loadingDrawFunction(this->display, &stages[stagesCount-1], progress);
+  display->display();
+
+  delay(150);
+}
+
+// -/----- Manuel control -----\-
+void OLEDDisplayUi::nextFrame() {
+  if (this->state.frameState != IN_TRANSITION) {
+    this->state.manuelControll = true;
+    this->state.frameState = IN_TRANSITION;
+    this->state.ticksSinceLastStateSwitch = 0;
+    this->lastTransitionDirection = this->state.frameTransitionDirection;
+    this->state.frameTransitionDirection = 1;
+  }
+}
+void OLEDDisplayUi::previousFrame() {
+  if (this->state.frameState != IN_TRANSITION) {
+    this->state.manuelControll = true;
+    this->state.frameState = IN_TRANSITION;
+    this->state.ticksSinceLastStateSwitch = 0;
+    this->lastTransitionDirection = this->state.frameTransitionDirection;
+    this->state.frameTransitionDirection = -1;
+  }
+}
+
+void OLEDDisplayUi::switchToFrame(uint8_t frame) {
+  if (frame >= this->frameCount) return;
+  this->state.ticksSinceLastStateSwitch = 0;
+  if (frame == this->state.currentFrame) return;
+  this->state.frameState = FIXED;
+  this->state.currentFrame = frame;
+  this->state.isIndicatorDrawen = true;
+}
+
+void OLEDDisplayUi::transitionToFrame(uint8_t frame) {
+  if (frame >= this->frameCount) return;
+  this->state.ticksSinceLastStateSwitch = 0;
+  if (frame == this->state.currentFrame) return;
+  this->nextFrameNumber = frame;
+  this->lastTransitionDirection = this->state.frameTransitionDirection;
+  this->state.manuelControll = true;
+  this->state.frameState = IN_TRANSITION;
+  this->state.frameTransitionDirection = frame < this->state.currentFrame ? -1 : 1;
+}
+
+
+// -/----- State information -----\-
+OLEDDisplayUiState* OLEDDisplayUi::getUiState(){
+  return &this->state;
+}
+
+int16_t OLEDDisplayUi::update(){
+#ifdef ARDUINO
+  unsigned long frameStart = millis();
+#elif __MBED__
+	Timer t;
+	t.start();
+	unsigned long frameStart = t.read_ms();
+#else
+#error "Unkown operating system"
+#endif
+  int32_t timeBudget = this->updateInterval - (frameStart - this->state.lastUpdate);
+  if ( timeBudget <= 0) {
+    // Implement frame skipping to ensure time budget is keept
+    if (this->autoTransition && this->state.lastUpdate != 0) this->state.ticksSinceLastStateSwitch += ceil((double)-timeBudget / (double)this->updateInterval);
+
+    this->state.lastUpdate = frameStart;
+    this->tick();
+  }
+#ifdef ARDUINO
+  return this->updateInterval - (millis() - frameStart);
+#elif __MBED__
+  return this->updateInterval - (t.read_ms() - frameStart);
+#else
+#error "Unkown operating system"
+#endif
+}
+
+
+void OLEDDisplayUi::tick() {
+  this->state.ticksSinceLastStateSwitch++;
+
+  switch (this->state.frameState) {
+    case IN_TRANSITION:
+        if (this->state.ticksSinceLastStateSwitch >= this->ticksPerTransition){
+          this->state.frameState = FIXED;
+          this->state.currentFrame = getNextFrameNumber();
+          this->state.ticksSinceLastStateSwitch = 0;
+          this->nextFrameNumber = -1;
+        }
+      break;
+    case FIXED:
+      // Revert manuelControll
+      if (this->state.manuelControll) {
+        this->state.frameTransitionDirection = this->lastTransitionDirection;
+        this->state.manuelControll = false;
+      }
+      if (this->state.ticksSinceLastStateSwitch >= this->ticksPerFrame){
+          if (this->autoTransition){
+            this->state.frameState = IN_TRANSITION;
+          }
+          this->state.ticksSinceLastStateSwitch = 0;
+      }
+      break;
+  }
+
+  this->display->clear();
+  this->drawFrame();
+  if (shouldDrawIndicators) {
+    this->drawIndicator();
+  }
+  this->drawOverlays();
+  this->display->display();
+}
+
+void OLEDDisplayUi::resetState() {
+  this->state.lastUpdate = 0;
+  this->state.ticksSinceLastStateSwitch = 0;
+  this->state.frameState = FIXED;
+  this->state.currentFrame = 0;
+  this->state.isIndicatorDrawen = true;
+}
+
+void OLEDDisplayUi::drawFrame(){
+  switch (this->state.frameState){
+     case IN_TRANSITION: {
+       float progress = (float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition;
+       int16_t x = 0, y = 0, x1 = 0, y1 = 0;
+       switch(this->frameAnimationDirection){
+        case SLIDE_LEFT:
+          x = -this->display->width() * progress;
+          y = 0;
+          x1 = x + this->display->width();
+          y1 = 0;
+          break;
+        case SLIDE_RIGHT:
+          x = this->display->width() * progress;
+          y = 0;
+          x1 = x - this->display->width();
+          y1 = 0;
+          break;
+        case SLIDE_UP:
+          x = 0;
+          y = -this->display->height() * progress;
+          x1 = 0;
+          y1 = y + this->display->height();
+          break;
+        case SLIDE_DOWN:
+        default:
+          x = 0;
+          y = this->display->height() * progress;
+          x1 = 0;
+          y1 = y - this->display->height();
+          break;
+       }
+
+       // Invert animation if direction is reversed.
+       int8_t dir = this->state.frameTransitionDirection >= 0 ? 1 : -1;
+       x *= dir; y *= dir; x1 *= dir; y1 *= dir;
+
+       bool drawenCurrentFrame;
+
+
+       // Prope each frameFunction for the indicator Drawen state
+       this->enableIndicator();
+       (this->frameFunctions[this->state.currentFrame])(this->display, &this->state, x, y);
+       drawenCurrentFrame = this->state.isIndicatorDrawen;
+
+       this->enableIndicator();
+       (this->frameFunctions[this->getNextFrameNumber()])(this->display, &this->state, x1, y1);
+
+       // Build up the indicatorDrawState
+       if (drawenCurrentFrame && !this->state.isIndicatorDrawen) {
+         // Drawen now but not next
+         this->indicatorDrawState = 2;
+       } else if (!drawenCurrentFrame && this->state.isIndicatorDrawen) {
+         // Not drawen now but next
+         this->indicatorDrawState = 1;
+       } else if (!drawenCurrentFrame && !this->state.isIndicatorDrawen) {
+         // Not drawen in both frames
+         this->indicatorDrawState = 3;
+       }
+
+       // If the indicator isn't draw in the current frame
+       // reflect it in state.isIndicatorDrawen
+       if (!drawenCurrentFrame) this->state.isIndicatorDrawen = false;
+
+       break;
+     }
+     case FIXED:
+      // Always assume that the indicator is drawn!
+      // And set indicatorDrawState to "not known yet"
+      this->indicatorDrawState = 0;
+      this->enableIndicator();
+      (this->frameFunctions[this->state.currentFrame])(this->display, &this->state, 0, 0);
+      break;
+  }
+}
+
+void OLEDDisplayUi::drawIndicator() {
+
+    // Only draw if the indicator is invisible
+    // for both frames or
+    // the indiactor is shown and we are IN_TRANSITION
+    if (this->indicatorDrawState == 3 || (!this->state.isIndicatorDrawen && this->state.frameState != IN_TRANSITION)) {
+      return;
+    }
+
+    uint8_t posOfHighlightFrame = 0;
+    float indicatorFadeProgress = 0;
+
+    // if the indicator needs to be slided in we want to
+    // highlight the next frame in the transition
+    uint8_t frameToHighlight = this->indicatorDrawState == 1 ? this->getNextFrameNumber() : this->state.currentFrame;
+
+    // Calculate the frame that needs to be highlighted
+    // based on the Direction the indiactor is drawn
+    switch (this->indicatorDirection){
+      case LEFT_RIGHT:
+        posOfHighlightFrame = frameToHighlight;
+        break;
+      case RIGHT_LEFT:
+      default:
+        posOfHighlightFrame = this->frameCount - frameToHighlight;
+        break;
+    }
+
+    switch (this->indicatorDrawState) {
+      case 1: // Indicator was not drawn in this frame but will be in next
+        // Slide IN
+        indicatorFadeProgress = 1 - ((float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition);
+        break;
+      case 2: // Indicator was drawn in this frame but not in next
+        // Slide OUT
+        indicatorFadeProgress = ((float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition);
+        break;
+    }
+
+    //Space between indicators - reduce for small screen sizes
+    uint16_t indicatorSpacing = 12;
+    if (this->display->getHeight() < 64 && (this->indicatorPosition == RIGHT || this->indicatorPosition == LEFT)) {
+      indicatorSpacing = 6;
+    }
+
+    uint16_t frameStartPos = (indicatorSpacing * frameCount / 2);
+    const uint8_t *image;
+
+    uint16_t x = 0,y = 0;
+
+
+    for (uint8_t i = 0; i < this->frameCount; i++) {
+
+      switch (this->indicatorPosition){
+        case TOP:
+          y = 0 - (8 * indicatorFadeProgress);
+          x = (this->display->width() / 2) - frameStartPos + 12 * i;
+          break;
+        case BOTTOM:
+          y = (this->display->height() - 8) + (8 * indicatorFadeProgress);
+          x = (this->display->width() / 2) - frameStartPos + 12 * i;
+          break;
+        case RIGHT:
+          x = (this->display->width() - 8) + (8 * indicatorFadeProgress);
+          y = (this->display->height() / 2) - frameStartPos + 2 + 12 * i;
+          break;
+        case LEFT:
+        default:
+          x = 0 - (8 * indicatorFadeProgress);
+          y = (this->display->height() / 2) - frameStartPos + 2 + indicatorSpacing * i;
+          break;
+      }
+
+      if (posOfHighlightFrame == i) {
+         image = this->activeSymbol;
+      } else {
+         image = this->inactiveSymbol;
+      }
+
+      this->display->drawFastImage(x, y, 8, 8, image);
+    }
+}
+
+void OLEDDisplayUi::drawOverlays() {
+ for (uint8_t i=0;i<this->overlayCount;i++){
+    (this->overlayFunctions[i])(this->display, &this->state);
+ }
+}
+
+uint8_t OLEDDisplayUi::getNextFrameNumber(){
+  if (this->nextFrameNumber != -1) return this->nextFrameNumber;
+  return (this->state.currentFrame + this->frameCount + this->state.frameTransitionDirection) % this->frameCount;
+}
diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.h b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.h
new file mode 100644
index 00000000..9aa3f320
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.h
@@ -0,0 +1,315 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ * Copyright (c) 2019 by Helmut Tschemernjak - www.radioshuttle.de
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef OLEDDISPLAYUI_h
+#define OLEDDISPLAYUI_h
+
+#ifdef ARDUINO
+#include <Arduino.h>
+#elif __MBED__
+#include <mbed.h>
+#else
+#error "Unkown operating system"
+#endif
+
+#include "OLEDDisplay.h"
+
+//#define DEBUG_OLEDDISPLAYUI(...) Serial.printf( __VA_ARGS__ )
+
+#ifndef DEBUG_OLEDDISPLAYUI
+#define DEBUG_OLEDDISPLAYUI(...)
+#endif
+
+enum AnimationDirection {
+  SLIDE_UP,
+  SLIDE_DOWN,
+  SLIDE_LEFT,
+  SLIDE_RIGHT
+};
+
+enum IndicatorPosition {
+  TOP,
+  RIGHT,
+  BOTTOM,
+  LEFT
+};
+
+enum IndicatorDirection {
+  LEFT_RIGHT,
+  RIGHT_LEFT
+};
+
+enum FrameState {
+  IN_TRANSITION,
+  FIXED
+};
+
+
+const uint8_t ANIMATION_activeSymbol[] PROGMEM = {
+  0x00, 0x18, 0x3c, 0x7e, 0x7e, 0x3c, 0x18, 0x00
+};
+
+const uint8_t ANIMATION_inactiveSymbol[] PROGMEM = {
+  0x00, 0x0, 0x0, 0x18, 0x18, 0x0, 0x0, 0x00
+};
+
+
+// Structure of the UiState
+struct OLEDDisplayUiState {
+  uint64_t     lastUpdate;
+  uint16_t      ticksSinceLastStateSwitch;
+
+  FrameState    frameState;
+  uint8_t       currentFrame;
+
+  bool          isIndicatorDrawen;
+
+  // Normal = 1, Inverse = -1;
+  int8_t        frameTransitionDirection;
+
+  bool          manuelControll;
+
+  // Custom data that can be used by the user
+  void*         userData;
+};
+
+struct LoadingStage {
+  const char* process;
+  void (*callback)();
+};
+
+typedef void (*FrameCallback)(OLEDDisplay *display,  OLEDDisplayUiState* state, int16_t x, int16_t y);
+typedef void (*OverlayCallback)(OLEDDisplay *display,  OLEDDisplayUiState* state);
+typedef void (*LoadingDrawFunction)(OLEDDisplay *display, LoadingStage* stage, uint8_t progress);
+
+class OLEDDisplayUi {
+  private:
+    OLEDDisplay             *display;
+
+    // Symbols for the Indicator
+    IndicatorPosition   indicatorPosition;
+    IndicatorDirection  indicatorDirection;
+
+    const uint8_t*         activeSymbol;
+    const uint8_t*         inactiveSymbol;
+
+    bool                shouldDrawIndicators;
+
+    // Values for the Frames
+    AnimationDirection  frameAnimationDirection;
+
+    int8_t              lastTransitionDirection;
+
+    uint16_t            ticksPerFrame; 		// ~ 5000ms at 30 FPS
+    uint16_t            ticksPerTransition;	// ~  500ms at 30 FPS
+
+    bool                autoTransition;
+
+    FrameCallback*      frameFunctions;
+    uint8_t             frameCount;
+
+    // Internally used to transition to a specific frame
+    int8_t              nextFrameNumber;
+
+    // Values for Overlays
+    OverlayCallback*    overlayFunctions;
+    uint8_t             overlayCount;
+
+    // Will the Indicator be drawen
+    // 3 Not drawn in both frames
+    // 2 Drawn this frame but not next
+    // 1 Not drown this frame but next
+    // 0 Not known yet
+    uint8_t                indicatorDrawState;
+
+    // Loading screen
+    LoadingDrawFunction loadingDrawFunction;
+	
+    // UI State
+    OLEDDisplayUiState      state;
+
+    // Bookeeping for update
+    uint16_t            updateInterval            = 33;
+
+    uint16_t            timePerFrame;
+    uint16_t            timePerTransition;
+
+    uint8_t             getNextFrameNumber();
+    void                drawIndicator();
+    void                drawFrame();
+    void                drawOverlays();
+    void                tick();
+    void                resetState();
+
+  public:
+
+    OLEDDisplayUi(OLEDDisplay *display);
+
+    /**
+     * Initialise the display
+     */
+    void init();
+
+    /**
+     * Configure the internal used target FPS
+     */
+    void setTargetFPS(uint8_t fps);
+
+    // Automatic Controll
+    /**
+     * Enable automatic transition to next frame after the some time can be configured with `setTimePerFrame` and `setTimePerTransition`.
+     */
+    void enableAutoTransition();
+
+    /**
+     * Disable automatic transition to next frame.
+     */
+    void disableAutoTransition();
+
+    /**
+     * Set the direction if the automatic transitioning
+     */
+    void setAutoTransitionForwards();
+    void setAutoTransitionBackwards();
+
+    /**
+     *  Set the approx. time a frame is displayed
+     */
+    void setTimePerFrame(uint16_t time);
+
+    /**
+     * Set the approx. time a transition will take
+     */
+    void setTimePerTransition(uint16_t time);
+
+    // Customize indicator position and style
+
+    /**
+     * Draw the indicator.
+     * This is the defaut state for all frames if
+     * the indicator was hidden on the previous frame
+     * it will be slided in.
+     */
+    void enableIndicator();
+
+    /**
+     * Don't draw the indicator.
+     * This will slide out the indicator
+     * when transitioning to the next frame.
+     */
+    void disableIndicator();
+
+    /**
+     * Enable drawing of indicators
+     */
+    void enableAllIndicators();
+
+    /**
+     * Disable draw of indicators.
+     */
+    void disableAllIndicators();
+
+    /**
+     * Set the position of the indicator bar.
+     */
+    void setIndicatorPosition(IndicatorPosition pos);
+
+    /**
+     * Set the direction of the indicator bar. Defining the order of frames ASCENDING / DESCENDING
+     */
+    void setIndicatorDirection(IndicatorDirection dir);
+
+    /**
+     * Set the symbol to indicate an active frame in the indicator bar.
+     */
+    void setActiveSymbol(const uint8_t* symbol);
+
+    /**
+     * Set the symbol to indicate an inactive frame in the indicator bar.
+     */
+    void setInactiveSymbol(const uint8_t* symbol);
+
+
+    // Frame settings
+
+    /**
+     * Configure what animation is used to transition from one frame to another
+     */
+    void setFrameAnimation(AnimationDirection dir);
+
+    /**
+     * Add frame drawing functions
+     */
+    void setFrames(FrameCallback* frameFunctions, uint8_t frameCount);
+
+    // Overlay
+
+    /**
+     * Add overlays drawing functions that are draw independent of the Frames
+     */
+    void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
+
+
+    // Loading animation
+    /**
+     * Set the function that will draw each step
+     * in the loading animation
+     */
+    void setLoadingDrawFunction(LoadingDrawFunction loadingFunction);
+
+
+    /**
+     * Run the loading process
+     */
+    void runLoadingProcess(LoadingStage* stages, uint8_t stagesCount);
+
+
+    // Manual Control
+    void nextFrame();
+    void previousFrame();
+
+    /**
+     * Switch without transition to frame `frame`.
+     */
+    void switchToFrame(uint8_t frame);
+
+    /**
+     * Transition to frame `frame`, when the `frame` number is bigger than the current
+     * frame the forward animation will be used, otherwise the backwards animation is used.
+     */
+    void transitionToFrame(uint8_t frame);
+
+    // State Info
+    OLEDDisplayUiState* getUiState();
+
+    int16_t update();
+};
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SH1106.h b/lib/esp8266-oled-ssd1306-master/src/SH1106.h
new file mode 100644
index 00000000..47188d1f
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SH1106.h
@@ -0,0 +1,39 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SH1106_h
+#define SH1106_h
+#include "SH1106Wire.h"
+
+// For make SH1106 an alias for SH1106Wire
+typedef SH1106Wire SH1106;
+
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SH1106Brzo.h b/lib/esp8266-oled-ssd1306-master/src/SH1106Brzo.h
new file mode 100644
index 00000000..be9c0c74
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SH1106Brzo.h
@@ -0,0 +1,141 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SH1106Brzo_h
+#define SH1106Brzo_h
+
+#include "OLEDDisplay.h"
+#include <brzo_i2c.h>
+
+#if F_CPU == 160000000L
+  #define BRZO_I2C_SPEED 1000
+#else
+  #define BRZO_I2C_SPEED 800
+#endif
+
+class SH1106Brzo : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+      uint8_t             _sda;
+      uint8_t             _scl;
+
+  public:
+	SH1106Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+		setGeometry(g);
+
+      this->_address = _address;
+      this->_sda = _sda;
+      this->_scl = _scl;
+    }
+
+    bool connect(){
+      brzo_i2c_setup(_sda, _scl, 0);
+      return true;
+    }
+
+    void display(void) {
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+       uint8_t minBoundY = UINT8_MAX;
+       uint8_t maxBoundY = 0;
+
+       uint8_t minBoundX = UINT8_MAX;
+       uint8_t maxBoundX = 0;
+       uint8_t x, y;
+
+       // Calculate the Y bounding box of changes
+       // and copy buffer[pos] to buffer_back[pos];
+       for (y = 0; y < (displayHeight / 8); y++) {
+         for (x = 0; x < displayWidth; x++) {
+          uint16_t pos = x + y * displayWidth;
+          if (buffer[pos] != buffer_back[pos]) {
+            minBoundY = _min(minBoundY, y);
+            maxBoundY = _max(maxBoundY, y);
+            minBoundX = _min(minBoundX, x);
+            maxBoundX = _max(maxBoundX, x);
+          }
+          buffer_back[pos] = buffer[pos];
+        }
+        yield();
+       }
+
+       // If the minBoundY wasn't updated
+       // we can savely assume that buffer_back[pos] == buffer[pos]
+       // holdes true for all values of pos
+       if (minBoundY == UINT8_MAX) return;
+
+       byte k = 0;
+       uint8_t sendBuffer[17];
+       sendBuffer[0] = 0x40;
+
+       // Calculate the colum offset
+       uint8_t minBoundXp2H = (minBoundX + 2) & 0x0F;
+       uint8_t minBoundXp2L = 0x10 | ((minBoundX + 2) >> 4 );
+
+       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
+
+       for (y = minBoundY; y <= maxBoundY; y++) {
+         sendCommand(0xB0 + y);
+         sendCommand(minBoundXp2H);
+         sendCommand(minBoundXp2L);
+         for (x = minBoundX; x <= maxBoundX; x++) {
+             k++;
+             sendBuffer[k] = buffer[x + y * displayWidth];
+             if (k == 16)  {
+               brzo_i2c_write(sendBuffer, 17, true);
+               k = 0;
+             }
+         }
+         if (k != 0) {
+           brzo_i2c_write(sendBuffer, k + 1, true);
+           k = 0;
+         }
+         yield();
+       }
+       if (k != 0) {
+         brzo_i2c_write(sendBuffer, k + 1, true);
+       }
+       brzo_i2c_end_transaction();
+     #else
+     #endif
+    }
+
+  private:
+	int getBufferOffset(void) {
+		return 0;
+	}
+    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
+      uint8_t command[2] = {0x80 /* command mode */, com};
+      brzo_i2c_start_transaction(_address, BRZO_I2C_SPEED);
+      brzo_i2c_write(command, 2, true);
+      brzo_i2c_end_transaction();
+    }
+};
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SH1106Spi.h b/lib/esp8266-oled-ssd1306-master/src/SH1106Spi.h
new file mode 100644
index 00000000..23693bc4
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SH1106Spi.h
@@ -0,0 +1,135 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SH1106Spi_h
+#define SH1106Spi_h
+
+#include "OLEDDisplay.h"
+#include <SPI.h>
+
+class SH1106Spi : public OLEDDisplay {
+  private:
+      uint8_t             _rst;
+      uint8_t             _dc;
+
+  public:
+    SH1106Spi(uint8_t _rst, uint8_t _dc, uint8_t _cs, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+        setGeometry(g);
+
+      this->_rst = _rst;
+      this->_dc  = _dc;
+    }
+
+    bool connect(){
+      pinMode(_dc, OUTPUT);
+      pinMode(_rst, OUTPUT);
+
+      SPI.begin ();
+      SPI.setClockDivider (SPI_CLOCK_DIV2);
+
+      // Pulse Reset low for 10ms
+      digitalWrite(_rst, HIGH);
+      delay(1);
+      digitalWrite(_rst, LOW);
+      delay(10);
+      digitalWrite(_rst, HIGH);
+      return true;
+    }
+
+    void display(void) {
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+       uint8_t minBoundY = UINT8_MAX;
+       uint8_t maxBoundY = 0;
+
+       uint8_t minBoundX = UINT8_MAX;
+       uint8_t maxBoundX = 0;
+
+       uint8_t x, y;
+
+       // Calculate the Y bounding box of changes
+       // and copy buffer[pos] to buffer_back[pos];
+       for (y = 0; y < (displayHeight / 8); y++) {
+         for (x = 0; x < displayWidth; x++) {
+          uint16_t pos = x + y * displayWidth;
+          if (buffer[pos] != buffer_back[pos]) {
+            minBoundY = _min(minBoundY, y);
+            maxBoundY = _max(maxBoundY, y);
+            minBoundX = _min(minBoundX, x);
+            maxBoundX = _max(maxBoundX, x);
+          }
+          buffer_back[pos] = buffer[pos];
+        }
+        yield();
+       }
+
+       // If the minBoundY wasn't updated
+       // we can savely assume that buffer_back[pos] == buffer[pos]
+       // holdes true for all values of pos
+       if (minBoundY == UINT8_MAX) return;
+
+       // Calculate the colum offset
+       uint8_t minBoundXp2H = (minBoundX + 2) & 0x0F;
+       uint8_t minBoundXp2L = 0x10 | ((minBoundX + 2) >> 4 );
+
+       for (y = minBoundY; y <= maxBoundY; y++) {
+         sendCommand(0xB0 + y);
+         sendCommand(minBoundXp2H);
+         sendCommand(minBoundXp2L);
+         digitalWrite(_dc, HIGH);   // data mode
+         for (x = minBoundX; x <= maxBoundX; x++) {
+           SPI.transfer(buffer[x + y * displayWidth]);
+         }
+         yield();
+       }
+     #else
+      for (uint8_t y=0; y<displayHeight/8; y++) {
+        sendCommand(0xB0 + y);
+        sendCommand(0x02);
+        sendCommand(0x10);
+        digitalWrite(_dc, HIGH);   // data mode
+        for( uint8_t x=0; x < displayWidth; x++) {
+          SPI.transfer(buffer[x + y * displayWidth]);
+        }
+        yield();
+      }
+     #endif
+    }
+
+  private:
+	int getBufferOffset(void) {
+		return 0;
+	}
+    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
+      digitalWrite(_dc, LOW);
+      SPI.transfer(com);
+    }
+};
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SH1106Wire.h b/lib/esp8266-oled-ssd1306-master/src/SH1106Wire.h
new file mode 100644
index 00000000..adb7b625
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SH1106Wire.h
@@ -0,0 +1,205 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SH1106Wire_h
+#define SH1106Wire_h
+
+#include "OLEDDisplay.h"
+#include <Wire.h>
+
+#define SH1106_SET_PUMP_VOLTAGE 0X30
+#define SH1106_SET_PUMP_MODE 0XAD
+#define SH1106_PUMP_ON 0X8B
+#define SH1106_PUMP_OFF 0X8A
+//--------------------------------------
+
+class SH1106Wire : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+      uint8_t             _sda;
+      uint8_t             _scl;
+      bool                _doI2cAutoInit = false;
+      TwoWire*            _wire = NULL;
+      int                 _frequency;
+
+  public:
+    /**
+     * Create and initialize the Display using Wire library
+     *
+     * Beware for retro-compatibility default values are provided for all parameters see below.
+     * Please note that if you don't wan't SD1306Wire to initialize and change frequency speed ot need to 
+     * ensure -1 value are specified for all 3 parameters. This can be usefull to control TwoWire with multiple
+     * device on the same bus.
+     * 
+     * @param _address I2C Display address
+     * @param _sda I2C SDA pin number, default to -1 to skip Wire begin call
+     * @param _scl I2C SCL pin number, default to -1 (only SDA = -1 is considered to skip Wire begin call)
+     * @param g display geometry dafault to generic GEOMETRY_128_64, see OLEDDISPLAY_GEOMETRY definition for other options
+     * @param _i2cBus on ESP32 with 2 I2C HW buses, I2C_ONE for 1st Bus, I2C_TWO fot 2nd bus, default I2C_ONE
+     * @param _frequency for Frequency by default Let's use ~700khz if ESP8266 is in 160Mhz mode, this will be limited to ~400khz if the ESP8266 in 80Mhz mode
+     */
+    SH1106Wire(uint8_t _address, uint8_t _sda, uint8_t _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64, HW_I2C _i2cBus = I2C_ONE, int _frequency = 700000) {
+      setGeometry(g);
+
+      this->_address = _address;
+      this->_sda = _sda;
+      this->_scl = _scl;
+#if !defined(ARDUINO_ARCH_ESP32)
+      this->_wire = &Wire;
+#else
+      this->_wire = (_i2cBus==I2C_ONE) ? &Wire : &Wire1;
+#endif
+      this->_frequency = _frequency;
+    }
+
+    bool connect() {
+#if !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH8266)
+      _wire->begin();
+#else
+      // On ESP32 arduino, -1 means 'don't change pins', someone else has called begin for us.
+      if(this->_sda != -1)
+        _wire->begin(this->_sda, this->_scl);
+#endif
+      // Let's use ~700khz if ESP8266 is in 160Mhz mode
+      // this will be limited to ~400khz if the ESP8266 in 80Mhz mode.
+      if(this->_frequency != -1)
+        _wire->setClock(this->_frequency);
+      return true;
+    }
+
+    void display(void) {
+      initI2cIfNeccesary();
+      #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+        uint8_t minBoundY = UINT8_MAX;
+        uint8_t maxBoundY = 0;
+
+        uint8_t minBoundX = UINT8_MAX;
+        uint8_t maxBoundX = 0;
+
+        uint8_t x, y;
+
+        // Calculate the Y bounding box of changes
+        // and copy buffer[pos] to buffer_back[pos];
+        for (y = 0; y < (displayHeight / 8); y++) {
+          for (x = 0; x < displayWidth; x++) {
+           uint16_t pos = x + y * displayWidth;
+           if (buffer[pos] != buffer_back[pos]) {
+             minBoundY = _min(minBoundY, y);
+             maxBoundY = _max(maxBoundY, y);
+             minBoundX = _min(minBoundX, x);
+             maxBoundX = _max(maxBoundX, x);
+           }
+           buffer_back[pos] = buffer[pos];
+         }
+         yield();
+        }
+
+        // If the minBoundY wasn't updated
+        // we can savely assume that buffer_back[pos] == buffer[pos]
+        // holdes true for all values of pos
+        if (minBoundY == UINT8_MAX) return;
+
+        // Calculate the colum offset
+        uint8_t minBoundXp2H = (minBoundX + 2) & 0x0F;
+        uint8_t minBoundXp2L = 0x10 | ((minBoundX + 2) >> 4 );
+
+        byte k = 0;
+        for (y = minBoundY; y <= maxBoundY; y++) {
+          sendCommand(0xB0 + y);
+          sendCommand(minBoundXp2H);
+          sendCommand(minBoundXp2L);
+          for (x = minBoundX; x <= maxBoundX; x++) {
+            if (k == 0) {
+              _wire->beginTransmission(_address);
+              _wire->write(0x40);
+            }
+            _wire->write(buffer[x + y * displayWidth]);
+            k++;
+            if (k == 16)  {
+              _wire->endTransmission();
+              k = 0;
+            }
+          }
+          if (k != 0)  {
+            _wire->endTransmission();
+            k = 0;
+          }
+          yield();
+        }
+
+        if (k != 0) {
+          _wire->endTransmission();
+        }
+      #else
+        uint8_t * p = &buffer[0];
+        for (uint8_t y=0; y<8; y++) {
+          sendCommand(0xB0+y);
+          sendCommand(0x02);
+          sendCommand(0x10);
+          for( uint8_t x=0; x<8; x++) {
+            _wire->beginTransmission(_address);
+            _wire->write(0x40);
+            for (uint8_t k = 0; k < 16; k++) {
+              _wire->write(*p++);
+            }
+            _wire->endTransmission();
+          }
+        }
+      #endif
+    }
+
+    void setI2cAutoInit(bool doI2cAutoInit) {
+      _doI2cAutoInit = doI2cAutoInit;
+    }
+
+  private:
+	int getBufferOffset(void) {
+		return 0;
+	}
+    inline void sendCommand(uint8_t command) __attribute__((always_inline)){
+      _wire->beginTransmission(_address);
+      _wire->write(0x80);
+      _wire->write(command);
+      _wire->endTransmission();
+    }
+
+    void initI2cIfNeccesary() {
+      if (_doI2cAutoInit) {
+#ifdef ARDUINO_ARCH_AVR
+        _wire->begin();
+#else
+        _wire->begin(this->_sda, this->_scl);
+#endif
+      }
+    }
+
+};
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SSD1306.h b/lib/esp8266-oled-ssd1306-master/src/SSD1306.h
new file mode 100644
index 00000000..f6bd554c
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SSD1306.h
@@ -0,0 +1,39 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SSD1306_h
+#define SSD1306_h
+#include "SSD1306Wire.h"
+
+// For legacy support make SSD1306 an alias for SSD1306
+typedef SSD1306Wire SSD1306;
+
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SSD1306Brzo.h b/lib/esp8266-oled-ssd1306-master/src/SSD1306Brzo.h
new file mode 100644
index 00000000..fbcffcda
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SSD1306Brzo.h
@@ -0,0 +1,167 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SSD1306Brzo_h
+#define SSD1306Brzo_h
+
+#include "OLEDDisplay.h"
+#include <brzo_i2c.h>
+
+#if F_CPU == 160000000L
+  #define BRZO_I2C_SPEED 1000
+#else
+  #define BRZO_I2C_SPEED 800
+#endif
+
+class SSD1306Brzo : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+      uint8_t             _sda;
+      uint8_t             _scl;
+
+  public:
+    SSD1306Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+      setGeometry(g);
+
+      this->_address = _address;
+      this->_sda = _sda;
+      this->_scl = _scl;
+    }
+
+    bool connect(){
+      brzo_i2c_setup(_sda, _scl, 0);
+      return true;
+    }
+
+    void display(void) {
+      const int x_offset = (128 - this->width()) / 2;
+
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+       uint8_t minBoundY = UINT8_MAX;
+       uint8_t maxBoundY = 0;
+
+       uint8_t minBoundX = UINT8_MAX;
+       uint8_t maxBoundX = 0;
+
+       uint8_t x, y;
+
+       // Calculate the Y bounding box of changes
+       // and copy buffer[pos] to buffer_back[pos];
+       for (y = 0; y < (this->height() / 8); y++) {
+         for (x = 0; x < this->width(); x++) {
+          uint16_t pos = x + y * this->width();
+          if (buffer[pos] != buffer_back[pos]) {
+            minBoundY = _min(minBoundY, y);
+            maxBoundY = _max(maxBoundY, y);
+            minBoundX = _min(minBoundX, x);
+            maxBoundX = _max(maxBoundX, x);
+          }
+          buffer_back[pos] = buffer[pos];
+        }
+        yield();
+       }
+
+       // If the minBoundY wasn't updated
+       // we can savely assume that buffer_back[pos] == buffer[pos]
+       // holdes true for all values of pos
+       if (minBoundY == UINT8_MAX) return;
+
+       sendCommand(COLUMNADDR);
+       sendCommand(x_offset + minBoundX);
+       sendCommand(x_offset + maxBoundX);
+
+       sendCommand(PAGEADDR);
+       sendCommand(minBoundY);
+       sendCommand(maxBoundY);
+
+       byte k = 0;
+
+       int buflen = ( this->width() / 8 ) + 1;
+
+       uint8_t sendBuffer[buflen];
+       sendBuffer[0] = 0x40;
+       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
+       for (y = minBoundY; y <= maxBoundY; y++) {
+           for (x = minBoundX; x <= maxBoundX; x++) {
+               k++;
+               sendBuffer[k] = buffer[x + y * this->width()];
+               if (k == (buflen-1))  {
+                 brzo_i2c_write(sendBuffer, buflen, true);
+                 k = 0;
+               }
+           }
+           yield();
+       }
+       brzo_i2c_write(sendBuffer, k + 1, true);
+       brzo_i2c_end_transaction();
+     #else
+       // No double buffering
+       sendCommand(COLUMNADDR);
+
+       sendCommand(x_offset);
+       sendCommand(x_offset + (this->width() - 1));
+
+       sendCommand(PAGEADDR);
+       sendCommand(0x0);
+       sendCommand((this->height() / 8) - 1);
+
+       int buflen = ( this->width() / 8 ) + 1;
+
+       uint8_t sendBuffer[buflen];
+       sendBuffer[0] = 0x40;
+
+       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
+
+       for (uint16_t i=0; i<displayBufferSize; i++) {
+         for (uint8_t x=1; x<buflen; x++) {
+           sendBuffer[x] = buffer[i];
+           i++;
+         }
+         i--;
+         brzo_i2c_write(sendBuffer,  buflen,  true);
+         yield();
+       }
+       brzo_i2c_end_transaction();
+     #endif
+    }
+
+  private:
+	int getBufferOffset(void) {
+		return 0;
+	}
+    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
+      uint8_t command[2] = {0x80 /* command mode */, com};
+      brzo_i2c_start_transaction(_address, BRZO_I2C_SPEED);
+      brzo_i2c_write(command, 2, true);
+      brzo_i2c_end_transaction();
+    }
+};
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SSD1306I2C.h b/lib/esp8266-oled-ssd1306-master/src/SSD1306I2C.h
new file mode 100644
index 00000000..ab94840d
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SSD1306I2C.h
@@ -0,0 +1,152 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 by Helmut Tschemernjak - www.radioshuttle.de
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SSD1306I2C_h
+#define SSD1306I2C_h
+
+
+#ifdef __MBED__
+
+#include "OLEDDisplay.h"
+#include <mbed.h>
+
+#ifndef UINT8_MAX
+ #define UINT8_MAX 0xff
+#endif
+
+class SSD1306I2C : public OLEDDisplay {
+public:
+    SSD1306I2C(uint8_t _address, PinName _sda, PinName _scl, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+      setGeometry(g);
+
+      this->_address = _address << 1;  // convert from 7 to 8 bit for mbed.
+      this->_sda = _sda;
+      this->_scl = _scl;
+	  _i2c = new I2C(_sda, _scl);
+    }
+
+    bool connect() {
+		// mbed supports 100k and 400k some device maybe 1000k
+#ifdef TARGET_STM32L4
+	  _i2c->frequency(1000000);
+#else
+	  _i2c->frequency(400000);
+#endif
+      return true;
+    }
+
+    void display(void) {
+      const int x_offset = (128 - this->width()) / 2;
+#ifdef OLEDDISPLAY_DOUBLE_BUFFER
+        uint8_t minBoundY = UINT8_MAX;
+        uint8_t maxBoundY = 0;
+
+        uint8_t minBoundX = UINT8_MAX;
+        uint8_t maxBoundX = 0;
+        uint8_t x, y;
+
+        // Calculate the Y bounding box of changes
+        // and copy buffer[pos] to buffer_back[pos];
+        for (y = 0; y < (this->height() / 8); y++) {
+          for (x = 0; x < this->width(); x++) {
+           uint16_t pos = x + y * this->width();
+           if (buffer[pos] != buffer_back[pos]) {
+             minBoundY = std::min(minBoundY, y);
+             maxBoundY = std::max(maxBoundY, y);
+             minBoundX = std::min(minBoundX, x);
+             maxBoundX = std::max(maxBoundX, x);
+           }
+           buffer_back[pos] = buffer[pos];
+         }
+         yield();
+        }
+
+        // If the minBoundY wasn't updated
+        // we can savely assume that buffer_back[pos] == buffer[pos]
+        // holdes true for all values of pos
+
+        if (minBoundY == UINT8_MAX) return;
+
+        sendCommand(COLUMNADDR);
+        sendCommand(x_offset + minBoundX);	// column start address (0 = reset)
+        sendCommand(x_offset + maxBoundX);	// column end address (127 = reset)
+
+        sendCommand(PAGEADDR);
+        sendCommand(minBoundY);				// page start address
+        sendCommand(maxBoundY);				// page end address
+
+        for (y = minBoundY; y <= maxBoundY; y++) {
+			uint8_t *start = &buffer[(minBoundX + y * this->width())-1];
+			uint8_t save = *start;
+			
+			*start = 0x40; // control
+			_i2c->write(_address, (char *)start, (maxBoundX-minBoundX) + 1 + 1);
+			*start = save;
+		}
+#else
+
+        sendCommand(COLUMNADDR);
+        sendCommand(x_offset);						// column start address (0 = reset)
+        sendCommand(x_offset + (this->width() - 1));// column end address (127 = reset)
+
+        sendCommand(PAGEADDR);
+        sendCommand(0x0);							// page start address (0 = reset)
+
+        if (geometry == GEOMETRY_128_64) {
+          sendCommand(0x7);
+        } else if (geometry == GEOMETRY_128_32) {
+          sendCommand(0x3);
+        }
+
+		buffer[-1] = 0x40; // control
+		_i2c->write(_address, (char *)&buffer[-1], displayBufferSize + 1);
+#endif
+    }
+
+private:
+	int getBufferOffset(void) {
+		return 0;
+	}
+
+    inline void sendCommand(uint8_t command) __attribute__((always_inline)) {
+		char _data[2];
+	  	_data[0] = 0x80; // control
+	  	_data[1] = command;
+	  	_i2c->write(_address, _data, sizeof(_data));
+    }
+
+	uint8_t             _address;
+	PinName             _sda;
+	PinName             _scl;
+	I2C *_i2c;
+};
+
+#endif
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SSD1306Spi.h b/lib/esp8266-oled-ssd1306-master/src/SSD1306Spi.h
new file mode 100644
index 00000000..08cb4a80
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SSD1306Spi.h
@@ -0,0 +1,163 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SSD1306Spi_h
+#define SSD1306Spi_h
+
+#include "OLEDDisplay.h"
+#include <SPI.h>
+
+#if F_CPU == 160000000L
+  #define BRZO_I2C_SPEED 1000
+#else
+  #define BRZO_I2C_SPEED 800
+#endif
+
+class SSD1306Spi : public OLEDDisplay {
+  private:
+      uint8_t             _rst;
+      uint8_t             _dc;
+      uint8_t             _cs;
+
+  public:
+    SSD1306Spi(uint8_t _rst, uint8_t _dc, uint8_t _cs, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64) {
+        setGeometry(g);
+
+      this->_rst = _rst;
+      this->_dc  = _dc;
+      this->_cs  = _cs;
+    }
+
+    bool connect(){
+      pinMode(_dc, OUTPUT);
+      pinMode(_cs, OUTPUT);
+      pinMode(_rst, OUTPUT);
+
+      SPI.begin ();
+      SPI.setClockDivider (SPI_CLOCK_DIV2);
+
+      // Pulse Reset low for 10ms
+      digitalWrite(_rst, HIGH);
+      delay(1);
+      digitalWrite(_rst, LOW);
+      delay(10);
+      digitalWrite(_rst, HIGH);
+      return true;
+    }
+
+    void display(void) {
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+       uint8_t minBoundY = UINT8_MAX;
+       uint8_t maxBoundY = 0;
+
+       uint8_t minBoundX = UINT8_MAX;
+       uint8_t maxBoundX = 0;
+
+       uint8_t x, y;
+
+       // Calculate the Y bounding box of changes
+       // and copy buffer[pos] to buffer_back[pos];
+       for (y = 0; y < (displayHeight / 8); y++) {
+         for (x = 0; x < displayWidth; x++) {
+          uint16_t pos = x + y * displayWidth;
+          if (buffer[pos] != buffer_back[pos]) {
+            minBoundY = _min(minBoundY, y);
+            maxBoundY = _max(maxBoundY, y);
+            minBoundX = _min(minBoundX, x);
+            maxBoundX = _max(maxBoundX, x);
+          }
+          buffer_back[pos] = buffer[pos];
+        }
+        yield();
+       }
+
+       // If the minBoundY wasn't updated
+       // we can savely assume that buffer_back[pos] == buffer[pos]
+       // holdes true for all values of pos
+       if (minBoundY == UINT8_MAX) return;
+
+       sendCommand(COLUMNADDR);
+       sendCommand(minBoundX);
+       sendCommand(maxBoundX);
+
+       sendCommand(PAGEADDR);
+       sendCommand(minBoundY);
+       sendCommand(maxBoundY);
+
+       digitalWrite(_cs, HIGH);
+       digitalWrite(_dc, HIGH);   // data mode
+       digitalWrite(_cs, LOW);
+       for (y = minBoundY; y <= maxBoundY; y++) {
+         for (x = minBoundX; x <= maxBoundX; x++) {
+           SPI.transfer(buffer[x + y * displayWidth]);
+         }
+         yield();
+       }
+       digitalWrite(_cs, HIGH);
+     #else
+       // No double buffering
+       sendCommand(COLUMNADDR);
+       sendCommand(0x0);
+       sendCommand(0x7F);
+
+       sendCommand(PAGEADDR);
+       sendCommand(0x0);
+
+       if (geometry == GEOMETRY_128_64 || geometry == GEOMETRY_64_48 || geometry == GEOMETRY_64_32 ) {
+         sendCommand(0x7);
+       } else if (geometry == GEOMETRY_128_32) {
+         sendCommand(0x3);
+       }
+
+        digitalWrite(_cs, HIGH);
+        digitalWrite(_dc, HIGH);   // data mode
+        digitalWrite(_cs, LOW);
+        for (uint16_t i=0; i<displayBufferSize; i++) {
+          SPI.transfer(buffer[i]);
+          yield();
+        }
+        digitalWrite(_cs, HIGH);
+     #endif
+    }
+
+  private:
+	int getBufferOffset(void) {
+		return 0;
+	}
+    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
+      digitalWrite(_cs, HIGH);
+      digitalWrite(_dc, LOW);
+      digitalWrite(_cs, LOW);
+      SPI.transfer(com);
+      digitalWrite(_cs, HIGH);
+    }
+};
+
+#endif
diff --git a/lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h b/lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h
new file mode 100644
index 00000000..7d27850f
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h
@@ -0,0 +1,211 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
+ * Copyright (c) 2018 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * ThingPulse invests considerable time and money to develop these open source libraries.
+ * Please support us by buying our products (and not the clones) from
+ * https://thingpulse.com
+ *
+ */
+
+#ifndef SSD1306Wire_h
+#define SSD1306Wire_h
+
+#include "OLEDDisplay.h"
+#include <Wire.h>
+#include <algorithm>
+
+#if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_STM32)
+#define _min	min
+#define _max	max
+#endif
+//--------------------------------------
+
+class SSD1306Wire : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+      int                 _sda;
+      int                 _scl;
+      bool                _doI2cAutoInit = false;
+      TwoWire*            _wire = NULL;
+      int                 _frequency;
+
+  public:
+
+    /**
+     * Create and initialize the Display using Wire library
+     *
+     * Beware for retro-compatibility default values are provided for all parameters see below.
+     * Please note that if you don't wan't SD1306Wire to initialize and change frequency speed ot need to 
+     * ensure -1 value are specified for all 3 parameters. This can be usefull to control TwoWire with multiple
+     * device on the same bus.
+     * 
+     * @param _address I2C Display address
+     * @param _sda I2C SDA pin number, default to -1 to skip Wire begin call
+     * @param _scl I2C SCL pin number, default to -1 (only SDA = -1 is considered to skip Wire begin call)
+     * @param g display geometry dafault to generic GEOMETRY_128_64, see OLEDDISPLAY_GEOMETRY definition for other options
+     * @param _i2cBus on ESP32 with 2 I2C HW buses, I2C_ONE for 1st Bus, I2C_TWO fot 2nd bus, default I2C_ONE
+     * @param _frequency for Frequency by default Let's use ~700khz if ESP8266 is in 160Mhz mode, this will be limited to ~400khz if the ESP8266 in 80Mhz mode
+     */
+    SSD1306Wire(uint8_t _address, int _sda = -1, int _scl = -1, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64, HW_I2C _i2cBus = I2C_ONE, int _frequency = 700000) {
+      setGeometry(g);
+
+      this->_address = _address;
+      this->_sda = _sda;
+      this->_scl = _scl;
+#if !defined(ARDUINO_ARCH_ESP32)
+      this->_wire = &Wire;
+#else
+      this->_wire = (_i2cBus==I2C_ONE) ? &Wire : &Wire1;
+#endif
+      this->_frequency = _frequency;
+    }
+
+    bool connect() {
+#if !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH8266)
+      _wire->begin();
+#else
+      // On ESP32 arduino, -1 means 'don't change pins', someone else has called begin for us.
+      if(this->_sda != -1)
+        _wire->begin(this->_sda, this->_scl);
+#endif
+      // Let's use ~700khz if ESP8266 is in 160Mhz mode
+      // this will be limited to ~400khz if the ESP8266 in 80Mhz mode.
+      if(this->_frequency != -1)
+        _wire->setClock(this->_frequency);
+      return true;
+    }
+
+    void display(void) {
+      initI2cIfNeccesary();
+      const int x_offset = (128 - this->width()) / 2;
+      #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+        uint8_t minBoundY = UINT8_MAX;
+        uint8_t maxBoundY = 0;
+
+        uint8_t minBoundX = UINT8_MAX;
+        uint8_t maxBoundX = 0;
+        uint8_t x, y;
+
+        // Calculate the Y bounding box of changes
+        // and copy buffer[pos] to buffer_back[pos];
+        for (y = 0; y < (this->height() / 8); y++) {
+          for (x = 0; x < this->width(); x++) {
+           uint16_t pos = x + y * this->width();
+           if (buffer[pos] != buffer_back[pos]) {
+             minBoundY = std::min(minBoundY, y);
+             maxBoundY = std::max(maxBoundY, y);
+             minBoundX = std::min(minBoundX, x);
+             maxBoundX = std::max(maxBoundX, x);
+           }
+           buffer_back[pos] = buffer[pos];
+         }
+         yield();
+        }
+
+        // If the minBoundY wasn't updated
+        // we can savely assume that buffer_back[pos] == buffer[pos]
+        // holdes true for all values of pos
+
+        if (minBoundY == UINT8_MAX) return;
+
+        sendCommand(COLUMNADDR);
+        sendCommand(x_offset + minBoundX);
+        sendCommand(x_offset + maxBoundX);
+
+        sendCommand(PAGEADDR);
+        sendCommand(minBoundY);
+        sendCommand(maxBoundY);
+
+        byte k = 0;
+        for (y = minBoundY; y <= maxBoundY; y++) {
+          for (x = minBoundX; x <= maxBoundX; x++) {
+            if (k == 0) {
+              _wire->beginTransmission(_address);
+              _wire->write(0x40);
+            }
+
+            _wire->write(buffer[x + y * this->width()]);
+            k++;
+            if (k == 16)  {
+              _wire->endTransmission();
+              k = 0;
+            }
+          }
+          yield();
+        }
+
+        if (k != 0) {
+          _wire->endTransmission();
+        }
+      #else
+
+        sendCommand(COLUMNADDR);
+        sendCommand(x_offset);
+        sendCommand(x_offset + (this->width() - 1));
+
+        sendCommand(PAGEADDR);
+        sendCommand(0x0);
+
+        for (uint16_t i=0; i < displayBufferSize; i++) {
+          _wire->beginTransmission(this->_address);
+          _wire->write(0x40);
+          for (uint8_t x = 0; x < 16; x++) {
+            _wire->write(buffer[i]);
+            i++;
+          }
+          i--;
+          _wire->endTransmission();
+        }
+      #endif
+    }
+
+    void setI2cAutoInit(bool doI2cAutoInit) {
+      _doI2cAutoInit = doI2cAutoInit;
+    }
+
+  private:
+	int getBufferOffset(void) {
+		return 0;
+	}
+    inline void sendCommand(uint8_t command) __attribute__((always_inline)){
+      initI2cIfNeccesary();
+      _wire->beginTransmission(_address);
+      _wire->write(0x80);
+      _wire->write(command);
+      _wire->endTransmission();
+    }
+
+    void initI2cIfNeccesary() {
+      if (_doI2cAutoInit) {
+#if !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH8266)
+      	_wire->begin();
+#else
+      	_wire->begin(this->_sda, this->_scl);
+#endif
+      }
+    }
+
+};
+
+#endif
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 0e0b6990..29eea492 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -111,7 +111,8 @@ const char* const CFG_MODE_P[] PROGMEM = {CFG_10_PRESSES, CFG_5SEK_HOLD};
 #ifdef SUPLA_OLED
 const char SSD1306[] PROGMEM = "SSD1306 - 0,96''";
 const char SH1106[] PROGMEM = "SH1106 - 1,3''";
-const char *const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106};
+const char SSD1306_WEMOS_SHIELD[] PROGMEM = "SSD1306 - 0,66'' WEMOS OLED shield";
+const char *const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106, SSD1306_WEMOS_SHIELD};
 #endif
 
 String StateString(uint8_t adr);
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 0dfa7c1d..70b9b328 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -103,8 +103,10 @@ void displayRelayState(OLEDDisplay* display) {
     }
     x += 15;
   }
-  display->setColor(WHITE);
-  display->drawHorizontalLine(0, 14, display->getWidth());
+  if (!GEOMETRY_64_48) {
+    display->setColor(WHITE);
+    display->drawHorizontalLine(0, 14, display->getWidth());
+  }
 }
 
 void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state) {
@@ -149,45 +151,78 @@ void displayBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, in
 
 void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name) {
   int drawHeightIcon = display->getHeight() / 2 - 10;
-  int drawStringIcon = display->getHeight() / 2 - 5;
+  int drawStringIcon = display->getHeight() / 2 - 6;
+
+  int temp_width = TEMP_WIDTH;
+  int temp_height = TEMP_HEIGHT;
+
+  if (GEOMETRY_64_48) {
+    temp_width = 0;
+    temp_height = 0;
+  }
+  else {
+    temp_width = temp_width + 10;
+  }
 
   display->setColor(WHITE);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
   display->drawXbm(x + 0, y + drawHeightIcon, temp_width, temp_height, temp_bits);
   display->setFont(ArialMT_Plain_10);
   if (name != NULL) {
-    display->drawString(x + temp_width + 20, y + display->getHeight() / 2 - 15, name);
+    display->drawString(x + temp_width, y + display->getHeight() / 2 - 15, name);
   }
   display->setFont(ArialMT_Plain_24);
-  display->drawString(x + temp_width + 10, y + drawStringIcon, getTempString(temp));
+  display->drawString(x + temp_width, y + drawStringIcon, getTempString(temp));
   display->setFont(ArialMT_Plain_16);
-  display->drawString(x + temp_width + 10 + (getTempString(temp).length() * 12), y + drawStringIcon, "ºC");
+  display->drawString(x + temp_width + (getTempString(temp).length() * 12), y + drawStringIcon, "ºC");
 }
 
 void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity) {
   int drawHeightIcon = display->getHeight() / 2 - 10;
-  int drawStringIcon = display->getHeight() / 2 - 5;
+  int drawStringIcon = display->getHeight() / 2 - 6;
+
+  int humidity_width = HUMIDITY_WIDTH;
+  int humidity_height = HUMIDITY_HEIGHT;
+
+  if (GEOMETRY_64_48) {
+    humidity_width = 0;
+    humidity_height = 0;
+  }
+  else {
+    humidity_width = humidity_width + 10;
+  }
 
   display->setColor(WHITE);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
   display->drawXbm(x + 0, y + drawHeightIcon, humidity_width, humidity_height, humidity_bits);
   display->setFont(ArialMT_Plain_24);
-  display->drawString(x + humidity_width + 20, y + drawStringIcon, getHumidityString(humidity));
+  display->drawString(x + humidity_width, y + drawStringIcon, getHumidityString(humidity));
   display->setFont(ArialMT_Plain_16);
-  display->drawString(x + humidity_width + 20 + (getHumidityString(humidity).length() * 12), y + drawStringIcon, "%");
+  display->drawString(x + humidity_width + (getHumidityString(humidity).length() * 12), y + drawStringIcon, "%");
 }
 
 void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure) {
   int drawHeightIcon = display->getHeight() / 2 - 10;
-  int drawStringIcon = display->getHeight() / 2 - 5;
+  int drawStringIcon = display->getHeight() / 2 - 6;
+
+  int pressure_width = PRESSURE_WIDTH;
+  int pressure_height = PRESSURE_HEIGHT;
+
+  if (GEOMETRY_64_48) {
+    pressure_width = 0;
+    pressure_height = 0;
+  }
+  else {
+    pressure_width = pressure_width + 15;
+  }
 
   display->setColor(WHITE);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
   display->drawXbm(x + 0, y + drawHeightIcon, pressure_width, pressure_height, pressure_bits);
   display->setFont(ArialMT_Plain_24);
-  display->drawString(x + pressure_width + 15, y + drawStringIcon, getPressureString(pressure));
+  display->drawString(x + pressure_width, y + drawStringIcon, getPressureString(pressure));
   display->setFont(ArialMT_Plain_10);
-  display->drawString(x + pressure_width + 15 + (getPressureString(pressure).length() * 14), y + drawStringIcon, "hPa");
+  display->drawString(x + pressure_width + (getPressureString(pressure).length() * 14), y + drawStringIcon, "hPa");
 }
 
 void displayDs18b20(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
@@ -229,11 +264,16 @@ void displayMAX6675Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t
 
 SuplaOled::SuplaOled() {
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
-      display = new SH1106Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
-    }
-    else {
-      display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
+    switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+      case OLED_SSD1306_0_96:
+        display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
+        break;
+      case OLED_SH1106_1_3:
+        display = new SH1106Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
+        break;
+      case OLED_SSD1306_0_66:
+        display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL), GEOMETRY_64_48);
+        break;
     }
 
     ui = new OLEDDisplayUi(display);
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index 3e6c6a96..dc3b6c4d 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -8,7 +8,7 @@
 #include <supla/triggerable.h>
 #include <supla/element.h>
 #include <Wire.h>         // Only needed for Arduino 1.6.5 and earlier
-#include <SSD1306Wire.h>  //OLED 0,96"
+#include <SSD1306Wire.h>  //OLED 0,96" or 0.66" WEMOS OLED shield
 #include <SH1106Wire.h>   //OLED 1.3"
 #include <OLEDDisplayUi.h>
 
@@ -17,6 +17,13 @@ enum customActions
   TURN_ON_OLED
 };
 
+enum _OLED
+{
+  OLED_SSD1306_0_96 = 1,
+  OLED_SH1106_1_3,
+  OLED_SSD1306_0_66
+};
+
 String getTempString(double temperature);
 String getHumidityString(double humidity);
 String getPressureString(double pressure);
@@ -50,10 +57,10 @@ class SuplaOled : public Supla::Triggerable, public Supla::Element {
   void iterateAlways();
   void runAction(int event, int action);
 
-  OLEDDisplay *display;
-  OLEDDisplayUi *ui;
+  OLEDDisplay* display;
+  OLEDDisplayUi* ui;
 
-  FrameCallback *frames;
+  FrameCallback* frames;
   int frameCount = 0;
   OverlayCallback overlays[1];
   int overlaysCount = 1;
@@ -65,8 +72,8 @@ class SuplaOled : public Supla::Triggerable, public Supla::Element {
 };
 
 // https://www.online-utility.org/image/convert/to/XBM
-#define temp_width  32
-#define temp_height 32
+#define TEMP_WIDTH  32
+#define TEMP_HEIGHT 32
 const uint8_t temp_bits[] PROGMEM = {0x00, 0x3C, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00, 0x81, 0xF8, 0x03, 0x00, 0x99, 0x00,
                                      0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0xF8, 0x03, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99,
                                      0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0xF8, 0x03, 0x00, 0x99, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00,
@@ -75,8 +82,8 @@ const uint8_t temp_bits[] PROGMEM = {0x00, 0x3C, 0x00, 0x00, 0x00, 0x66, 0x00, 0
                                      0x00, 0x20, 0x7E, 0x04, 0x00, 0x20, 0x7E, 0x04, 0x00, 0x20, 0x7E, 0x04, 0x00, 0x60, 0x3C, 0x06, 0x00, 0xC0, 0x18,
                                      0x03, 0x00, 0x80, 0x81, 0x01, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00};
 
-#define humidity_width  32
-#define humidity_height 32
+#define HUMIDITY_WIDTH  32
+#define HUMIDITY_HEIGHT 32
 const uint8_t humidity_bits[] PROGMEM = {
     0x00, 0x80, 0x01, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x30, 0x0C, 0x00, 0x00, 0x38, 0x1C, 0x00, 0x00, 0x18,
     0x18, 0x00, 0x00, 0x0C, 0x30, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x06, 0x40, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x80, 0x01, 0x80, 0x00,
@@ -85,8 +92,8 @@ const uint8_t humidity_bits[] PROGMEM = {
     0x30, 0x10, 0x09, 0x0C, 0x30, 0x00, 0x06, 0x0C, 0x20, 0x00, 0x00, 0x04, 0x60, 0x00, 0x00, 0x06, 0xC0, 0x00, 0x00, 0x03, 0x80, 0x01,
     0x80, 0x01, 0x00, 0x03, 0xC0, 0x00, 0x00, 0x0E, 0x70, 0x00, 0x00, 0xFC, 0x3F, 0x00, 0x00, 0xF0, 0x0F, 0x00};
 
-#define pressure_width  32
-#define pressure_height 32
+#define PRESSURE_WIDTH  32
+#define PRESSURE_HEIGHT 32
 const uint8_t pressure_bits[] PROGMEM = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,
     0x0F, 0x00, 0x00, 0xFC, 0x3F, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x80, 0x81, 0x81, 0x01, 0xC0, 0x80, 0x01, 0x03,

From 7f9a935418b904a93cbe32c87a326ec1cfe064b2 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 28 Dec 2020 16:59:13 +0100
Subject: [PATCH 026/165] wsparcie dla HLW8012

---
 lib/SuplaDevice/src/supla/supla_lib_config.h |   2 +-
 platformio.ini                               |   7 +-
 src/GUI-Generic.ino                          |   9 +-
 src/GUI-Generic_Config.h                     |   1 +
 src/Markup.cpp                               |  35 ++++++
 src/Markup.h                                 |   4 +
 src/SuplaConfigESP.cpp                       |   7 ++
 src/SuplaConfigManager.h                     |  58 +++++-----
 src/SuplaDeviceGUI.cpp                       |  18 +++-
 src/SuplaDeviceGUI.h                         |   8 ++
 src/SuplaTemplateBoard.cpp                   |  18 ++++
 src/SuplaTemplateBoard.h                     |   5 +-
 src/SuplaWebPageSensor.cpp                   | 107 ++++++++++++++++++-
 src/SuplaWebPageSensor.h                     |  16 +++
 src/SuplaWebPageUpload.cpp                   |   3 +-
 15 files changed, 257 insertions(+), 41 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/supla_lib_config.h b/lib/SuplaDevice/src/supla/supla_lib_config.h
index 4e8071bb..d6df3384 100644
--- a/lib/SuplaDevice/src/supla/supla_lib_config.h
+++ b/lib/SuplaDevice/src/supla/supla_lib_config.h
@@ -7,6 +7,6 @@
 #ifndef supla_lib_config_h_
 #define supla_lib_config_h_
 
-#define SUPLA_COMM_DEBUG
+//#define SUPLA_COMM_DEBUG
 
 #endif
diff --git a/platformio.ini b/platformio.ini
index 51e6c23e..2faedc17 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.0.9"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.4"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -42,7 +42,8 @@ build_flags =   -D BUILD_VERSION='"GUI 1.0.9"'
                 -D SUPLA_MAX6675
                 -D SUPLA_HC_SR04
                 -D SUPLA_IMPULSE_COUNTER
-                -D SUPLA_OLED             
+                -D SUPLA_OLED
+                -D SUPLA_HLW8012             
 
 [env]
 framework = arduino
@@ -59,7 +60,7 @@ lib_deps =
 	datacute/DoubleResetDetector@^1.0.3
 	closedcube/ClosedCube SHT31D@^1.5.1
 	adafruit/Adafruit Si7021 Library@^1.3.0
-    thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays @ ^4.1.0
+    ;thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays @ ^4.1.0
     xoseperez/HLW8012 @ ^1.1.1
 extra_scripts = tools/copy_files.py       
 
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 96e8018e..70fd892b 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -162,7 +162,8 @@ void setup() {
 
 #ifdef SUPLA_MAX6675
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
-    Supla::GUI::sensorMAX6675_K.push_back(new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0)));
+    Supla::GUI::sensorMAX6675_K.push_back(
+        new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0)));
   }
 #endif
 
@@ -179,6 +180,12 @@ void setup() {
 
 #endif
 
+#ifdef SUPLA_HLW8012
+  if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
+    Supla::GUI::addHLW8012(ConfigESP->getGpio(FUNCTION_CF), ConfigESP->getGpio(FUNCTION_CF1), ConfigESP->getGpio(FUNCTION_SEL));
+  }
+#endif
+
   Supla::GUI::begin();
 }
 
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 537d5328..f81948fb 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -45,6 +45,7 @@
 // ##### Other #####
 #define SUPLA_HC_SR04
 #define SUPLA_IMPULSE_COUNTER
+#define SUPLA_HLW8012
 
 #endif
 #endif  // GUI-Generic_Config_h
diff --git a/src/Markup.cpp b/src/Markup.cpp
index b1cba4b8..afdc7cf2 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -94,6 +94,41 @@ void addNumberBox(String& html, const String& input_id, const String& name, uint
   html += F("'></i>");
 }
 
+void addNumberBox(String& html, const String& input_id, const String& name, const String& placeholder, bool required, const String& value) {
+  html += F("<i><label>");
+  html += name;
+  html += F("</label><input name='");
+  html += input_id;
+  html += F("' type='number'");
+  if (placeholder != "") {
+    html += F("' placeholder='");
+    html += placeholder;
+  }
+  html += F("' step='1' min='0' value='");
+  html += value;
+  html += F("'");
+
+  if (required) {
+    html += F(" required");
+  }
+
+  html += F("></i>");
+}
+
+void addLinkBox(String& html, const String& name, const String& url) {
+  html += F("<i>");
+  html += F("<label>");
+  html += F("<a href='");
+  html += PATH_START;
+  html += url;
+  html += F("'>");
+  html += name;
+  html += WebServer->SuplaIconEdit();
+  html += F("</a>");
+  html += F("</label>");
+  html += F("</i>");
+}
+
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr) {
   html += F("<i><label>");
   if (nr > 0) {
diff --git a/src/Markup.h b/src/Markup.h
index 1a348def..872ac2d7 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -25,6 +25,10 @@ void addTextBoxPassword(String& html, const String& input_id, const String& name
 
 void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
 
+void addNumberBox(String& html, const String& input_id, const String& name, const String& placeholder, bool required, const String& value = "\n");
+
+void addLinkBox(String& html, const String& name, const String& url);
+
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0);
 
 void addListGPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr = 0);
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 08bfc445..978c3738 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -380,6 +380,13 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
   if (!digitalRead(0) || forceReset) {
     Serial.println(F("FACTORY RESET!!!"));
 
+    EEPROM.begin(1024);
+    delay(15);
+    for (int i = 1; i < 1024; ++i) {
+      EEPROM.write(i, 0);
+    }
+    EEPROM.end();
+
     ConfigManager->set(KEY_WIFI_SSID, "");
     ConfigManager->set(KEY_WIFI_PASS, "");
     ConfigManager->set(KEY_SUPLA_SERVER, DEFAULT_SERVER);
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 7d2252cd..73b6a35b 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -46,32 +46,33 @@
 #define MAX_DS18B20             10
 #define MAX_GPIO                17
 
-enum _key {
-KEY_SUPLA_GUID,
-KEY_SUPLA_AUTHKEY,
-KEY_WIFI_SSID,
-KEY_WIFI_PASS,
-KEY_LOGIN,
-KEY_LOGIN_PASS,
-KEY_HOST_NAME,
-KEY_SUPLA_SERVER,
-KEY_SUPLA_EMAIL,
-KEY_MAX_RELAY,
-KEY_MAX_BUTTON,
-KEY_MAX_LIMIT_SWITCH,
-KEY_MAX_DHT22,
-KEY_MAX_DHT11,
-KEY_MULTI_MAX_DS18B20,
-KEY_MAX_ROLLERSHUTTER,
-KEY_ALTITUDE_BME280,
-KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT,
-KEY_MAX_IMPULSE_COUNTER,
-KEY_ACTIVE_SENSOR,
-KEY_BOARD,
-KEY_CFG_MODE,
-KEY_GPIO,
-KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
-KEY_DS_NAME = KEY_DS + MAX_DS18B20
+enum _key
+{
+  KEY_SUPLA_GUID,
+  KEY_SUPLA_AUTHKEY,
+  KEY_WIFI_SSID,
+  KEY_WIFI_PASS,
+  KEY_LOGIN,
+  KEY_LOGIN_PASS,
+  KEY_HOST_NAME,
+  KEY_SUPLA_SERVER,
+  KEY_SUPLA_EMAIL,
+  KEY_MAX_RELAY,
+  KEY_MAX_BUTTON,
+  KEY_MAX_LIMIT_SWITCH,
+  KEY_MAX_DHT22,
+  KEY_MAX_DHT11,
+  KEY_MULTI_MAX_DS18B20,
+  KEY_MAX_ROLLERSHUTTER,
+  KEY_ALTITUDE_BME280,
+  KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT,
+  KEY_MAX_IMPULSE_COUNTER,
+  KEY_ACTIVE_SENSOR,
+  KEY_BOARD,
+  KEY_CFG_MODE,
+  KEY_GPIO,
+  KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
+  KEY_DS_NAME = KEY_DS + MAX_DS18B20
 };
 
 //#define GPIO      "GPIO"
@@ -107,7 +108,10 @@ enum _function
   FUNCTION_CLK,
   FUNCTION_CS,
   FUNCTION_D0,
-  FUNCTION_IMPULSE_COUNTER
+  FUNCTION_IMPULSE_COUNTER,
+  FUNCTION_CF,
+  FUNCTION_CF1,
+  FUNCTION_SEL
 };
 
 enum _e_onfig
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 0ec13f80..d16717b8 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -17,13 +17,13 @@
 #include "SuplaConfigManager.h"
 #include "SuplaGuiWiFi.h"
 
-#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_IMPULSE_COUNTER)
-#define TIME_SAVE_PERIOD_SEK 30  // the time is given in seconds
-#define STORAGE_OFFSET       0
+#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
+#define TIME_SAVE_PERIOD_SEK                 30   // the time is given in seconds
+#define TIME_SAVE_PERIOD_IMPULSE_COUNTER_SEK 300  // 5min
+#define STORAGE_OFFSET                       0
 #include <supla/storage/eeprom.h>
 Supla::Eeprom eeprom(STORAGE_OFFSET);
 #endif
-
 namespace Supla {
 namespace GUI {
 void begin() {
@@ -151,6 +151,7 @@ std::vector<Supla::Sensor::ImpulseCounter *> impulseCounter;
 
 void addImpulseCounter(int pin, bool lowToHigh, bool inputPullup, unsigned int debounceDelay) {
   impulseCounter.push_back(new Supla::Sensor::ImpulseCounter(pin, lowToHigh, inputPullup, debounceDelay));
+  eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_IMPULSE_COUNTER_SEK * 1000);
 }
 #endif
 
@@ -182,6 +183,15 @@ std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
 #ifdef SUPLA_OLED
 SuplaOled *oled;
 #endif
+
+#ifdef SUPLA_HLW8012
+Supla::Sensor::HJ101 *counterHLW8012;
+
+void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
+  counterHLW8012 = new Supla::Sensor::HJ101(pinCF, pinCF1, pinSEL);
+  eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_IMPULSE_COUNTER_SEK * 1000);
+}
+#endif
 }  // namespace GUI
 }  // namespace Supla
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index b195aa4b..b6dde7a5 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -74,6 +74,8 @@
 #include <supla/sensor/esp_free_heap.h>
 #endif
 
+#include <supla/sensor/HJ101.h>
+
 namespace Supla {
 namespace GUI {
 
@@ -129,6 +131,12 @@ extern std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
 #ifdef SUPLA_OLED
 extern SuplaOled *oled;
 #endif
+
+#ifdef SUPLA_HLW8012
+extern Supla::Sensor::HJ101 *counterHLW8012;
+void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
+#endif
+
 };  // namespace GUI
 };  // namespace Supla
 
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 72da3f0e..fe887f6e 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -38,6 +38,12 @@ void addButtonCFG(uint8_t gpio) {
   ConfigESP->setGpio(gpio, FUNCTION_CFG_BUTTON);
 }
 
+void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
+  ConfigESP->setGpio(pinCF, FUNCTION_CF);
+  ConfigESP->setGpio(pinCF1, FUNCTION_CF1);
+  ConfigESP->setGpio(pinSEL, FUNCTION_SEL);
+}
+
 void chooseTemplateBoard(uint8_t board) {
   ConfigManager->set(KEY_MAX_BUTTON, "0");
   ConfigManager->set(KEY_MAX_RELAY, "0");
@@ -180,5 +186,17 @@ void chooseTemplateBoard(uint8_t board) {
       addButton(12, Supla::ON_CHANGE);
       addRelay(4);
       break;
+
+    case BOARD_GOSUND_SP111:
+      addLedCFG(2, LOW);
+      addButtonCFG(13);
+      addButton(13, Supla::ON_RELEASE);
+      addRelay(15);
+      addHLW8012(5, 4, 12);
+      Supla::GUI::counterHLW8012->setCurrentMultiplier(18388);
+      Supla::GUI::counterHLW8012->setVoltageMultiplier(247704);
+      Supla::GUI::counterHLW8012->setPowerMultiplier(2586583);
+      Supla::GUI::counterHLW8012->saveState();
+      break;
   }
 }
diff --git a/src/SuplaTemplateBoard.h b/src/SuplaTemplateBoard.h
index f53b83d1..1cfbeed7 100644
--- a/src/SuplaTemplateBoard.h
+++ b/src/SuplaTemplateBoard.h
@@ -10,6 +10,7 @@ void addRelay(uint8_t gpio, uint8_t level = HIGH);
 void addLimitSwitch(uint8_t gpio);
 void addLedCFG(uint8_t gpio, uint8_t level = HIGH);
 void addButtonCFG(uint8_t gpio);
+void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
 
 enum _board
 {
@@ -31,6 +32,7 @@ enum _board
   BOARD_SONOFF_4CH,
   BOARD_YUNSHAN,
   BOARD_YUNTONG_SMART,
+  BOARD_GOSUND_SP111,
   MAX_MODULE
 };
 
@@ -53,10 +55,11 @@ const char SONOFF_TOUCH_3CH[] PROGMEM = "SONOFF TOUCH TRIPLE";
 const char SONOFF_4CH[] PROGMEM = "SONOFF 4CH";
 const char YUNSHAN[] PROGMEM = "Yunshan";
 const char YUNTONG_SMART[] PROGMEM = "YUNTONG Smart";
+const char GOSUNG_SP111[] PROGMEM = "Gosund SP111";
 
 const char* const BOARD_P[MAX_MODULE] PROGMEM = {
     BOARD_NULL, ELECTRODRAGON, INCAN3,    INCAN4,       MELINK,           NEO_COOLCAM,      SHELLY1,    SHELLY2, SONOFF_BASIC, SONOFF_DUAL_R2,
-    SONOFF_S2X, SONOFF_SV,     SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHAN, YUNTONG_SMART};
+    SONOFF_S2X, SONOFF_SV,     SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHAN, YUNTONG_SMART, GOSUNG_SP111};
 
 void chooseTemplateBoard(uint8_t board);
 
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index c085bd65..7e683f54 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -5,7 +5,6 @@
 #include "SuplaCommonPROGMEM.h"
 #include "GUIGenericCommon.h"
 #include "Markup.h"
-#include "SuplaOled.h"
 
 SuplaWebPageSensor *WebPageSensor = new SuplaWebPageSensor();
 
@@ -72,6 +71,16 @@ void SuplaWebPageSensor::createWebPageSensor() {
   }
 #endif
 
+#if defined(SUPLA_HLW8012)
+  path = PATH_START;
+  path += PATH_HLW8012_CALIBRATE;
+  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleHLW8012Calibrate, this));
+
+  path = PATH_START;
+  path += PATH_SAVE_HLW8012_CALIBRATE;
+  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleHLW8012CalibrateSave, this));
+#endif
+
 #endif
 }
 #ifdef SUPLA_DS18B20
@@ -327,6 +336,7 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
   uint8_t nr, suported, selected;
   uint16_t max;
   String page, key;
+
   page += SuplaSaveResult(save);
   page += SuplaJavaScript(PATH_1WIRE);
   page += F("<form method='post' action='");
@@ -499,7 +509,7 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #ifdef SUPLA_OLED
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
     addFormHeader(page);
-    addListBox(page, INPUT_OLED, "OLED", OLED_P, 3, selected);
+    addListBox(page, INPUT_OLED, "OLED", OLED_P, 4, selected);
     addFormHeaderEnd(page);
 #endif
   }
@@ -601,7 +611,7 @@ String SuplaWebPageSensor::supla_webpage_spi(int save) {
 }
 #endif
 
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
 void SuplaWebPageSensor::handleOther() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
@@ -646,6 +656,21 @@ void SuplaWebPageSensor::handleOtherSave() {
   }
 #endif
 
+#ifdef SUPLA_HLW8012
+  if (!WebServer->saveGPIO(INPUT_CF, FUNCTION_CF)) {
+    WebServer->sendContent(supla_webpage_other(6));
+    return;
+  }
+  if (!WebServer->saveGPIO(INPUT_CF1, FUNCTION_CF1)) {
+    WebServer->sendContent(supla_webpage_other(6));
+    return;
+  }
+  if (!WebServer->saveGPIO(INPUT_SEL, FUNCTION_SEL)) {
+    WebServer->sendContent(supla_webpage_other(6));
+    return;
+  }
+#endif
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       WebServer->sendContent(supla_webpage_other(1));
@@ -679,6 +704,18 @@ String SuplaWebPageSensor::supla_webpage_other(int save) {
   }
   addFormHeaderEnd(page);
 #endif
+
+#ifdef SUPLA_HLW8012
+  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " HLW8012");
+  addListGPIOBox(page, INPUT_CF, "CF", FUNCTION_CF);
+  addListGPIOBox(page, INPUT_CF1, "CF1", FUNCTION_CF1);
+  addListGPIOBox(page, INPUT_SEL, "SELi", FUNCTION_SEL);
+  if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
+    addLinkBox(page, "Kalibracja", PATH_HLW8012_CALIBRATE);
+  }
+  addFormHeaderEnd(page);
+#endif
+
   addButtonSubmit(page, S_SAVE);
   addFormEnd(page);
   addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
@@ -829,4 +866,68 @@ String SuplaWebPageSensor::supla_impulse_counter_set(int save) {
 
   return page;
 }
+#endif
+
+#if defined(SUPLA_HLW8012)
+void SuplaWebPageSensor::handleHLW8012Calibrate() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  WebServer->sendContent(suplaWebpageHLW8012Calibrate(0));
+}
+
+void SuplaWebPageSensor::handleHLW8012CalibrateSave() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  double calibPower, calibVoltage = 0;
+  String input = INPUT_CALIB_POWER;
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
+    calibPower = WebServer->httpServer.arg(input).toDouble();
+  }
+
+  input = INPUT_CALIB_VOLTAGE;
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
+    calibVoltage = WebServer->httpServer.arg(input).toDouble();
+  }
+
+  if (calibPower && calibVoltage) {
+    Supla::GUI::counterHLW8012->calibrate(calibPower, calibVoltage);
+    WebServer->sendContent(suplaWebpageHLW8012Calibrate(1));
+  }
+  else {
+    WebServer->sendContent(suplaWebpageHLW8012Calibrate(6));
+  }
+}
+
+String SuplaWebPageSensor::suplaWebpageHLW8012Calibrate(uint8_t save) {
+  String page;
+  page += SuplaSaveResult(save);
+  page += SuplaJavaScript(PATH_HLW8012_CALIBRATE);
+
+  addFormHeader(page);
+  page += F("<p style='color:#000;'>Current Multi: ");
+  page += Supla::GUI::counterHLW8012->getCurrentMultiplier();
+  page += F("<br>Voltage Multi: ");
+  page += Supla::GUI::counterHLW8012->getVoltageMultiplier();
+  page += F("<br>Power Multi: ");
+  page += Supla::GUI::counterHLW8012->getPowerMultiplier();
+  page += F("</p>");
+  addFormHeaderEnd(page);
+
+  addForm(page, F("post"), PATH_SAVE_HLW8012_CALIBRATE);
+  addFormHeader(page, "Ustawienia kalibracji");
+  addNumberBox(page, INPUT_CALIB_POWER, "Moc żarówki [W]", "25", true);
+  addNumberBox(page, INPUT_CALIB_VOLTAGE, "Napięcie [V]", "230", true);
+  addFormHeaderEnd(page);
+
+  addButtonSubmit(page, "Kalibracja");
+  addFormEnd(page);
+
+  addButton(page, S_RETURN, PATH_OTHER);
+  return page;
+}
 #endif
\ No newline at end of file
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index f9cbdd5e..8113cffa 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -127,6 +127,22 @@ class SuplaWebPageSensor {
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
   String supla_webpage_other(int save);
 #endif
+
+#if defined(SUPLA_HLW8012)
+#define INPUT_CF  "cf"
+#define INPUT_CF1 "cf1"
+#define INPUT_SEL "sel"
+
+#define PATH_HLW8012_CALIBRATE      "calibrate"
+#define PATH_SAVE_HLW8012_CALIBRATE "savecalibrate"
+
+#define INPUT_CALIB_POWER   "power"
+#define INPUT_CALIB_VOLTAGE "voltage"
+
+  void handleHLW8012Calibrate();
+  void handleHLW8012CalibrateSave();
+  String suplaWebpageHLW8012Calibrate(uint8_t save);
+#endif
 };
 
 extern SuplaWebPageSensor* WebPageSensor;
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index 4b5d24b1..c364e500 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -38,7 +38,7 @@ void handleUpload(int save) {
   content += getURL(PATH_TOOLS);
   content += F("'><button>");
   content += S_RETURN;
-  content += F("</button></a>");
+  content += F("</button></a><br><br>");
 
   WebServer->sendContent(content);
   // WebServer->httpServer.send(200, PSTR("text/html"), FPSTR(uploadIndex));
@@ -65,6 +65,7 @@ void handleFileUpload() {
         dataFile.close();
         // WebServer->httpServer.sendHeader("Location", "/upload");
         // WebServer->httpServer.send(303);
+        ConfigManager->load();
         handleUpload(1);
       }
       else {

From ef7964f13a281f01435427ba9a056fa289931f6d Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 28 Dec 2020 21:22:03 +0100
Subject: [PATCH 027/165] #define supla_lib_config_h_

---
 lib/SuplaDevice/src/supla/supla_lib_config.h | 2 +-
 src/GUI-Generic_Config.h                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/SuplaDevice/src/supla/supla_lib_config.h b/lib/SuplaDevice/src/supla/supla_lib_config.h
index d6df3384..4e8071bb 100644
--- a/lib/SuplaDevice/src/supla/supla_lib_config.h
+++ b/lib/SuplaDevice/src/supla/supla_lib_config.h
@@ -7,6 +7,6 @@
 #ifndef supla_lib_config_h_
 #define supla_lib_config_h_
 
-//#define SUPLA_COMM_DEBUG
+#define SUPLA_COMM_DEBUG
 
 #endif
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index f81948fb..70aa3273 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -1,6 +1,8 @@
 #ifndef GUI_Generic_Config_h
 #define GUI_Generic_Config_h
 
+#define supla_lib_config_h_  // silences unnecessary debug messages "should be disabled by default"
+
 //#define USE_CUSTOM
 
 // User configuration

From c80c44c8a57ad0a76dbb967a01141d0cb47dad21 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 28 Dec 2020 21:22:37 +0100
Subject: [PATCH 028/165] =?UTF-8?q?zmiana=20czasu=20zapisu=20dla=20licznik?=
 =?UTF-8?q?=C3=B3w=20energi=20na=2010min?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini         | 2 +-
 src/SuplaDeviceGUI.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 2faedc17..1e6fd4bc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.4"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.5"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index d16717b8..6e2d5471 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -19,7 +19,7 @@
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
 #define TIME_SAVE_PERIOD_SEK                 30   // the time is given in seconds
-#define TIME_SAVE_PERIOD_IMPULSE_COUNTER_SEK 300  // 5min
+#define TIME_SAVE_PERIOD_IMPULSE_COUNTER_SEK 600  // 10min
 #define STORAGE_OFFSET                       0
 #include <supla/storage/eeprom.h>
 Supla::Eeprom eeprom(STORAGE_OFFSET);

From 3529abad0b9dfe42ca3e9c4c98af8ff591941e5f Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 29 Dec 2020 06:47:41 +0100
Subject: [PATCH 029/165] =?UTF-8?q?poprawa=20wybierania=20BOARD=5FGOSUND?=
 =?UTF-8?q?=5FSP111=20z=20szablonu=20p=C5=82ytek?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini             | 2 +-
 src/SuplaTemplateBoard.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 1e6fd4bc..36bfbc41 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.5"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.6"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index fe887f6e..474322b8 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -42,6 +42,7 @@ void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
   ConfigESP->setGpio(pinCF, FUNCTION_CF);
   ConfigESP->setGpio(pinCF1, FUNCTION_CF1);
   ConfigESP->setGpio(pinSEL, FUNCTION_SEL);
+  Supla::GUI::addHLW8012(ConfigESP->getGpio(FUNCTION_CF), ConfigESP->getGpio(FUNCTION_CF1), ConfigESP->getGpio(FUNCTION_SEL));
 }
 
 void chooseTemplateBoard(uint8_t board) {

From a895adb44a1ee39370f39229c48925ecf5436bd4 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 12 Jan 2021 06:48:15 +0100
Subject: [PATCH 030/165] =?UTF-8?q?poprawa=20wy=C5=9Bwietlania=20ikonek=20?=
 =?UTF-8?q?na=20OLED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaOled.cpp | 62 ++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 70b9b328..5f792999 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -27,7 +27,7 @@ String getPressureString(double pressure) {
     return F("error");
   }
   else {
-    return String(floor(pressure), 0);
+    return String(pressure, 0);
   }
 }
 
@@ -103,10 +103,8 @@ void displayRelayState(OLEDDisplay* display) {
     }
     x += 15;
   }
-  if (!GEOMETRY_64_48) {
-    display->setColor(WHITE);
-    display->drawHorizontalLine(0, 14, display->getWidth());
-  }
+  display->setColor(WHITE);
+  display->drawHorizontalLine(0, 14, display->getWidth());
 }
 
 void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state) {
@@ -150,27 +148,29 @@ void displayBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, in
 }
 
 void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name) {
+  uint8_t temp_width, temp_height;
+
   int drawHeightIcon = display->getHeight() / 2 - 10;
   int drawStringIcon = display->getHeight() / 2 - 6;
 
-  int temp_width = TEMP_WIDTH;
-  int temp_height = TEMP_HEIGHT;
+  display->setColor(WHITE);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-  if (GEOMETRY_64_48) {
+  if (display->getWidth() <= 64 || display->getHeight() <= 48) {
     temp_width = 0;
     temp_height = 0;
   }
   else {
-    temp_width = temp_width + 10;
-  }
+    display->drawXbm(x + 0, y + drawHeightIcon, TEMP_WIDTH, TEMP_HEIGHT, temp_bits);
+    display->setFont(ArialMT_Plain_10);
+    if (name != NULL) {
+      display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
+    }
 
-  display->setColor(WHITE);
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->drawXbm(x + 0, y + drawHeightIcon, temp_width, temp_height, temp_bits);
-  display->setFont(ArialMT_Plain_10);
-  if (name != NULL) {
-    display->drawString(x + temp_width, y + display->getHeight() / 2 - 15, name);
+    temp_width = TEMP_WIDTH + 10;
+    temp_height = TEMP_HEIGHT;
   }
+
   display->setFont(ArialMT_Plain_24);
   display->drawString(x + temp_width, y + drawStringIcon, getTempString(temp));
   display->setFont(ArialMT_Plain_16);
@@ -178,23 +178,24 @@ void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int
 }
 
 void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity) {
+  uint8_t humidity_width, humidity_height;
+
   int drawHeightIcon = display->getHeight() / 2 - 10;
   int drawStringIcon = display->getHeight() / 2 - 6;
 
-  int humidity_width = HUMIDITY_WIDTH;
-  int humidity_height = HUMIDITY_HEIGHT;
+  display->setColor(WHITE);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-  if (GEOMETRY_64_48) {
+  if (display->getWidth() <= 64 || display->getHeight() <= 48) {
     humidity_width = 0;
     humidity_height = 0;
   }
   else {
-    humidity_width = humidity_width + 10;
+    display->drawXbm(x + 0, y + drawHeightIcon, HUMIDITY_WIDTH, HUMIDITY_HEIGHT, humidity_bits);
+    humidity_width = HUMIDITY_WIDTH + 20;
+    humidity_height = HUMIDITY_HEIGHT;
   }
 
-  display->setColor(WHITE);
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->drawXbm(x + 0, y + drawHeightIcon, humidity_width, humidity_height, humidity_bits);
   display->setFont(ArialMT_Plain_24);
   display->drawString(x + humidity_width, y + drawStringIcon, getHumidityString(humidity));
   display->setFont(ArialMT_Plain_16);
@@ -202,23 +203,24 @@ void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x,
 }
 
 void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure) {
+  uint8_t pressure_width, pressure_height;
+
   int drawHeightIcon = display->getHeight() / 2 - 10;
   int drawStringIcon = display->getHeight() / 2 - 6;
 
-  int pressure_width = PRESSURE_WIDTH;
-  int pressure_height = PRESSURE_HEIGHT;
+  display->setColor(WHITE);
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-  if (GEOMETRY_64_48) {
+  if (display->getWidth() <= 64 || display->getHeight() <= 48) {
     pressure_width = 0;
     pressure_height = 0;
   }
   else {
-    pressure_width = pressure_width + 15;
+    display->drawXbm(x + 0, y + drawHeightIcon, PRESSURE_WIDTH, PRESSURE_HEIGHT, pressure_bits);
+    pressure_width = PRESSURE_WIDTH + 15;
+    pressure_height = PRESSURE_HEIGHT;
   }
 
-  display->setColor(WHITE);
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->drawXbm(x + 0, y + drawHeightIcon, pressure_width, pressure_height, pressure_bits);
   display->setFont(ArialMT_Plain_24);
   display->drawString(x + pressure_width, y + drawStringIcon, getPressureString(pressure));
   display->setFont(ArialMT_Plain_10);

From da2d73acd3d0fba846aa94d9254a5cea43ca9b3a Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 12 Jan 2021 06:50:06 +0100
Subject: [PATCH 031/165] aktualizacja SuplaDevice

---
 .../SequenceButton/SequenceButton.ino         |  92 +++++++
 lib/SuplaDevice/extras/test/CMakeLists.txt    |  39 +++
 .../extras/test/UptimeTests/uptime_tests.cpp  |  60 ++++
 lib/SuplaDevice/src/CMakeLists.txt            |   5 +
 .../src/supla/control/MCP23017/S_MCP23017.cpp | 205 ++++++++++++++
 .../src/supla/control/MCP23017/S_MCP23017.h   |  52 ++++
 .../Ejemplo_Mcp23017_io.ino                   | 189 +++++++++++++
 .../src/supla/control/MCP23017/readme.txt     |  15 +
 .../supla/control/MCP23017/supla_mcp23017.h   |  78 ++++++
 .../src/supla/control/bistable_relay.cpp      |   7 +-
 .../supla/control/bistable_roller_shutter.cpp |  11 +-
 lib/SuplaDevice/src/supla/control/button.cpp  | 107 ++-----
 lib/SuplaDevice/src/supla/control/button.h    |  40 +--
 lib/SuplaDevice/src/supla/control/relay.cpp   |  50 ++--
 .../src/supla/control/roller_shutter.cpp      |  20 +-
 .../src/supla/control/sequence_button.cpp     | 137 +++++++++
 .../src/supla/control/sequence_button.h       |  58 ++++
 .../src/supla/control/simple_button.cpp       | 108 ++++++++
 .../src/supla/control/simple_button.h         |  71 +++++
 .../src/supla/control/virtual_relay.h         |   4 +
 lib/SuplaDevice/src/supla/events.h            |   5 +-
 lib/SuplaDevice/src/supla/io.cpp              |  25 ++
 lib/SuplaDevice/src/supla/io.h                |   5 +
 .../src/supla/network/esp32_wifi.h            | 115 +-------
 lib/SuplaDevice/src/supla/network/esp_wifi.h  |  90 ++++--
 lib/SuplaDevice/src/supla/pv/afore.cpp        |  15 +-
 lib/SuplaDevice/src/supla/pv/afore.h          |   1 +
 lib/SuplaDevice/src/supla/pv/fronius.cpp      |  15 +-
 lib/SuplaDevice/src/supla/pv/fronius.h        |   1 +
 lib/SuplaDevice/src/supla/sensor/binary.cpp   |  45 +++
 lib/SuplaDevice/src/supla/sensor/binary.h     |  31 +--
 .../src/supla/sensor/electricity_meter.cpp    | 260 ++++++++++++++++++
 .../src/supla/sensor/electricity_meter.h      | 203 ++------------
 .../src/supla/sensor/impulse_counter.cpp      |   7 +-
 lib/SuplaDevice/src/supla/storage/storage.cpp |  14 +
 lib/SuplaDevice/src/supla/storage/storage.h   |   2 +
 lib/SuplaDevice/src/supla/timer.cpp           |  23 +-
 37 files changed, 1682 insertions(+), 523 deletions(-)
 create mode 100644 lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino
 create mode 100644 lib/SuplaDevice/extras/test/CMakeLists.txt
 create mode 100644 lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp
 create mode 100644 lib/SuplaDevice/src/CMakeLists.txt
 create mode 100644 lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.h
 create mode 100644 lib/SuplaDevice/src/supla/control/MCP23017/examples/Ejemplo_Mcp23017_io/Ejemplo_Mcp23017_io.ino
 create mode 100644 lib/SuplaDevice/src/supla/control/MCP23017/readme.txt
 create mode 100644 lib/SuplaDevice/src/supla/control/MCP23017/supla_mcp23017.h
 create mode 100644 lib/SuplaDevice/src/supla/control/sequence_button.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/sequence_button.h
 create mode 100644 lib/SuplaDevice/src/supla/control/simple_button.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/simple_button.h
 create mode 100644 lib/SuplaDevice/src/supla/sensor/binary.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/electricity_meter.cpp

diff --git a/lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino b/lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino
new file mode 100644
index 00000000..8647974a
--- /dev/null
+++ b/lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino
@@ -0,0 +1,92 @@
+/*
+  Copyright (C) AC SOFTWARE SP. Z O.O.
+  
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <SPI.h>
+#include <SuplaDevice.h>
+#include <supla/control/relay.h>
+#include <supla/control/sequence_button.h>
+
+// Choose proper network interface for your card:
+// Arduino Mega with EthernetShield W5100:
+//#include <supla/network/ethernet_shield.h>
+// Ethernet MAC address
+//uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+//Supla::EthernetShield ethernet(mac);
+//
+// Arduino Mega with ENC28J60:
+// #include <supla/network/ENC28J60.h>
+// Supla::ENC28J60 ethernet(mac);
+//
+// ESP8266 based board:
+#include <supla/network/esp_wifi.h>
+Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+//
+// ESP32 based board:
+// #include <supla/network/esp32_wifi.h>
+// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+
+
+void setup() {
+
+  Serial.begin(115200);
+
+  // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
+  char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+  // Replace the following AUTHKEY with value that you can retrieve from: https://www.supla.org/arduino/get-authkey
+  char AUTHKEY[SUPLA_AUTHKEY_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+ 
+  /*
+   * Having your device already registered at cloud.supla.org,
+   * you want to change CHANNEL sequence or remove any of them,
+   * then you must also remove the device itself from cloud.supla.org.
+   * Otherwise you will get "Channel conflict!" error.
+   */
+    
+  auto secretRelay = new Supla::Control::Relay(30, false); // Low level trigger relay on pin 30 
+  auto alarmRelay = new Supla::Control::Relay(31, false);  // Low level trigger relay on pin 31
+  auto seqButton = new Supla::Control::SequenceButton(D9, true, true); // Button on pin 28 with internal pullUp 
+                                                                       // and LOW is considered as "pressed" state
+
+  // Sequence of lenghts [ms] of button being presset, released, pressed, released, etc.
+  // Aplication will print on Serial recorded sequence, so use it to record your rhythm and put it here
+  uint16_t sequence[30] = {90, 590, 90, 140, 90, 290, 90, 230, 90, 140, 90};
+
+  seqButton->setSequence(sequence);
+  seqButton->setMargin(0.5);  // we allow +- 50% deviation of state length compared to matching sequence
+
+  // Button will trigger secretRelay when correct rhythm will be detected or alarmRelay otherwise
+  seqButton->addAction(Supla::TURN_ON, secretRelay, Supla::ON_SEQUENCE_MATCH);
+  seqButton->addAction(Supla::TURN_ON, alarmRelay, Supla::ON_SEQUENCE_DOESNT_MATCH);
+ 
+  /*
+   * SuplaDevice Initialization.
+   * Server address is available at https://cloud.supla.org 
+   * If you do not have an account, you can create it at https://cloud.supla.org/account/create
+   * SUPLA and SUPLA CLOUD are free of charge
+   * 
+   */
+ 
+  SuplaDevice.begin(GUID,              // Global Unique Identifier 
+                    "svr1.supla.org",  // SUPLA server address
+                    "email@address",   // Email address used to login to Supla Cloud
+                    AUTHKEY);          // Authorization key
+    
+}
+
+void loop() {
+  SuplaDevice.iterate();
+}
diff --git a/lib/SuplaDevice/extras/test/CMakeLists.txt b/lib/SuplaDevice/extras/test/CMakeLists.txt
new file mode 100644
index 00000000..12e94f97
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/CMakeLists.txt
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 3.11)
+
+project(supladevice)
+
+enable_testing()
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
+include_directories(../../src)
+
+add_subdirectory(../../src/ build)
+
+include(FetchContent)
+
+FetchContent_Declare(
+  googletest
+  GIT_REPOSITORY https://github.com/google/googletest.git
+  GIT_TAG        release-1.8.0
+  )
+
+FetchContent_GetProperties(googletest)
+if(NOT googletest_POPULATED)
+  FetchContent_Populate(googletest)
+  add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
+endif()
+
+file(GLOB SRCS UptimeTests/*.cpp)
+
+add_executable(supladevicetests ${SRCS})
+
+target_link_libraries(supladevicetests
+  gtest
+  gtest_main
+  supladevicelib
+  )
+
+add_test(NAME supladevicetests
+  COMMAND supladevicetests)
diff --git a/lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp b/lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp
new file mode 100644
index 00000000..0280d0e1
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp
@@ -0,0 +1,60 @@
+#include <gtest/gtest.h>
+#include <supla/uptime.h>
+
+TEST(UptimeTests, LastResetCauseSetAndGet) {
+  Supla::Uptime uptime;
+  EXPECT_EQ(uptime.getUptime(), 0);
+  EXPECT_EQ(uptime.getConnectionUptime(), 0);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+
+  // setter should not work unless first resetConnectionUptime is called
+  uptime.setConnectionLostCause(SUPLA_LASTCONNECTIONRESETCAUSE_WIFI_CONNECTION_LOST);
+  EXPECT_EQ(uptime.getUptime(), 0);
+  EXPECT_EQ(uptime.getConnectionUptime(), 0);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+
+  uptime.resetConnectionUptime();
+  uptime.setConnectionLostCause(SUPLA_LASTCONNECTIONRESETCAUSE_WIFI_CONNECTION_LOST);
+  EXPECT_EQ(uptime.getUptime(), 0);
+  EXPECT_EQ(uptime.getConnectionUptime(), 0);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_WIFI_CONNECTION_LOST);
+}
+
+TEST(UptimeTests, IterateShouldIncreaseUptimeCounters) {
+  Supla::Uptime uptime;
+  unsigned long millis = 0;
+
+  EXPECT_EQ(uptime.getUptime(), 0);
+  EXPECT_EQ(uptime.getConnectionUptime(), 0);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+
+  millis += 999;
+  uptime.iterate(millis);
+  EXPECT_EQ(uptime.getUptime(), 0);
+  EXPECT_EQ(uptime.getConnectionUptime(), 0);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+
+  millis += 1500;
+  uptime.iterate(millis);
+  EXPECT_EQ(uptime.getUptime(), 2);
+  EXPECT_EQ(uptime.getConnectionUptime(), 2);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+
+  millis += 20000;
+  uptime.iterate(millis);
+  EXPECT_EQ(uptime.getUptime(), 22);
+  EXPECT_EQ(uptime.getConnectionUptime(), 22);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+
+  uptime.resetConnectionUptime();
+  EXPECT_EQ(uptime.getUptime(), 22);
+  EXPECT_EQ(uptime.getConnectionUptime(), 0);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+
+  millis += 2500;
+  uptime.iterate(millis);
+  EXPECT_EQ(uptime.getUptime(), 24);
+  EXPECT_EQ(uptime.getConnectionUptime(), 2);
+  EXPECT_EQ(uptime.getLastResetCause(), SUPLA_LASTCONNECTIONRESETCAUSE_UNKNOWN);
+}
+
diff --git a/lib/SuplaDevice/src/CMakeLists.txt b/lib/SuplaDevice/src/CMakeLists.txt
new file mode 100644
index 00000000..2643ea2b
--- /dev/null
+++ b/lib/SuplaDevice/src/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(SRCS 
+  supla/uptime.cpp
+)
+
+add_library(supladevicelib SHARED ${SRCS})
diff --git a/lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.cpp b/lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.cpp
new file mode 100644
index 00000000..af9a21c3
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.cpp
@@ -0,0 +1,205 @@
+#include <Wire.h>
+#include <FunctionalInterrupt.h>
+#include "S_MCP23017.h"
+
+static const uint8_t MCP23017_BASEADDRESS = 0x20;
+
+static const uint8_t MCP23017_IODIRA = 0x00;
+static const uint8_t MCP23017_IODIRB = 0x01;
+static const uint8_t MCP23017_IPOLA = 0x02;
+static const uint8_t MCP23017_IPOLB = 0x03;
+static const uint8_t MCP23017_GPINTENA = 0x04;
+static const uint8_t MCP23017_GPINTENB = 0x05;
+static const uint8_t MCP23017_DEFVALA = 0x06;
+static const uint8_t MCP23017_DEFVALB = 0x07;
+static const uint8_t MCP23017_INTCONA = 0x08;
+static const uint8_t MCP23017_INTCONB = 0x09;
+static const uint8_t MCP23017_IOCONA = 0x0A;
+static const uint8_t MCP23017_IOCONB = 0x0B;
+static const uint8_t MCP23017_GPPUA = 0x0C;
+static const uint8_t MCP23017_GPPUB = 0x0D;
+static const uint8_t MCP23017_INTFA = 0x0E;
+static const uint8_t MCP23017_INTFB = 0x0F;
+static const uint8_t MCP23017_INTCAPA = 0x10;
+static const uint8_t MCP23017_INTCAPB = 0x11;
+static const uint8_t MCP23017_GPIOA = 0x12;
+static const uint8_t MCP23017_GPIOB = 0x13;
+static const uint8_t MCP23017_OLATA = 0x14;
+static const uint8_t MCP23017_OLATB = 0x15;
+
+#ifdef ESP8266
+void MCP23017::init(uint8_t sda, uint8_t scl, bool fast) {
+  Wire.begin(sda, scl);
+  if (fast)
+    Wire.setClock(400000);
+}
+#else
+void MCP23017::init(bool fast) {
+  Wire.begin();
+  if (fast)
+    Wire.setClock(400000);
+}
+#endif
+
+bool MCP23017::begin(uint8_t address) {
+  _address = MCP23017_BASEADDRESS | (address & 0x07);
+  return (writeReg16(MCP23017_IOCONA, 0x4242) && writeReg16(MCP23017_IODIRA, 0xFFFF)); // INT MIRROR & INT POL HIGH, ALL INPUTS
+}
+
+void MCP23017::pinMode(uint8_t pin, uint8_t mode) {
+  if (pin < 16) {
+    if (mode == OUTPUT) {
+      updateReg(pin < 8 ? MCP23017_IODIRA : MCP23017_IODIRB, ~(uint8_t)(1 << (pin % 8)), 0x00);
+    } else if ((mode == INPUT) || (mode == INPUT_PULLUP)) {
+      updateReg(pin < 8 ? MCP23017_IODIRA : MCP23017_IODIRB, 0xFF, 1 << (pin % 8));
+      if (mode == INPUT_PULLUP) {
+        updateReg(pin < 8 ? MCP23017_GPPUA : MCP23017_GPPUB, 0xFF, 1 << (pin % 8));
+        updateReg(pin < 8 ? MCP23017_IPOLA : MCP23017_IPOLB, 0xFF, 1 << (pin % 8));
+      } else {
+        updateReg(pin < 8 ? MCP23017_GPPUA : MCP23017_GPPUB, ~(uint8_t)(1 << (pin % 8)), 0x00);
+        updateReg(pin < 8 ? MCP23017_IPOLA : MCP23017_IPOLB, ~(uint8_t)(1 << (pin % 8)), 0x00);
+      }
+    }
+  }
+}
+
+void MCP23017::setPullup(uint8_t pin, bool pullup, bool inverse) {
+  if (pin < 16) {
+    if (pullup)
+      updateReg(pin < 8 ? MCP23017_GPPUA : MCP23017_GPPUB, 0xFF, 1 << (pin % 8));
+    else
+      updateReg(pin < 8 ? MCP23017_GPPUA : MCP23017_GPPUB, ~(uint8_t)(1 << (pin % 8)), 0x00);
+    if (inverse)
+      updateReg(pin < 8 ? MCP23017_IPOLA : MCP23017_IPOLB, 0xFF, 1 << (pin % 8));
+    else
+      updateReg(pin < 8 ? MCP23017_IPOLA : MCP23017_IPOLB, ~(uint8_t)(1 << (pin % 8)), 0x00);
+  }
+}
+
+bool MCP23017::digitalRead(uint8_t pin) {
+  unsigned long now = millis();
+  if (now > get_ba){
+    ba = readReg16(MCP23017_GPIOA);  // --------- reads "readReg16" only once every 20 ms  ----
+    get_ba = now + 20;  
+  }
+  if (pin < 16) {
+    return ((ba >> (pin % 16)) & 0x01);
+  }
+}
+
+void MCP23017::digitalWrite(uint8_t pin, bool value) {
+  if (pin < 16) {
+    if (value)
+      updateReg(pin < 8 ? MCP23017_GPIOA : MCP23017_GPIOB, 0xFF, 1 << (pin % 8));
+    else
+      updateReg(pin < 8 ? MCP23017_GPIOA : MCP23017_GPIOB, ~(uint8_t)(1 << (pin % 8)), 0x00);
+  }
+}
+
+uint16_t MCP23017::digitalReads() {
+  return readReg16(MCP23017_GPIOA);
+}
+
+void MCP23017::digitalWrites(uint16_t values) {
+  writeReg16(MCP23017_GPIOA, values);
+}
+
+void MCP23017::attachInterrupt(uint8_t pin, callback_t callback) {
+  _callback = callback;
+  ::pinMode(pin, INPUT);
+  ::attachInterrupt(digitalPinToInterrupt(pin), std::bind(&MCP23017::_interrupt, this), RISING);
+}
+
+void MCP23017::detachInterrupt(uint8_t pin) {
+  ::detachInterrupt(digitalPinToInterrupt(pin));
+  _callback = NULL;
+}
+
+void MCP23017::setupInterrupt(uint8_t pin, bool enable) {
+  if (pin < 16) {
+    if (enable)
+      updateReg(pin < 8 ? MCP23017_GPINTENA : MCP23017_GPINTENB, 0xFF, 1 << (pin % 8));
+    else
+      updateReg(pin < 8 ? MCP23017_GPINTENA : MCP23017_GPINTENB, ~(uint8_t)(1 << (pin % 8)), 0x00);
+  }
+}
+
+void MCP23017::setupInterrupts(uint16_t pins, bool enable) {
+  if (enable)
+    updateReg16(MCP23017_GPINTENA, 0xFFFF, pins);
+  else
+    updateReg16(MCP23017_GPINTENA, ~pins, 0x00);
+}
+
+bool MCP23017::writeReg(uint8_t reg, uint8_t value) {
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  Wire.write(value);
+  return (Wire.endTransmission() == 0);
+}
+
+bool MCP23017::writeReg16(uint8_t reg, uint16_t value) {
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  Wire.write(value & 0xFF);
+  Wire.write(value >> 8);
+  return (Wire.endTransmission() == 0);
+}
+
+uint8_t MCP23017::readReg(uint8_t reg) {
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  if (Wire.endTransmission() != 0)
+    return 0; // Error!
+  Wire.requestFrom(_address, (uint8_t)1);
+  return Wire.read();
+}
+
+uint16_t MCP23017::readReg16(uint8_t reg) {
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  if (Wire.endTransmission() != 0)
+    return 0; // Error!
+  Wire.requestFrom(_address, (uint8_t)2);
+  uint8_t a = Wire.read();
+  return ((Wire.read() << 8) | a);
+}
+
+bool MCP23017::updateReg(uint8_t reg, uint8_t andMask, uint8_t orMask) {
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  if (Wire.endTransmission() != 0)
+    return false; // Error!
+  Wire.requestFrom(_address, (uint8_t)1);
+  uint8_t a = (Wire.read() & andMask) | orMask;
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  Wire.write(a);
+  return (Wire.endTransmission() == 0);
+}
+
+bool MCP23017::updateReg16(uint8_t reg, uint16_t andMask, uint16_t orMask) {
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  if (Wire.endTransmission() != 0)
+    return false; // Error!
+  Wire.requestFrom(_address, (uint8_t)2);
+  uint16_t ab = Wire.read();
+  ab |= (Wire.read() << 8);
+  ab &= andMask;
+  ab |= orMask;
+  Wire.beginTransmission(_address);
+  Wire.write(reg);
+  Wire.write(ab & 0xFF);
+  Wire.write(ab >> 8);
+  return (Wire.endTransmission() == 0);
+}
+
+void IRAM_ATTR MCP23017::_interrupt() {
+  uint16_t pins, values;
+
+  pins = readReg16(MCP23017_INTFA);
+  values = readReg16(MCP23017_INTCAPA);
+  if (_callback)
+    _callback(pins, values);
+}
diff --git a/lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.h b/lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.h
new file mode 100644
index 00000000..ef08791e
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/MCP23017/S_MCP23017.h
@@ -0,0 +1,52 @@
+#ifndef _S_MCP23017_H
+#define _S_MCP23017_H
+
+#include <Arduino.h>
+#include <functional>
+
+class MCP23017 {
+public:
+  typedef std::function<void(uint16_t pins, uint16_t values)> callback_t;
+
+  MCP23017() : _callback(NULL) {}
+
+#ifdef ESP8266
+  static void init(uint8_t sda, uint8_t scl, bool fast = true);
+  static void init(bool fast = true) {
+    init(SDA, SCL, fast);
+  }
+#else
+  static void init(bool fast = true);
+#endif
+
+  bool begin(uint8_t address = 0);
+
+  void pinMode(uint8_t pin, uint8_t mode);
+  void setPullup(uint8_t pin, bool pullup, bool inverse = false);
+  bool digitalRead(uint8_t pin);
+  void digitalWrite(uint8_t pin, bool value);
+  uint16_t digitalReads();
+  void digitalWrites(uint16_t values);
+
+  void attachInterrupt(uint8_t pin, callback_t callback);
+  void detachInterrupt(uint8_t pin);
+  void setupInterrupt(uint8_t pin, bool enable = true);
+  void setupInterrupts(uint16_t pins, bool enable = true);
+
+protected:
+  bool writeReg(uint8_t reg, uint8_t value);
+  bool writeReg16(uint8_t reg, uint16_t value);
+  uint8_t readReg(uint8_t reg);
+  uint16_t readReg16(uint8_t reg);
+  bool updateReg(uint8_t reg, uint8_t andMask, uint8_t orMask);
+  bool updateReg16(uint8_t reg, uint16_t andMask, uint16_t orMask);
+
+  void _interrupt();
+
+  uint8_t _address;
+  uint16_t ba = 0;
+  unsigned long get_ba = 0;
+  callback_t _callback;
+};
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/MCP23017/examples/Ejemplo_Mcp23017_io/Ejemplo_Mcp23017_io.ino b/lib/SuplaDevice/src/supla/control/MCP23017/examples/Ejemplo_Mcp23017_io/Ejemplo_Mcp23017_io.ino
new file mode 100644
index 00000000..dd4ee2be
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/MCP23017/examples/Ejemplo_Mcp23017_io/Ejemplo_Mcp23017_io.ino
@@ -0,0 +1,189 @@
+#define supla_lib_config_h_  // silences unnecessary debug messages "should be disabled by default"
+#include <SuplaDevice.h>
+#include <supla/control/button.h>
+#include <supla/control/relay.h>
+#include <supla_mcp23017.h>
+
+//
+// ESP8266 based board:
+#include <supla/network/esp_wifi.h>
+Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+//
+
+void setup() {
+
+  Serial.begin(115200);
+
+  mcp1.init(4, 5); // init(uint8_t sda, uint8_t scl, bool fast)  =  Wire.begin
+
+  if (! mcp1.begin(0))Serial.println("MCP23017 1 not found!"); // begin(uint8_t address)  "Pin 100 - 115"  
+  if (! mcp2.begin(1))Serial.println("MCP23017 2 not found!"); // begin(uint8_t address)  "Pin 116 - 131"
+  if (! mcp3.begin(2))Serial.println("MCP23017 3 not found!"); // begin(uint8_t address)  "Pin 132 - 147"
+  if (! mcp4.begin(3))Serial.println("MCP23017 4 not found!"); // begin(uint8_t address)  "Pin 148 - 163"
+
+  // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
+  char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+  // Replace the following AUTHKEY with value that you can retrieve from: https://www.supla.org/arduino/get-authkey
+  char AUTHKEY[SUPLA_AUTHKEY_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+ 
+  /*
+   * Having your device already registered at cloud.supla.org,
+   * you want to change CHANNEL sequence or remove any of them,
+   * then you must also remove the device itself from cloud.supla.org.
+   * Otherwise you will get "Channel conflict!" error.
+   */
+    
+    auto relay_1 = new Supla::Control::Relay(100, true);
+    auto relay_2 = new Supla::Control::Relay(101, true);
+    auto relay_3 = new Supla::Control::Relay(102, true);
+    auto relay_4 = new Supla::Control::Relay(103, true);
+    auto relay_5 = new Supla::Control::Relay(104, true);
+    auto relay_6 = new Supla::Control::Relay(105, true);
+    auto relay_7 = new Supla::Control::Relay(106, true);
+    auto relay_8 = new Supla::Control::Relay(107, true);
+    auto relay_9 = new Supla::Control::Relay(108, true);
+    auto relay_10 = new Supla::Control::Relay(109, true);
+    auto relay_11 = new Supla::Control::Relay(110, true);
+    auto relay_12 = new Supla::Control::Relay(111, true);
+    auto relay_13 = new Supla::Control::Relay(112, true);
+    auto relay_14 = new Supla::Control::Relay(113, true);
+    auto relay_15 = new Supla::Control::Relay(114, true);
+    auto relay_16 = new Supla::Control::Relay(115, true);
+
+    auto relay_17 = new Supla::Control::Relay(148, true);
+    auto relay_18 = new Supla::Control::Relay(149, true);
+    auto relay_19 = new Supla::Control::Relay(150, true);
+    auto relay_20 = new Supla::Control::Relay(151, true);
+    auto relay_21 = new Supla::Control::Relay(152, true);
+    auto relay_22 = new Supla::Control::Relay(153, true);
+    auto relay_23 = new Supla::Control::Relay(154, true);
+    auto relay_24 = new Supla::Control::Relay(155, true);
+    auto relay_25 = new Supla::Control::Relay(156, true);
+    auto relay_26 = new Supla::Control::Relay(157, true);
+    auto relay_27 = new Supla::Control::Relay(158, true);
+    auto relay_28 = new Supla::Control::Relay(159, true);
+    auto relay_29 = new Supla::Control::Relay(160, true);
+    auto relay_30 = new Supla::Control::Relay(161, true);
+    auto relay_31 = new Supla::Control::Relay(162, true);
+    auto relay_32 = new Supla::Control::Relay(163, true);
+
+    auto button_1 = new Supla::Control::Button(116, true, true); 
+    auto button_2 = new Supla::Control::Button(117, true, true); 
+    auto button_3 = new Supla::Control::Button(118, true, true); 
+    auto button_4 = new Supla::Control::Button(119, true, true); 
+    auto button_5 = new Supla::Control::Button(120, true, true); 
+    auto button_6 = new Supla::Control::Button(121, true, true); 
+    auto button_7 = new Supla::Control::Button(122, true, true); 
+    auto button_8 = new Supla::Control::Button(123, true, true);
+    auto button_9 = new Supla::Control::Button(124, true, true); 
+    auto button_10 = new Supla::Control::Button(125, true, true); 
+    auto button_11 = new Supla::Control::Button(126, true, true); 
+    auto button_12 = new Supla::Control::Button(127, true, true); 
+    auto button_13 = new Supla::Control::Button(128, true, true); 
+    auto button_14 = new Supla::Control::Button(129, true, true); 
+    auto button_15 = new Supla::Control::Button(130, true, true); 
+    auto button_16 = new Supla::Control::Button(131, true, true); 
+
+    auto button_17 = new Supla::Control::Button(132, true, true); 
+    auto button_18 = new Supla::Control::Button(133, true, true); 
+    auto button_19 = new Supla::Control::Button(134, true, true); 
+    auto button_20 = new Supla::Control::Button(135, true, true); 
+    auto button_21 = new Supla::Control::Button(136, true, true); 
+    auto button_22 = new Supla::Control::Button(137, true, true); 
+    auto button_23 = new Supla::Control::Button(138, true, true); 
+    auto button_24 = new Supla::Control::Button(139, true, true);
+    auto button_25 = new Supla::Control::Button(140, true, true); 
+    auto button_26 = new Supla::Control::Button(141, true, true); 
+    auto button_27 = new Supla::Control::Button(142, true, true); 
+    auto button_28 = new Supla::Control::Button(143, true, true); 
+    auto button_29 = new Supla::Control::Button(144, true, true); 
+    auto button_30 = new Supla::Control::Button(145, true, true); 
+    auto button_31 = new Supla::Control::Button(146, true, true); 
+    auto button_32 = new Supla::Control::Button(147, true, true);
+      
+    button_1->addAction(Supla::TOGGLE, relay_1, Supla::ON_PRESS);
+    button_1->setSwNoiseFilterDelay(50);
+    button_2->addAction(Supla::TOGGLE, relay_2, Supla::ON_PRESS);
+    button_2->setSwNoiseFilterDelay(50);
+    button_3->addAction(Supla::TOGGLE, relay_3, Supla::ON_PRESS);
+    button_3->setSwNoiseFilterDelay(50);
+    button_4->addAction(Supla::TOGGLE, relay_4, Supla::ON_PRESS);
+    button_4->setSwNoiseFilterDelay(50);
+    button_5->addAction(Supla::TOGGLE, relay_5, Supla::ON_PRESS);
+    button_5->setSwNoiseFilterDelay(50);
+    button_6->addAction(Supla::TOGGLE, relay_6, Supla::ON_PRESS);
+    button_6->setSwNoiseFilterDelay(50);
+    button_7->addAction(Supla::TOGGLE, relay_7, Supla::ON_PRESS);
+    button_7->setSwNoiseFilterDelay(50);
+    button_8->addAction(Supla::TOGGLE, relay_8, Supla::ON_PRESS);
+    button_8->setSwNoiseFilterDelay(50);
+    button_9->addAction(Supla::TOGGLE, relay_9, Supla::ON_PRESS);
+    button_9->setSwNoiseFilterDelay(50);
+    button_10->addAction(Supla::TOGGLE, relay_10, Supla::ON_PRESS);
+    button_10->setSwNoiseFilterDelay(50);
+    button_11->addAction(Supla::TOGGLE, relay_11, Supla::ON_PRESS);
+    button_11->setSwNoiseFilterDelay(50);
+    button_12->addAction(Supla::TOGGLE, relay_12, Supla::ON_PRESS);
+    button_12->setSwNoiseFilterDelay(50);
+    button_13->addAction(Supla::TOGGLE, relay_13, Supla::ON_PRESS);
+    button_13->setSwNoiseFilterDelay(50);
+    button_14->addAction(Supla::TOGGLE, relay_14, Supla::ON_PRESS);
+    button_14->setSwNoiseFilterDelay(50);
+    button_15->addAction(Supla::TOGGLE, relay_15, Supla::ON_PRESS);
+    button_15->setSwNoiseFilterDelay(50);
+    button_16->addAction(Supla::TOGGLE, relay_16, Supla::ON_PRESS);
+    button_16->setSwNoiseFilterDelay(50);
+
+    button_17->addAction(Supla::TOGGLE, relay_17, Supla::ON_PRESS);
+    button_17->setSwNoiseFilterDelay(50);
+    button_18->addAction(Supla::TOGGLE, relay_18, Supla::ON_PRESS);
+    button_18->setSwNoiseFilterDelay(50);
+    button_19->addAction(Supla::TOGGLE, relay_19, Supla::ON_PRESS);
+    button_19->setSwNoiseFilterDelay(50);
+    button_20->addAction(Supla::TOGGLE, relay_20, Supla::ON_PRESS);
+    button_20->setSwNoiseFilterDelay(50);
+    button_21->addAction(Supla::TOGGLE, relay_21, Supla::ON_PRESS);
+    button_21->setSwNoiseFilterDelay(50);
+    button_22->addAction(Supla::TOGGLE, relay_22, Supla::ON_PRESS);
+    button_22->setSwNoiseFilterDelay(50);
+    button_23->addAction(Supla::TOGGLE, relay_23, Supla::ON_PRESS);
+    button_23->setSwNoiseFilterDelay(50);
+    button_24->addAction(Supla::TOGGLE, relay_24, Supla::ON_PRESS);
+    button_24->setSwNoiseFilterDelay(50);
+    button_25->addAction(Supla::TOGGLE, relay_25, Supla::ON_PRESS);
+    button_25->setSwNoiseFilterDelay(50);
+    button_26->addAction(Supla::TOGGLE, relay_26, Supla::ON_PRESS);
+    button_26->setSwNoiseFilterDelay(50);
+    button_27->addAction(Supla::TOGGLE, relay_27, Supla::ON_PRESS);
+    button_27->setSwNoiseFilterDelay(50);
+    button_28->addAction(Supla::TOGGLE, relay_28, Supla::ON_PRESS);
+    button_28->setSwNoiseFilterDelay(50);
+    button_29->addAction(Supla::TOGGLE, relay_29, Supla::ON_PRESS);
+    button_29->setSwNoiseFilterDelay(50);
+    button_30->addAction(Supla::TOGGLE, relay_30, Supla::ON_PRESS);
+    button_30->setSwNoiseFilterDelay(50);
+    button_31->addAction(Supla::TOGGLE, relay_31, Supla::ON_PRESS);
+    button_31->setSwNoiseFilterDelay(50);
+    button_32->addAction(Supla::TOGGLE, relay_32, Supla::ON_PRESS);
+    button_32->setSwNoiseFilterDelay(50);
+ 
+  /*
+   * SuplaDevice Initialization.
+   * Server address is available at https://cloud.supla.org 
+   * If you do not have an account, you can create it at https://cloud.supla.org/account/create
+   * SUPLA and SUPLA CLOUD are free of charge
+   * 
+   */
+ 
+  SuplaDevice.begin(GUID,              // Global Unique Identifier 
+                    "svr1.supla.org",  // SUPLA server address
+                    "email@address",   // Email address used to login to Supla Cloud
+                    AUTHKEY);          // Authorization key
+    
+}
+
+void loop() {
+  SuplaDevice.iterate();
+  delay(25);
+}
diff --git a/lib/SuplaDevice/src/supla/control/MCP23017/readme.txt b/lib/SuplaDevice/src/supla/control/MCP23017/readme.txt
new file mode 100644
index 00000000..9cb235ee
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/MCP23017/readme.txt
@@ -0,0 +1,15 @@
+Support for up to 4 x "MCP23017" additional 64 Gpios.
+
+
+BASIC USE:
+
+INSTANTIATE
+#include <supla_mcp23017.h>
+
+SETUP
+  mcp1.init(uint8_t sda, uint8_t scl);  //  init(uint8_t sda, uint8_t scl) = Wire.begin();
+
+  mcp1.begin(uint8_t mcp23017_address); // Pin 100 - 115
+  mcp2.begin(uint8_t mcp23017_address); // Pin 116 - 131
+  mcp3.begin(uint8_t mcp23017_address); // Pin 132 - 147
+  mcp4.begin(uint8_t mcp23017_address); // Pin 148 - 163
\ No newline at end of file
diff --git a/lib/SuplaDevice/src/supla/control/MCP23017/supla_mcp23017.h b/lib/SuplaDevice/src/supla/control/MCP23017/supla_mcp23017.h
new file mode 100644
index 00000000..8dfa9598
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/MCP23017/supla_mcp23017.h
@@ -0,0 +1,78 @@
+
+#ifndef S_mcp_23017_h
+#define S_mcp_23017_h
+
+#include <Arduino.h>
+#include <supla/control/MCP23017/S_MCP23017.h>
+#include <supla/io.h>
+
+
+	MCP23017 mcp1;
+    MCP23017 mcp2;
+    MCP23017 mcp3;
+    MCP23017 mcp4;
+
+
+class CustomControl : public Supla::Io {
+  public:
+    void customDigitalWrite(int channelNumber, uint8_t pin, uint8_t val) {
+      if (pin < 100) {
+        return ::digitalWrite(pin,val);   
+      }     
+      if ((pin > 99) && (pin < 116)){
+        mcp1.digitalWrite(pin - 100, val);
+         return;
+      }
+      if ((pin > 115) && (pin < 132)){
+        mcp2.digitalWrite(pin - 116, val);
+      }
+      if ((pin > 131) && (pin < 148)){
+        mcp3.digitalWrite(pin - 132, val);
+         return;
+      }
+      if ((pin > 147) && (pin < 164)){
+        mcp4.digitalWrite(pin - 148, val);
+         return;
+      } 
+   }   
+   int customDigitalRead(int channelNumber, uint8_t pin) {
+      if (pin < 100){
+        return ::digitalRead(pin);  
+      }      
+      if ((pin > 99)&& (pin < 116)){
+        return mcp1.digitalRead(pin - 100);    
+      }
+      if ((pin > 115)&& (pin < 132)){
+        return mcp2.digitalRead(pin - 116);
+      }
+      if ((pin > 131)&& (pin < 148)){
+        return mcp3.digitalRead(pin - 132);    
+      }
+      if ((pin > 147)&& (pin < 164)){
+        return mcp4.digitalRead(pin - 148);    
+      }     
+    }
+   void customPinMode(int channelNumber, uint8_t pin, uint8_t mode) {
+      (void)(channelNumber);
+      if (pin < 100){
+        return ::pinMode(pin, mode);  
+      }       
+      if ((pin > 99)&& (pin < 116)){
+        mcp1.pinMode(pin - 100, mode);
+      }
+      if ((pin > 115)&& (pin < 132)){
+        mcp2.pinMode(pin - 116, mode);
+      }
+      if ((pin > 131)&& (pin < 148)){
+        mcp3.pinMode(pin - 132, mode);
+      }
+      if ((pin > 147)&& (pin < 164)){
+        mcp4.pinMode(pin - 148, mode);
+      }     
+    } 
+	      
+}CustomControl; 
+
+
+#endif
+
diff --git a/lib/SuplaDevice/src/supla/control/bistable_relay.cpp b/lib/SuplaDevice/src/supla/control/bistable_relay.cpp
index 3fabf297..d03f2aa4 100644
--- a/lib/SuplaDevice/src/supla/control/bistable_relay.cpp
+++ b/lib/SuplaDevice/src/supla/control/bistable_relay.cpp
@@ -40,7 +40,7 @@ BistableRelay::BistableRelay(int pin,
 void BistableRelay::onInit() {
 
   if (statusPin >= 0) {
-    pinMode(statusPin, statusPullUp ? INPUT_PULLUP : INPUT);
+    Supla::Io::pinMode(channel.getChannelNumber(), statusPin, statusPullUp ? INPUT_PULLUP : INPUT);
     channel.setNewValue(isOn());
   } else {
     channel.setNewValue(false);
@@ -56,7 +56,7 @@ void BistableRelay::onInit() {
     turnOff();
   }
 
-  pinMode(pin, OUTPUT);
+  Supla::Io::pinMode(channel.getChannelNumber(), pin, OUTPUT);
 }
 
 void BistableRelay::iterateAlways() {
@@ -138,6 +138,9 @@ void BistableRelay::internalToggle() {
   busy = true;
   disarmTimeMs = millis();
   Supla::Io::digitalWrite(channel.getChannelNumber(), pin, pinOnValue());
+
+  // Schedule save in 5 s after state change
+  Supla::Storage::ScheduleSave(5000);
 }
 
 void BistableRelay::toggle(_supla_int_t duration) {
diff --git a/lib/SuplaDevice/src/supla/control/bistable_roller_shutter.cpp b/lib/SuplaDevice/src/supla/control/bistable_roller_shutter.cpp
index 5fc8fe1f..9401633f 100644
--- a/lib/SuplaDevice/src/supla/control/bistable_roller_shutter.cpp
+++ b/lib/SuplaDevice/src/supla/control/bistable_roller_shutter.cpp
@@ -15,6 +15,7 @@
 */
 
 #include "bistable_roller_shutter.h"
+#include <supla/storage/storage.h>
 
 namespace Supla {
 namespace Control {
@@ -33,28 +34,30 @@ void BistableRollerShutter::stopMovement() {
   }
   currentDirection = STOP_DIR;
   doNothingTime = millis();
+  // Schedule save in 5 s after stop movement of roller shutter
+  Supla::Storage::ScheduleSave(5000);
 }
 
 void BistableRollerShutter::relayDownOn() {
   activeBiRelay = true;
   toggleTime = millis();
-  digitalWrite(pinDown, highIsOn ? HIGH : LOW);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? HIGH : LOW);
 }
 
 void BistableRollerShutter::relayUpOn() {
   activeBiRelay = true;
   toggleTime = millis();
-  digitalWrite(pinUp, highIsOn ? HIGH : LOW);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? HIGH : LOW);
 }
 
 void BistableRollerShutter::relayDownOff() {
   activeBiRelay = false;
-  digitalWrite(pinDown, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? LOW : HIGH);
 }
 
 void BistableRollerShutter::relayUpOff() {
   activeBiRelay = false;
-  digitalWrite(pinUp, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? LOW : HIGH);
 }
 
 void BistableRollerShutter::onTimer() {
diff --git a/lib/SuplaDevice/src/supla/control/button.cpp b/lib/SuplaDevice/src/supla/control/button.cpp
index 950b9f3e..8fcb294e 100644
--- a/lib/SuplaDevice/src/supla/control/button.cpp
+++ b/lib/SuplaDevice/src/supla/control/button.cpp
@@ -16,60 +16,13 @@
 
 #include "button.h"
 
-enum StateResults {PRESSED, RELEASED, TO_PRESSED, TO_RELEASED};
-
-Supla::Control::ButtonState::ButtonState(int pin, bool pullUp, bool invertLogic)
-    : debounceTimeMs(0),
-      filterTimeMs(0),
-      debounceDelayMs(50),
-      swNoiseFilterDelayMs(20),
-      pin(pin),
-      newStatusCandidate(LOW),
-      prevState(LOW),
-      pullUp(pullUp),
-      invertLogic(invertLogic) {
-}
-
-int Supla::Control::ButtonState::update() {
-  if (millis() - debounceTimeMs > debounceDelayMs) {
-    int currentState = digitalRead(pin);
-    if (currentState != prevState) {
-      // If status is changed, then make sure that it will be kept at
-      // least swNoiseFilterDelayMs ms to avoid noise
-      if (currentState != newStatusCandidate) {
-        newStatusCandidate = currentState;
-        filterTimeMs = millis();
-      } else if (millis() - filterTimeMs > swNoiseFilterDelayMs) {
-      // If new status is kept at least swNoiseFilterDelayMs ms, then apply
-      // change of status
-        debounceTimeMs = millis();
-        prevState = currentState;
-        if (currentState == valueOnPress()) {
-          return TO_PRESSED;
-        } else {
-          return TO_RELEASED;
-        }
-      }
-    } else {
-      // If current status is the same as prevState, then reset
-      // new status candidate
-      newStatusCandidate = prevState;
-    }
-  }
-  if (prevState == valueOnPress()) {
-    return PRESSED;
-  } else {
-    return RELEASED;
-  }
-}
 
 Supla::Control::Button::Button(int pin, bool pullUp, bool invertLogic)
-    : state(pin, pullUp, invertLogic),
+    : SimpleButton(pin, pullUp, invertLogic),
       holdTimeMs(0),
       multiclickTimeMs(0),
-      clickCounter(0),
       lastStateChangeMs(0),
-      enableExtDetection(false),
+      clickCounter(0),
       holdSend(false),
       bistable(false) {
 }
@@ -88,13 +41,24 @@ void Supla::Control::Button::onTimer() {
     runAction(ON_CHANGE);
   }
 
+  if (stateChanged) {
+    lastStateChangeMs = millis();
+    if (stateResult == TO_PRESSED || bistable) {
+      clickCounter++;
+    }
+  }
+
   if (!stateChanged) {
     if (!bistable && stateResult == PRESSED) {
       if (clickCounter <= 1 && holdTimeMs > 0 && timeDelta > holdTimeMs && !holdSend) {
         runAction(ON_HOLD);
         holdSend = true;
       }
-    } else if (bistable || stateResult == RELEASED) {
+    } else if (clickCounter > 0 && (bistable || stateResult == RELEASED)) {
+      if (multiclickTimeMs == 0) {
+        holdSend = false;
+        clickCounter = 0;
+      }
       if (multiclickTimeMs > 0 && timeDelta > multiclickTimeMs) {
         if (!holdSend) {
           switch (clickCounter) {
@@ -129,49 +93,15 @@ void Supla::Control::Button::onTimer() {
               runAction(ON_CLICK_10);
               break;
           }
-        }
+          if (clickCounter >= 10) {
+            runAction(ON_CRAZY_CLICKER);
+          }
+        } 
         holdSend = false;
         clickCounter = 0;
       }
     }
   }
-
-  if (stateChanged) {
-    lastStateChangeMs = millis();
-    if (stateResult == TO_PRESSED || bistable) {
-      clickCounter++;
-    }
-
-  }
-}
-
-void Supla::Control::Button::onInit() {
-  state.init();
-}
-
-void Supla::Control::ButtonState::init() {
-  pinMode(pin, pullUp ? INPUT_PULLUP : INPUT);
-  prevState = digitalRead(pin);
-  newStatusCandidate = prevState;
-}
-
-int Supla::Control::ButtonState::valueOnPress() {
-  return invertLogic ? LOW : HIGH;
-}
-
-void Supla::Control::Button::setSwNoiseFilterDelay(unsigned int newDelayMs) {
-  state.setSwNoiseFilterDelay(newDelayMs);
-}
-void Supla::Control::ButtonState::setSwNoiseFilterDelay(unsigned int newDelayMs) {
-  swNoiseFilterDelayMs = newDelayMs;
-}
-
-void Supla::Control::Button::setDebounceDelay(unsigned int newDelayMs) {
-  state.setDebounceDelay(newDelayMs);
-}
-
-void Supla::Control::ButtonState::setDebounceDelay(unsigned int newDelayMs) {
-  debounceDelayMs = newDelayMs;
 }
 
 void Supla::Control::Button::setHoldTime(unsigned int timeMs) {
@@ -188,3 +118,4 @@ void Supla::Control::Button::setMulticlickTime(unsigned int timeMs, bool bistabl
     holdTimeMs = 0;
   }
 }
+
diff --git a/lib/SuplaDevice/src/supla/control/button.h b/lib/SuplaDevice/src/supla/control/button.h
index 7cf146a3..a48328d5 100644
--- a/lib/SuplaDevice/src/supla/control/button.h
+++ b/lib/SuplaDevice/src/supla/control/button.h
@@ -18,58 +18,24 @@
 #define _button_h
 
 #include <Arduino.h>
-
-#include "../element.h"
-#include "../events.h"
-#include "../local_action.h"
+#include "simple_button.h"
 
 namespace Supla {
 namespace Control {
 
-class ButtonState {
- public:
-  ButtonState(int pin, bool pullUp, bool invertLogic);
-  int update();
-  void init();
-
-  void setSwNoiseFilterDelay(unsigned int newDelayMs);
-  void setDebounceDelay(unsigned int newDelayMs);
-  void setHoldTime(unsigned int timeMs);
-  void setMulticlickTime(unsigned int timeMs);
-
- protected:
-  int valueOnPress();
-
-  unsigned long debounceTimeMs;
-  unsigned long filterTimeMs;
-  unsigned int debounceDelayMs;
-  unsigned int swNoiseFilterDelayMs;
-  int pin;
-  int8_t newStatusCandidate;
-  int8_t prevState;
-  bool pullUp;
-  bool invertLogic;
-};
-
-class Button : public Element,
-               public LocalAction {
+class Button : public SimpleButton {
  public:
   Button(int pin, bool pullUp = false, bool invertLogic = false);
 
   void onTimer();
-  void onInit();
-  void setSwNoiseFilterDelay(unsigned int newDelayMs);
-  void setDebounceDelay(unsigned int newDelayMs);
   void setHoldTime(unsigned int timeMs);
   void setMulticlickTime(unsigned int timeMs, bool bistableButton = false);
 
  protected:
-  ButtonState state;
   unsigned int holdTimeMs;
   unsigned int multiclickTimeMs;
-  uint8_t clickCounter;
   unsigned long lastStateChangeMs;
-  bool enableExtDetection;
+  uint8_t clickCounter;
   bool holdSend;
   bool bistable;
 };
diff --git a/lib/SuplaDevice/src/supla/control/relay.cpp b/lib/SuplaDevice/src/supla/control/relay.cpp
index 081d1fe7..d47fd9a2 100644
--- a/lib/SuplaDevice/src/supla/control/relay.cpp
+++ b/lib/SuplaDevice/src/supla/control/relay.cpp
@@ -57,7 +57,7 @@ void Relay::onInit() {
     turnOff();
   }
 
-  pinMode(pin, OUTPUT);  // pin mode is set after setting pin value in order to
+  Supla::Io::pinMode(channel.getChannelNumber(), pin, OUTPUT);  // pin mode is set after setting pin value in order to
                          // avoid problems with LOW trigger relays
 }
 
@@ -94,6 +94,9 @@ void Relay::turnOn(_supla_int_t duration) {
   Supla::Io::digitalWrite(channel.getChannelNumber(), pin, pinOnValue());
 
   channel.setNewValue(true);
+
+  // Schedule save in 5 s after state change
+  Supla::Storage::ScheduleSave(5000);
 }
 
 void Relay::turnOff(_supla_int_t duration) {
@@ -102,6 +105,9 @@ void Relay::turnOff(_supla_int_t duration) {
   Supla::Io::digitalWrite(channel.getChannelNumber(), pin, pinOffValue());
 
   channel.setNewValue(false);
+
+  // Schedule save in 5 s after state change
+  Supla::Storage::ScheduleSave(5000);
 }
 
 bool Relay::isOn() {
@@ -140,39 +146,39 @@ Channel *Relay::getChannel() {
 }
 
 void Relay::onSaveState() {
-  if (keepTurnOnDurationMs) {
-    Supla::Storage::WriteState((unsigned char *)&storedTurnOnDurationMs,
-                               sizeof(storedTurnOnDurationMs));
-  }
+  Supla::Storage::WriteState((unsigned char *)&storedTurnOnDurationMs,
+                             sizeof(storedTurnOnDurationMs));
+  bool enabled = false;
   if (stateOnInit < 0) {
-    bool enabled = isOn();
-    Supla::Storage::WriteState((unsigned char *)&enabled, sizeof(enabled));
-  }
+    enabled = isOn();
+  } 
+  Supla::Storage::WriteState((unsigned char *)&enabled, sizeof(enabled));
 }
 
 void Relay::onLoadState() {
+  Supla::Storage::ReadState((unsigned char *)&storedTurnOnDurationMs,
+                            sizeof(storedTurnOnDurationMs));
   if (keepTurnOnDurationMs) {
-    Supla::Storage::ReadState((unsigned char *)&storedTurnOnDurationMs,
-                              sizeof(storedTurnOnDurationMs));
     Serial.print(F("Relay["));
     Serial.print(channel.getChannelNumber());
     Serial.print(F("]: restored durationMs: "));
     Serial.println(storedTurnOnDurationMs);
+  } else {
+    storedTurnOnDurationMs = 0;
   }
 
+  bool enabled = false;
+  Supla::Storage::ReadState((unsigned char *)&enabled, sizeof(enabled));
   if (stateOnInit < 0) {
-    bool enabled = false;
-    if (Supla::Storage::ReadState((unsigned char *)&enabled, sizeof(enabled))) {
-      Serial.print(F("Relay["));
-      Serial.print(channel.getChannelNumber());
-      Serial.print(F("]: restored relay state: "));
-      if (enabled) {
-        Serial.println(F("ON"));
-        stateOnInit = STATE_ON_INIT_RESTORED_ON;
-      } else {
-        Serial.println(F("OFF"));
-        stateOnInit = STATE_ON_INIT_RESTORED_OFF;
-      }
+    Serial.print(F("Relay["));
+    Serial.print(channel.getChannelNumber());
+    Serial.print(F("]: restored relay state: "));
+    if (enabled) {
+      Serial.println(F("ON"));
+      stateOnInit = STATE_ON_INIT_RESTORED_ON;
+    } else {
+      Serial.println(F("OFF"));
+      stateOnInit = STATE_ON_INIT_RESTORED_OFF;
     }
   }
 }
diff --git a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
index 630fb105..12e91b88 100644
--- a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
+++ b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "roller_shutter.h"
-#include "supla/storage/storage.h"
+#include <supla/storage/storage.h>
 
 namespace Supla {
 namespace Control {
@@ -53,10 +53,10 @@ RollerShutter::RollerShutter(int pinUp, int pinDown, bool highIsOn)
 }
 
 void RollerShutter::onInit() {
-  pinMode(pinUp, OUTPUT);
-  pinMode(pinDown, OUTPUT);
-  digitalWrite(pinUp, highIsOn ? LOW : HIGH);
-  digitalWrite(pinDown, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? LOW : HIGH);
+  Supla::Io::pinMode(channel.getChannelNumber(), pinUp, OUTPUT);
+  Supla::Io::pinMode(channel.getChannelNumber(), pinDown, OUTPUT);
 }
 
 /*
@@ -268,22 +268,24 @@ void RollerShutter::stopMovement() {
   switchOffRelays();
   currentDirection = STOP_DIR;
   doNothingTime = millis();
+  // Schedule save in 5 s after stop movement of roller shutter
+  Supla::Storage::ScheduleSave(5000);
 }
 
 void RollerShutter::relayDownOn() {
-  digitalWrite(pinDown, highIsOn ? HIGH : LOW);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? HIGH : LOW);
 }
 
 void RollerShutter::relayUpOn() {
-  digitalWrite(pinUp, highIsOn ? HIGH : LOW);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? HIGH : LOW);
 }
 
 void RollerShutter::relayDownOff() {
-  digitalWrite(pinDown, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? LOW : HIGH);
 }
 
 void RollerShutter::relayUpOff() {
-  digitalWrite(pinUp, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? LOW : HIGH);
 }
 
 void RollerShutter::startClosing() {
diff --git a/lib/SuplaDevice/src/supla/control/sequence_button.cpp b/lib/SuplaDevice/src/supla/control/sequence_button.cpp
new file mode 100644
index 00000000..f86dd4c8
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/sequence_button.cpp
@@ -0,0 +1,137 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "sequence_button.h"
+#include <string.h>
+
+Supla::Control::SequenceButton::SequenceButton(int pin, bool pullUp, bool invertLogic)
+    : SimpleButton(pin, pullUp, invertLogic),
+      lastStateChangeMs(0),
+      longestSequenceTimeDeltaWithMargin(800),
+      clickCounter(0),
+      sequenceDetectecion(true),
+      currentSequence(),
+      matchSequence(), 
+      margin(0.3) {
+}
+
+void Supla::Control::SequenceButton::onTimer() {
+  unsigned int timeDelta = millis() - lastStateChangeMs;
+  bool stateChanged = false;
+  int stateResult = state.update();
+  if (stateResult == TO_PRESSED) {
+    stateChanged = true;
+    runAction(ON_PRESS);
+    runAction(ON_CHANGE);
+  } else if (stateResult == TO_RELEASED) {
+    stateChanged = true;
+    runAction(ON_RELEASE);
+    runAction(ON_CHANGE);
+  }
+
+  if (stateChanged) {
+    lastStateChangeMs = millis();
+    if (clickCounter > 0 && clickCounter < SEQUENCE_MAX_SIZE + 1) {
+      currentSequence.data[clickCounter - 1] = timeDelta;
+    }
+    if (clickCounter == 0) {
+      memset(currentSequence.data, 0, sizeof(uint16_t [SEQUENCE_MAX_SIZE]));
+    }
+    clickCounter++;
+  }
+
+  if (!stateChanged) {
+    if (clickCounter > 0 && stateResult == RELEASED) {
+      if (timeDelta > longestSequenceTimeDeltaWithMargin) {
+          Serial.print(F("Recorded sequence: "));
+          if (clickCounter > 31) {
+            clickCounter = 31;
+          }
+          for (int i = 0; i < clickCounter - 1; i++) {
+            Serial.print(currentSequence.data[i]);
+            Serial.print(F(", "));
+          }
+          Serial.println();
+
+          int matchSequenceSize = 0;
+          for (; matchSequenceSize < 30; matchSequenceSize++) {
+            if (matchSequence.data[matchSequenceSize] == 0) {
+              break;
+            }
+          }
+          if (matchSequenceSize != clickCounter - 1) {
+            Serial.println(F("Sequence size doesn't match"));
+            runAction(ON_SEQUENCE_DOESNT_MATCH);
+          } else {
+            bool match = true;
+            for (int i = 0; i < clickCounter - 1; i++) {
+              unsigned int marginValue = calculateMargin(matchSequence.data[i]);
+              if (!(matchSequence.data[i] - marginValue <= currentSequence.data[i] && matchSequence.data[i] + marginValue >= currentSequence.data[i])) {
+                match = false;
+                break;
+              }
+            }
+            if (match) {
+              Serial.println(F("Sequence match"));
+              runAction(ON_SEQUENCE_MATCH);
+            } else {
+              Serial.println(F("Sequence doesn't match"));
+              runAction(ON_SEQUENCE_DOESNT_MATCH);
+            }
+
+          }
+        clickCounter = 0;
+      }
+    }
+  }
+
+}
+
+unsigned int Supla::Control::SequenceButton::calculateMargin(unsigned int value) {
+  unsigned int result = margin*value;
+  if (result < 20) {
+    result = 20;
+  }
+  return result;
+}
+
+void Supla::Control::SequenceButton::setMargin(float newMargin) {
+  margin = newMargin;
+  if (margin < 0) {
+    margin = 0;
+  } else if (margin > 1) {
+    margin = 1;
+  }
+}
+
+void Supla::Control::SequenceButton::setSequence(uint16_t *sequence) {
+  uint16_t maxValue = 0;
+  for (int i = 0; i < SEQUENCE_MAX_SIZE; i++) {
+    matchSequence.data[i] = sequence[i];
+    if (sequence[i] > maxValue) {
+      maxValue = sequence[i];
+    }
+  }
+  maxValue *= 1.5;
+  if (maxValue < 500) {
+    maxValue = 500;
+  }
+  longestSequenceTimeDeltaWithMargin = maxValue;
+}
+
+void Supla::Control::SequenceButton::getLastRecordedSequence(uint16_t *sequence) {
+  memcpy(sequence, currentSequence.data, sizeof(uint16_t [SEQUENCE_MAX_SIZE]));
+}
diff --git a/lib/SuplaDevice/src/supla/control/sequence_button.h b/lib/SuplaDevice/src/supla/control/sequence_button.h
new file mode 100644
index 00000000..d4e12b12
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/sequence_button.h
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _sequence_button_h
+#define _sequence_button_h
+
+#include "button.h"
+
+namespace Supla {
+namespace Control {
+
+#define SEQUENCE_MAX_SIZE 30
+
+struct ClickSequence {
+  uint16_t data[SEQUENCE_MAX_SIZE];
+};
+ 
+class SequenceButton : public SimpleButton {
+ public:
+  SequenceButton(int pin, bool pullUp = false, bool invertLogic = false);
+
+  void onTimer();
+
+  void setSequence(uint16_t *sequence);
+  void setMargin(float);
+  void getLastRecordedSequence(uint16_t *sequence);
+
+ protected:
+  unsigned long lastStateChangeMs;
+  uint16_t longestSequenceTimeDeltaWithMargin;
+  uint8_t clickCounter;
+  bool sequenceDetectecion;
+
+  ClickSequence currentSequence;
+  ClickSequence matchSequence;
+
+  float margin;
+  unsigned int calculateMargin(unsigned int);
+
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/simple_button.cpp b/lib/SuplaDevice/src/supla/control/simple_button.cpp
new file mode 100644
index 00000000..7714f675
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/simple_button.cpp
@@ -0,0 +1,108 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "button.h"
+#include "../io.h"
+
+Supla::Control::ButtonState::ButtonState(int pin, bool pullUp, bool invertLogic)
+    : debounceTimeMs(0),
+      filterTimeMs(0),
+      debounceDelayMs(50),
+      swNoiseFilterDelayMs(20),
+      pin(pin),
+      newStatusCandidate(LOW),
+      prevState(LOW),
+      pullUp(pullUp),
+      invertLogic(invertLogic) {
+}
+
+int Supla::Control::ButtonState::update() {
+  if (millis() - debounceTimeMs > debounceDelayMs) {
+    int currentState = Supla::Io::digitalRead(pin);
+    if (currentState != prevState) {
+      // If status is changed, then make sure that it will be kept at
+      // least swNoiseFilterDelayMs ms to avoid noise
+      if (currentState != newStatusCandidate) {
+        newStatusCandidate = currentState;
+        filterTimeMs = millis();
+      } else if (millis() - filterTimeMs > swNoiseFilterDelayMs) {
+      // If new status is kept at least swNoiseFilterDelayMs ms, then apply
+      // change of status
+        debounceTimeMs = millis();
+        prevState = currentState;
+        if (currentState == valueOnPress()) {
+          return TO_PRESSED;
+        } else {
+          return TO_RELEASED;
+        }
+      }
+    } else {
+      // If current status is the same as prevState, then reset
+      // new status candidate
+      newStatusCandidate = prevState;
+    }
+  }
+  if (prevState == valueOnPress()) {
+    return PRESSED;
+  } else {
+    return RELEASED;
+  }
+}
+
+Supla::Control::SimpleButton::SimpleButton(int pin, bool pullUp, bool invertLogic)
+    : state(pin, pullUp, invertLogic) {
+}
+
+void Supla::Control::SimpleButton::onTimer() {
+  int stateResult = state.update();
+  if (stateResult == TO_PRESSED) {
+    runAction(ON_PRESS);
+    runAction(ON_CHANGE);
+  } else if (stateResult == TO_RELEASED) {
+    runAction(ON_RELEASE);
+    runAction(ON_CHANGE);
+  }
+}
+
+void Supla::Control::SimpleButton::onInit() {
+  state.init();
+}
+
+void Supla::Control::ButtonState::init() {
+  Supla::Io::pinMode(pin, pullUp ? INPUT_PULLUP : INPUT);
+  prevState = Supla::Io::digitalRead(pin);
+  newStatusCandidate = prevState;
+}
+
+int Supla::Control::ButtonState::valueOnPress() {
+  return invertLogic ? LOW : HIGH;
+}
+
+void Supla::Control::SimpleButton::setSwNoiseFilterDelay(unsigned int newDelayMs) {
+  state.setSwNoiseFilterDelay(newDelayMs);
+}
+void Supla::Control::ButtonState::setSwNoiseFilterDelay(unsigned int newDelayMs) {
+  swNoiseFilterDelayMs = newDelayMs;
+}
+
+void Supla::Control::SimpleButton::setDebounceDelay(unsigned int newDelayMs) {
+  state.setDebounceDelay(newDelayMs);
+}
+
+void Supla::Control::ButtonState::setDebounceDelay(unsigned int newDelayMs) {
+  debounceDelayMs = newDelayMs;
+}
+
diff --git a/lib/SuplaDevice/src/supla/control/simple_button.h b/lib/SuplaDevice/src/supla/control/simple_button.h
new file mode 100644
index 00000000..8b66fb7e
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/simple_button.h
@@ -0,0 +1,71 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _simple_button_h
+#define _simple_button_h
+
+#include <Arduino.h>
+
+#include "../element.h"
+#include "../events.h"
+#include "../local_action.h"
+
+namespace Supla {
+namespace Control {
+
+enum StateResults {PRESSED, RELEASED, TO_PRESSED, TO_RELEASED};
+
+class ButtonState {
+ public:
+  ButtonState(int pin, bool pullUp, bool invertLogic);
+  int update();
+  void init();
+
+  void setSwNoiseFilterDelay(unsigned int newDelayMs);
+  void setDebounceDelay(unsigned int newDelayMs);
+
+ protected:
+  int valueOnPress();
+
+  unsigned long debounceTimeMs;
+  unsigned long filterTimeMs;
+  unsigned int debounceDelayMs;
+  unsigned int swNoiseFilterDelayMs;
+  int pin;
+  int8_t newStatusCandidate;
+  int8_t prevState;
+  bool pullUp;
+  bool invertLogic;
+};
+
+class SimpleButton : public Element,
+               public LocalAction {
+ public:
+  SimpleButton(int pin, bool pullUp = false, bool invertLogic = false);
+
+  void onTimer();
+  void onInit();
+  void setSwNoiseFilterDelay(unsigned int newDelayMs);
+  void setDebounceDelay(unsigned int newDelayMs);
+
+ protected:
+  ButtonState state;
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/virtual_relay.h b/lib/SuplaDevice/src/supla/control/virtual_relay.h
index 1a54c51f..15ed52a4 100644
--- a/lib/SuplaDevice/src/supla/control/virtual_relay.h
+++ b/lib/SuplaDevice/src/supla/control/virtual_relay.h
@@ -46,6 +46,8 @@ class VirtualRelay : public Relay {
     state = true;
 
     channel.setNewValue(state);
+    // Schedule save in 5 s after state change
+    Supla::Storage::ScheduleSave(5000);
   }
 
   virtual void turnOff(_supla_int_t duration = 0) {
@@ -54,6 +56,8 @@ class VirtualRelay : public Relay {
     state = false;
 
     channel.setNewValue(state);
+    // Schedule save in 5 s after state change
+    Supla::Storage::ScheduleSave(5000);
   }
 
   virtual bool isOn() {
diff --git a/lib/SuplaDevice/src/supla/events.h b/lib/SuplaDevice/src/supla/events.h
index c72c122f..cadbb616 100644
--- a/lib/SuplaDevice/src/supla/events.h
+++ b/lib/SuplaDevice/src/supla/events.h
@@ -34,7 +34,10 @@ enum Event {
   ON_CLICK_7,
   ON_CLICK_8,
   ON_CLICK_9,
-  ON_CLICK_10
+  ON_CLICK_10,
+  ON_CRAZY_CLICKER,  // triggered on >= 10 clicks 
+  ON_SEQUENCE_MATCH,        // triggered by SequenceButton 
+  ON_SEQUENCE_DOESNT_MATCH  // triggered by SequenceButton
 };
 
 };
diff --git a/lib/SuplaDevice/src/supla/io.cpp b/lib/SuplaDevice/src/supla/io.cpp
index 59cccc81..84c8684d 100644
--- a/lib/SuplaDevice/src/supla/io.cpp
+++ b/lib/SuplaDevice/src/supla/io.cpp
@@ -19,6 +19,26 @@
 #include <Arduino.h>
 
 namespace Supla {
+void Io::pinMode(uint8_t pin, uint8_t mode) {
+  return pinMode(-1, pin, mode);
+}
+
+int Io::digitalRead(uint8_t pin) {
+  return digitalRead(-1, pin);
+}
+
+void Io::digitalWrite(uint8_t pin, uint8_t val) {
+  digitalWrite(-1, pin, val);
+}
+
+void Io::pinMode(int channelNumber, uint8_t pin, uint8_t mode) {
+  if (ioInstance) {
+    ioInstance->customPinMode(channelNumber, pin, mode);
+  } else { 
+    ::pinMode(pin, mode);
+  }
+}
+
 int Io::digitalRead(int channelNumber, uint8_t pin) {
   if (ioInstance) {
     return ioInstance->customDigitalRead(channelNumber, pin);
@@ -56,4 +76,9 @@ void Io::customDigitalWrite(int channelNumber, uint8_t pin, uint8_t val) {
   ::digitalWrite(pin, val);
 }
 
+void Io::customPinMode(int channelNumber, uint8_t pin, uint8_t mode) {
+  (void)(channelNumber);
+  ::pinMode(pin, mode);
+}
+
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/io.h b/lib/SuplaDevice/src/supla/io.h
index 461f8b6a..722d6685 100644
--- a/lib/SuplaDevice/src/supla/io.h
+++ b/lib/SuplaDevice/src/supla/io.h
@@ -30,12 +30,17 @@ namespace Supla {
 // changed.
 class Io {
  public:
+  static void pinMode(uint8_t pin, uint8_t mode);
+  static int digitalRead(uint8_t pin);
+  static void digitalWrite(uint8_t pin, uint8_t val);
+  static void pinMode(int channelNumber, uint8_t pin, uint8_t mode);
   static int digitalRead(int channelNumber, uint8_t pin);
   static void digitalWrite(int channelNumber, uint8_t pin, uint8_t val);
 
   static Io *ioInstance;
 
   Io();
+  virtual void customPinMode(int channelNumber, uint8_t pin, uint8_t mode);
   virtual int customDigitalRead(int channelNumber, uint8_t pin);
   virtual void customDigitalWrite(int channelNumber, uint8_t pin, uint8_t val);
 };
diff --git a/lib/SuplaDevice/src/supla/network/esp32_wifi.h b/lib/SuplaDevice/src/supla/network/esp32_wifi.h
index fa3915d1..e45ee3cc 100644
--- a/lib/SuplaDevice/src/supla/network/esp32_wifi.h
+++ b/lib/SuplaDevice/src/supla/network/esp32_wifi.h
@@ -14,120 +14,15 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#ifndef esp_wifi_h__
-#define esp_wifi_h__
+// DEPRECATED: please use esp_wifi.h instead
 
-#include <Arduino.h>
-#include <WiFi.h>
+#ifndef esp32_wifi_h__
+#define esp32_wifi_h__
 
-#include "../supla_lib_config.h"
-#include "network.h"
-
-#define MAX_SSID_SIZE          32
-#define MAX_WIFI_PASSWORD_SIZE 64
-
-// TODO: change logs to supla_log
+#include "esp_wifi.h"
 
 namespace Supla {
-class ESP32Wifi : public Supla::Network {
- public:
-  ESP32Wifi(const char *wifiSsid,
-            const char *wifiPassword,
-            IPAddress *ip = NULL)
-      : Network(ip) {
-    strcpy(ssid, wifiSsid);
-    strcpy(password, wifiPassword);
-  }
-
-  int read(void *buf, int count) {
-    _supla_int_t size = client.available();
-
-    if (size > 0) {
-      if (size > count) size = count;
-      long readSize = client.read((uint8_t *)buf, size);
-#ifdef SUPLA_COMM_DEBUG
-      Serial.print(F("Received: ["));
-      for (int i = 0; i < readSize; i++) {
-        Serial.print(static_cast<unsigned char *>(buf)[i], HEX);
-        Serial.print(F(" "));
-      }
-      Serial.println(F("]"));
-#endif
-
-      return readSize;
-    }
-    return -1;
-  }
-
-  int write(void *buf, int count) {
-#ifdef SUPLA_COMM_DEBUG
-    Serial.print(F("Sending: ["));
-    for (int i = 0; i < count; i++) {
-      Serial.print(static_cast<unsigned char *>(buf)[i], HEX);
-      Serial.print(F(" "));
-    }
-    Serial.println(F("]"));
-#endif
-    long sendSize = client.write((const uint8_t *)buf, count);
-    return sendSize;
-  }
-
-  int connect(const char *server, int port = -1) {
-    int connectionPort = (port == -1 ? 2015 : port);
-    supla_log(
-        LOG_DEBUG, "Establishing connection with: %s (port: %d)", server, connectionPort);
-    return client.connect(server, connectionPort);
-  }
-
-  bool connected() {
-    return client.connected();
-  }
-
-  bool isReady() {
-    return WiFi.status() == WL_CONNECTED;
-  }
-
-  void disconnect() {
-    client.stop();
-  }
-
-  // TODO: add handling of custom local ip
-  void setup() {
-    WiFiEventId_t event_gotIP = WiFi.onEvent(
-        [](WiFiEvent_t event, WiFiEventInfo_t info) {
-          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"));
-        },
-        WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
-
-    WiFiEventId_t event_disconnected = WiFi.onEvent(
-        [](WiFiEvent_t event, WiFiEventInfo_t info) {
-          Serial.println(F("wifi Station disconnected"));
-        },
-        WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
-
-    Serial.print(F("WIFI: establishing connection with SSID: \""));
-    Serial.print(ssid);
-    Serial.println(F("\""));
-    WiFi.begin(ssid, password);
-    yield();
-  }
-
- protected:
-  WiFiClient client;
-
-  char ssid[MAX_SSID_SIZE];
-  char password[MAX_WIFI_PASSWORD_SIZE];
+typedef ESPWifi ESP32Wifi;
 };
 
-};  // namespace Supla
-
 #endif
diff --git a/lib/SuplaDevice/src/supla/network/esp_wifi.h b/lib/SuplaDevice/src/supla/network/esp_wifi.h
index b819e23f..adbeac69 100644
--- a/lib/SuplaDevice/src/supla/network/esp_wifi.h
+++ b/lib/SuplaDevice/src/supla/network/esp_wifi.h
@@ -18,7 +18,13 @@
 #define esp_wifi_h__
 
 #include <Arduino.h>
+
+#ifdef ARDUINO_ARCH_ESP8266
 #include <ESP8266WiFi.h>
+#else
+#include <WiFi.h>
+#endif
+
 #include <WiFiClientSecure.h>
 
 #include "../supla_lib_config.h"
@@ -27,7 +33,9 @@
 #define MAX_SSID_SIZE          32
 #define MAX_WIFI_PASSWORD_SIZE 64
 
+#ifdef ARDUINO_ARCH_ESP8266
 WiFiEventHandler gotIpEventHandler, disconnectedEventHandler;
+#endif
 
 // TODO: change logs to supla_log
 
@@ -42,6 +50,10 @@ class ESPWifi : public Supla::Network {
     password[0] = '\0';
     setSsid(wifiSsid);
     setPassword(wifiPassword);
+#ifdef ARDUINO_ARCH_ESP32
+    enableSSL(
+        false);  // current ESP32 WiFiClientSecure does not suport "setInsecure"
+#endif
   }
 
   int read(void *buf, int count) {
@@ -85,10 +97,18 @@ class ESPWifi : public Supla::Network {
         client = new WiFiClientSecure();
         if (fingerprint.length() > 0) {
           message += " with certificate matching";
+#ifdef ARDUINO_ARCH_ESP8266
           ((WiFiClientSecure *)client)->setFingerprint(fingerprint.c_str());
+#else
+          message += " - NOT SUPPORTED ON ESP32 implmentation";
+#endif
         } else {
           message += " without certificate matching";
+#ifdef ARDUINO_ARCH_ESP8266
           ((WiFiClientSecure *)client)->setInsecure();
+#else
+          message += " - NOT SUPPORTED ON ESP32 implmentation";
+#endif
         }
       } else {
         message = "unsecured connection";
@@ -141,30 +161,52 @@ class ESPWifi : public Supla::Network {
   void setup() {
     if (!wifiConfigured) {
       wifiConfigured = true;
-    gotIpEventHandler =
-        WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) {
-          (void)(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) {
-          (void)(event);
-          Serial.println(F("WiFi station disconnected"));
-        });
-
-    Serial.print(F("WiFi: establishing connection with SSID: \""));
-    Serial.print(ssid);
-    Serial.println(F("\""));
-    WiFi.begin(ssid, password);
+#ifdef ARDUINO_ARCH_ESP8266
+      gotIpEventHandler =
+          WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) {
+            (void)(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) {
+            (void)(event);
+            Serial.println(F("WiFi station disconnected"));
+          });
+#else
+      WiFiEventId_t event_gotIP = WiFi.onEvent(
+          [](WiFiEvent_t event, WiFiEventInfo_t info) {
+            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"));
+          },
+          WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
+
+      WiFiEventId_t event_disconnected = WiFi.onEvent(
+          [](WiFiEvent_t event, WiFiEventInfo_t info) {
+            Serial.println(F("wifi Station disconnected"));
+          },
+          WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
+#endif
+      Serial.print(F("WiFi: establishing connection with SSID: \""));
+      Serial.print(ssid);
+      Serial.println(F("\""));
+      WiFi.begin(ssid, password);
     } else {
       Serial.println(F("WiFi: resetting WiFi connection"));
       if (client) {
diff --git a/lib/SuplaDevice/src/supla/pv/afore.cpp b/lib/SuplaDevice/src/supla/pv/afore.cpp
index 7b6f5484..06c0933f 100644
--- a/lib/SuplaDevice/src/supla/pv/afore.cpp
+++ b/lib/SuplaDevice/src/supla/pv/afore.cpp
@@ -30,7 +30,9 @@ Afore::Afore(IPAddress ip, int port, const char *loginAndPass)
       vFound(false),
       varFound(false),
       dataIsReady(false),
-      dataFetchInProgress(false) {
+      dataFetchInProgress(false),
+      connectionTimeoutMs(0) {
+  refreshRateSec = 15;
   int len = strlen(loginAndPass);
   if (len > LOGIN_AND_PASSOWORD_MAX_LENGTH) {
     len = LOGIN_AND_PASSOWORD_MAX_LENGTH;
@@ -40,6 +42,13 @@ Afore::Afore(IPAddress ip, int port, const char *loginAndPass)
 
 void Afore::iterateAlways() {
   if (dataFetchInProgress) {
+    if (millis() - connectionTimeoutMs > 30000) {
+      Serial.println(F("AFORE: connection timeout. Remote host is not responding"));
+      pvClient.stop();
+      dataFetchInProgress = false;
+      dataIsReady = false;
+      return;
+    }
     if (!pvClient.connected()) {
       Serial.println(F("AFORE fetch completed"));
       dataFetchInProgress = false;
@@ -105,12 +114,13 @@ void Afore::iterateAlways() {
 
 bool Afore::iterateConnected(void *srpc) {
   if (!dataFetchInProgress) {
-    if (lastReadTime == 0 || millis() - lastReadTime > 15000) {
+    if (lastReadTime == 0 || millis() - lastReadTime > refreshRateSec*1000) {
       lastReadTime = millis();
       Serial.println(F("AFORE connecting"));
       if (pvClient.connect(ip, port)) {
         retryCounter = 0;
         dataFetchInProgress = true;
+        connectionTimeoutMs = lastReadTime;
         Serial.println(F("Succesful connect"));
 
         pvClient.print("GET /status.html HTTP/1.1\nAuthorization: Basic ");
@@ -137,3 +147,4 @@ bool Afore::iterateConnected(void *srpc) {
 
 void Afore::readValuesFromDevice() {
 }
+
diff --git a/lib/SuplaDevice/src/supla/pv/afore.h b/lib/SuplaDevice/src/supla/pv/afore.h
index 85a978e6..bb46c26a 100644
--- a/lib/SuplaDevice/src/supla/pv/afore.h
+++ b/lib/SuplaDevice/src/supla/pv/afore.h
@@ -55,6 +55,7 @@ class Afore : public Supla::Sensor::OnePhaseElectricityMeter {
   bool varFound;
   bool dataIsReady;
   bool dataFetchInProgress;
+  unsigned long connectionTimeoutMs;
 };
 };  // namespace PV
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/pv/fronius.cpp b/lib/SuplaDevice/src/supla/pv/fronius.cpp
index 3e2200b4..871f80a3 100644
--- a/lib/SuplaDevice/src/supla/pv/fronius.cpp
+++ b/lib/SuplaDevice/src/supla/pv/fronius.cpp
@@ -36,11 +36,20 @@ Fronius::Fronius(IPAddress ip, int port, int deviceId)
       deviceId(deviceId),
       startCharFound(false),
       dataIsReady(false),
-      dataFetchInProgress(false) {
+      dataFetchInProgress(false),
+      connectionTimeoutMs(0) {
+  refreshRateSec = 15;
 }
 
 void Fronius::iterateAlways() {
   if (dataFetchInProgress) {
+    if (millis() - connectionTimeoutMs > 30000) {
+      Serial.println(F("Fronius: connection timeout. Remote host is not responding"));
+      pvClient.stop();
+      dataFetchInProgress = false;
+      dataIsReady = false;
+      return;
+    }
     if (!pvClient.connected()) {
       Serial.println(F("Fronius fetch completed"));
       dataFetchInProgress = false;
@@ -147,13 +156,14 @@ void Fronius::iterateAlways() {
 
 bool Fronius::iterateConnected(void *srpc) {
   if (!dataFetchInProgress) {
-    if (lastReadTime == 0 || millis() - lastReadTime > 15000) {
+    if (lastReadTime == 0 || millis() - lastReadTime > refreshRateSec*1000) {
       lastReadTime = millis();
       Serial.print(F("Fronius connecting "));
       Serial.println(deviceId);
       if (pvClient.connect(ip, port)) {
         retryCounter = 0;
         dataFetchInProgress = true;
+        connectionTimeoutMs = lastReadTime;
         Serial.println(F("Succesful connect"));
 
         char buf[100];
@@ -189,3 +199,4 @@ bool Fronius::iterateConnected(void *srpc) {
 
 void Fronius::readValuesFromDevice() {
 }
+
diff --git a/lib/SuplaDevice/src/supla/pv/fronius.h b/lib/SuplaDevice/src/supla/pv/fronius.h
index 1f761732..f32d4699 100644
--- a/lib/SuplaDevice/src/supla/pv/fronius.h
+++ b/lib/SuplaDevice/src/supla/pv/fronius.h
@@ -56,6 +56,7 @@ class Fronius : public Supla::Sensor::OnePhaseElectricityMeter {
   bool startCharFound;
   bool dataIsReady;
   bool dataFetchInProgress;
+  unsigned long connectionTimeoutMs;
 };
 };  // namespace PV
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/sensor/binary.cpp b/lib/SuplaDevice/src/supla/sensor/binary.cpp
new file mode 100644
index 00000000..b305457d
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/binary.cpp
@@ -0,0 +1,45 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "binary.h"
+#include "../io.h"
+
+Supla::Sensor::Binary::Binary(int pin, bool pullUp = false)
+    : pin(pin), pullUp(pullUp), lastReadTime(0) {
+  channel.setType(SUPLA_CHANNELTYPE_SENSORNO);
+}
+
+bool Supla::Sensor::Binary::getValue() {
+  return Supla::Io::digitalRead(channel.getChannelNumber(), pin) == LOW ? false
+                                                                        : true;
+}
+
+void Supla::Sensor::Binary::iterateAlways() {
+  if (lastReadTime + 100 < millis()) {
+    lastReadTime = millis();
+    channel.setNewValue(getValue());
+  }
+}
+
+void Supla::Sensor::Binary::onInit() {
+  Supla::Io::pinMode(
+      channel.getChannelNumber(), pin, pullUp ? INPUT_PULLUP : INPUT);
+  channel.setNewValue(getValue());
+}
+
+Supla::Channel *Supla::Sensor::Binary::getChannel() {
+  return &channel;
+}
diff --git a/lib/SuplaDevice/src/supla/sensor/binary.h b/lib/SuplaDevice/src/supla/sensor/binary.h
index 8bd7e52d..31db9fff 100644
--- a/lib/SuplaDevice/src/supla/sensor/binary.h
+++ b/lib/SuplaDevice/src/supla/sensor/binary.h
@@ -21,38 +21,19 @@
 
 #include "../channel.h"
 #include "../element.h"
-#include "../io.h"
 
 namespace Supla {
 namespace Sensor {
 class Binary : public Element {
  public:
-  Binary(int pin, bool pullUp = false) : pin(pin), pullUp(pullUp), lastReadTime(0) {
-    channel.setType(SUPLA_CHANNELTYPE_SENSORNO);
-  }
-
-  bool getValue() {
-    return Supla::Io::digitalRead(channel.getChannelNumber(), pin) == LOW
-               ? false
-               : true;
-  }
-
-  void iterateAlways() {
-    if (lastReadTime + 100 < millis()) {
-      lastReadTime = millis();
-      channel.setNewValue(getValue());
-    }
-  }
-
-  void onInit() {
-    pinMode(pin, pullUp ? INPUT_PULLUP : INPUT);
-    channel.setNewValue(getValue());
-  }
+  Binary(int pin, bool pullUp);
+  bool getValue();
+  void iterateAlways();
+  void onInit();
 
  protected:
-  Channel *getChannel() {
-    return &channel;
-  }
+  Channel *getChannel();
+
   Channel channel;
   int pin;
   bool pullUp;
diff --git a/lib/SuplaDevice/src/supla/sensor/electricity_meter.cpp b/lib/SuplaDevice/src/supla/sensor/electricity_meter.cpp
new file mode 100644
index 00000000..13fbf36a
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/electricity_meter.cpp
@@ -0,0 +1,260 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <string.h>
+
+#include "electricity_meter.h"
+
+Supla::Sensor::ElectricityMeter::ElectricityMeter()
+    : valueChanged(false), lastReadTime(0), refreshRateSec(5) {
+  extChannel.setType(SUPLA_CHANNELTYPE_ELECTRICITY_METER);
+  extChannel.setDefault(SUPLA_CHANNELFNC_ELECTRICITY_METER);
+  memset(&emValue, 0, sizeof(emValue));
+  emValue.period = 5;
+  for (int i = 0; i < MAX_PHASES; i++) {
+    rawCurrent[i] = 0;
+  }
+  currentMeasurementAvailable = false;
+}
+
+void Supla::Sensor::ElectricityMeter::updateChannelValues() {
+  if (!valueChanged) {
+    return;
+  }
+  valueChanged = false;
+
+  emValue.m_count = 1;
+
+  // Update current messurement precision based on last updates
+  if (currentMeasurementAvailable) {
+    bool over65A = false;
+    for (int i = 0; i < MAX_PHASES; i++) {
+      if (rawCurrent[i] > 65000) {
+        over65A = true;
+      }
+    }
+
+    for (int i = 0; i < MAX_PHASES; i++) {
+      if (over65A) {
+        emValue.m[0].current[i] = rawCurrent[i] / 10;
+      } else {
+        emValue.m[0].current[i] = rawCurrent[i];
+      }
+    }
+
+    if (over65A) {
+      emValue.measured_values ^= (!EM_VAR_CURRENT);
+      emValue.measured_values |= EM_VAR_CURRENT_OVER_65A;
+    } else {
+      emValue.measured_values ^= (!EM_VAR_CURRENT_OVER_65A);
+      emValue.measured_values |= EM_VAR_CURRENT;
+    }
+  }
+
+  // Prepare extended channel value
+  srpc_evtool_v2_emextended2extended(&emValue, extChannel.getExtValue());
+  extChannel.setNewValue(emValue);
+}
+
+// energy in 0.00001 kWh
+void Supla::Sensor::ElectricityMeter::setFwdActEnergy(
+    int phase, unsigned _supla_int64_t energy) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.total_forward_active_energy[phase] != energy) {
+      valueChanged = true;
+    }
+    emValue.total_forward_active_energy[phase] = energy;
+    emValue.measured_values |= EM_VAR_FORWARD_ACTIVE_ENERGY;
+  }
+}
+
+// energy in 0.00001 kWh
+void Supla::Sensor::ElectricityMeter::setRvrActEnergy(
+    int phase, unsigned _supla_int64_t energy) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.total_reverse_active_energy[phase] != energy) {
+      valueChanged = true;
+    }
+    emValue.total_reverse_active_energy[phase] = energy;
+    emValue.measured_values |= EM_VAR_REVERSE_ACTIVE_ENERGY;
+  }
+}
+
+// energy in 0.00001 kWh
+void Supla::Sensor::ElectricityMeter::setFwdReactEnergy(
+    int phase, unsigned _supla_int64_t energy) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.total_forward_reactive_energy[phase] != energy) {
+      valueChanged = true;
+    }
+    emValue.total_forward_reactive_energy[phase] = energy;
+    emValue.measured_values |= EM_VAR_FORWARD_REACTIVE_ENERGY;
+  }
+}
+
+// energy in 0.00001 kWh
+void Supla::Sensor::ElectricityMeter::setRvrReactEnergy(
+    int phase, unsigned _supla_int64_t energy) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.total_reverse_reactive_energy[phase] != energy) {
+      valueChanged = true;
+    }
+    emValue.total_reverse_reactive_energy[phase] = energy;
+    emValue.measured_values |= EM_VAR_REVERSE_REACTIVE_ENERGY;
+  }
+}
+
+// voltage in 0.01 V
+void Supla::Sensor::ElectricityMeter::setVoltage(
+    int phase, unsigned _supla_int16_t voltage) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.m[0].voltage[phase] != voltage) {
+      valueChanged = true;
+    }
+    emValue.m[0].voltage[phase] = voltage;
+    emValue.measured_values |= EM_VAR_VOLTAGE;
+  }
+}
+
+// current in 0.001 A
+void Supla::Sensor::ElectricityMeter::setCurrent(
+    int phase, unsigned _supla_int_t current) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (rawCurrent[phase] != current) {
+      valueChanged = true;
+    }
+    rawCurrent[phase] = current;
+    currentMeasurementAvailable = true;
+  }
+}
+
+// Frequency in 0.01 Hz
+void Supla::Sensor::ElectricityMeter::setFreq(unsigned _supla_int16_t freq) {
+  if (emValue.m[0].freq != freq) {
+    valueChanged = true;
+  }
+  emValue.m[0].freq = freq;
+  emValue.measured_values |= EM_VAR_FREQ;
+}
+
+// power in 0.00001 kW
+void Supla::Sensor::ElectricityMeter::setPowerActive(int phase,
+                                                     _supla_int_t power) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.m[0].power_active[phase] != power) {
+      valueChanged = true;
+    }
+    emValue.m[0].power_active[phase] = power;
+    emValue.measured_values |= EM_VAR_POWER_ACTIVE;
+  }
+}
+
+// power in 0.00001 kvar
+void Supla::Sensor::ElectricityMeter::setPowerReactive(int phase,
+                                                       _supla_int_t power) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.m[0].power_reactive[phase] != power) {
+      valueChanged = true;
+    }
+    emValue.m[0].power_reactive[phase] = power;
+    emValue.measured_values |= EM_VAR_POWER_REACTIVE;
+  }
+}
+
+// power in 0.00001 kVA
+void Supla::Sensor::ElectricityMeter::setPowerApparent(int phase,
+                                                       _supla_int_t power) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.m[0].power_apparent[phase] != power) {
+      valueChanged = true;
+    }
+    emValue.m[0].power_apparent[phase] = power;
+    emValue.measured_values |= EM_VAR_POWER_APPARENT;
+  }
+}
+
+// power in 0.001
+void Supla::Sensor::ElectricityMeter::setPowerFactor(int phase,
+                                                     _supla_int_t powerFactor) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.m[0].power_factor[phase] != powerFactor) {
+      valueChanged = true;
+    }
+    emValue.m[0].power_factor[phase] = powerFactor;
+    emValue.measured_values |= EM_VAR_POWER_FACTOR;
+  }
+}
+
+// phase angle in 0.1 degree
+void Supla::Sensor::ElectricityMeter::setPhaseAngle(int phase,
+                                                    _supla_int_t phaseAngle) {
+  if (phase >= 0 && phase < MAX_PHASES) {
+    if (emValue.m[0].phase_angle[phase] != phaseAngle) {
+      valueChanged = true;
+    }
+    emValue.m[0].phase_angle[phase] = phaseAngle;
+    emValue.measured_values |= EM_VAR_PHASE_ANGLE;
+  }
+}
+
+void Supla::Sensor::ElectricityMeter::resetReadParameters() {
+  if (emValue.measured_values != 0) {
+    emValue.measured_values = 0;
+    memset(&emValue.m[0], 0, sizeof(TElectricityMeter_Measurement));
+    valueChanged = true;
+  }
+}
+
+// Please implement this class for reading value from elecricity meter device.
+// It will be called every 5 s. Use set methods defined above in order to
+// set values on channel. Don't use any other method to modify channel values.
+void Supla::Sensor::ElectricityMeter::readValuesFromDevice() {
+}
+
+// Put here initialization code for electricity meter device.
+// It will be called within SuplaDevce.begin method.
+// It should also read first data set, so at the end it should call those two
+// methods:
+// readValuesFromDevice();
+// updateChannelValues();
+void Supla::Sensor::ElectricityMeter::onInit() {
+}
+
+void Supla::Sensor::ElectricityMeter::iterateAlways() {
+  if (millis() - lastReadTime > refreshRateSec*1000) {
+    lastReadTime = millis();
+    readValuesFromDevice();
+    updateChannelValues();
+  }
+}
+
+// Implement this method to reset stored energy value (i.e. to set energy
+// counter back to 0 kWh
+void Supla::Sensor::ElectricityMeter::resetStorage() {
+}
+
+Supla::Channel *Supla::Sensor::ElectricityMeter::getChannel() {
+  return &extChannel;
+}
+
+void Supla::Sensor::ElectricityMeter::setResreshRate(unsigned int sec) {
+  refreshRateSec = sec;
+  if (refreshRateSec == 0) {
+    refreshRateSec = 1;
+  }
+}
+
+
diff --git a/lib/SuplaDevice/src/supla/sensor/electricity_meter.h b/lib/SuplaDevice/src/supla/sensor/electricity_meter.h
index 3180e7e3..713ea99c 100644
--- a/lib/SuplaDevice/src/supla/sensor/electricity_meter.h
+++ b/lib/SuplaDevice/src/supla/sensor/electricity_meter.h
@@ -17,7 +17,6 @@
 #ifndef _electricity_meter_h
 #define _electricity_meter_h
 
-#include <string.h>
 #include <Arduino.h>
 
 #include "../channel_extended.h"
@@ -30,199 +29,52 @@ namespace Supla {
 namespace Sensor {
 class ElectricityMeter : public Element {
  public:
-  ElectricityMeter() : valueChanged(false), lastReadTime(0) {
-    extChannel.setType(SUPLA_CHANNELTYPE_ELECTRICITY_METER);
-    extChannel.setDefault(SUPLA_CHANNELFNC_ELECTRICITY_METER);
-    memset(&emValue, 0, sizeof(emValue));
-    emValue.period = 5;
-    for (int i = 0; i < MAX_PHASES; i++) {
-      rawCurrent[i] = 0;
-    }
-    currentMeasurementAvailable = false;
-  }
+  ElectricityMeter();
 
-  virtual void updateChannelValues() {
-    if (!valueChanged) {
-      return;
-    }
-    valueChanged = false;
-
-    emValue.m_count = 1;
-
-    // Update current messurement precision based on last updates
-    if (currentMeasurementAvailable) {
-      bool over65A = false;
-      for (int i = 0; i < MAX_PHASES; i++) {
-        if (rawCurrent[i] > 65000) {
-          over65A = true;
-        }
-      }
-
-      for (int i = 0; i < MAX_PHASES; i++) {
-        if (over65A) {
-          emValue.m[0].current[i] = rawCurrent[i] / 10;
-        } else {
-          emValue.m[0].current[i] = rawCurrent[i];
-        }
-      }
-
-      if (over65A) {
-        emValue.measured_values ^= (!EM_VAR_CURRENT);
-        emValue.measured_values |= EM_VAR_CURRENT_OVER_65A;
-      } else {
-        emValue.measured_values ^= (!EM_VAR_CURRENT_OVER_65A);
-        emValue.measured_values |= EM_VAR_CURRENT;
-      }
-    }
-
-    // Prepare extended channel value
-    srpc_evtool_v2_emextended2extended(&emValue, extChannel.getExtValue());
-    extChannel.setNewValue(emValue);
-  }
+  virtual void updateChannelValues();
 
   // energy in 0.00001 kWh
-  void setFwdActEnergy(int phase, unsigned _supla_int64_t energy) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.total_forward_active_energy[phase] != energy) {
-        valueChanged = true;
-      }
-      emValue.total_forward_active_energy[phase] = energy;
-      emValue.measured_values |= EM_VAR_FORWARD_ACTIVE_ENERGY;
-    }
-  }
+  void setFwdActEnergy(int phase, unsigned _supla_int64_t energy);
 
   // energy in 0.00001 kWh
-  void setRvrActEnergy(int phase, unsigned _supla_int64_t energy) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.total_reverse_active_energy[phase] != energy) {
-        valueChanged = true;
-      }
-      emValue.total_reverse_active_energy[phase] = energy;
-      emValue.measured_values |= EM_VAR_REVERSE_ACTIVE_ENERGY;
-    }
-  }
+  void setRvrActEnergy(int phase, unsigned _supla_int64_t energy);
 
   // energy in 0.00001 kWh
-  void setFwdReactEnergy(int phase, unsigned _supla_int64_t energy) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.total_forward_reactive_energy[phase] != energy) {
-        valueChanged = true;
-      }
-      emValue.total_forward_reactive_energy[phase] = energy;
-      emValue.measured_values |= EM_VAR_FORWARD_REACTIVE_ENERGY;
-    }
-  }
+  void setFwdReactEnergy(int phase, unsigned _supla_int64_t energy);
 
   // energy in 0.00001 kWh
-  void setRvrReactEnergy(int phase, unsigned _supla_int64_t energy) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.total_reverse_reactive_energy[phase] != energy) {
-        valueChanged = true;
-      }
-      emValue.total_reverse_reactive_energy[phase] = energy;
-      emValue.measured_values |= EM_VAR_REVERSE_REACTIVE_ENERGY;
-    }
-  }
+  void setRvrReactEnergy(int phase, unsigned _supla_int64_t energy);
 
   // voltage in 0.01 V
-  void setVoltage(int phase, unsigned _supla_int16_t voltage) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.m[0].voltage[phase] != voltage) {
-        valueChanged = true;
-      }
-      emValue.m[0].voltage[phase] = voltage;
-      emValue.measured_values |= EM_VAR_VOLTAGE;
-    }
-  }
+  void setVoltage(int phase, unsigned _supla_int16_t voltage);
 
   // current in 0.001 A
-  void setCurrent(int phase, unsigned _supla_int_t current) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (rawCurrent[phase] != current) {
-        valueChanged = true;
-      }
-      rawCurrent[phase] = current;
-      currentMeasurementAvailable = true;
-    }
-  }
+  void setCurrent(int phase, unsigned _supla_int_t current);
 
   // Frequency in 0.01 Hz
-  void setFreq(unsigned _supla_int16_t freq) {
-    if (emValue.m[0].freq != freq) {
-      valueChanged = true;
-    }
-    emValue.m[0].freq = freq;
-    emValue.measured_values |= EM_VAR_FREQ;
-  }
+  void setFreq(unsigned _supla_int16_t freq);
 
   // power in 0.00001 kW
-  void setPowerActive(int phase, _supla_int_t power) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.m[0].power_active[phase] != power) {
-        valueChanged = true;
-      }
-      emValue.m[0].power_active[phase] = power;
-      emValue.measured_values |= EM_VAR_POWER_ACTIVE;
-    }
-  }
+  void setPowerActive(int phase, _supla_int_t power);
 
   // power in 0.00001 kvar
-  void setPowerReactive(int phase, _supla_int_t power) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.m[0].power_reactive[phase] != power) {
-        valueChanged = true;
-      }
-      emValue.m[0].power_reactive[phase] = power;
-      emValue.measured_values |= EM_VAR_POWER_REACTIVE;
-    }
-  }
+  void setPowerReactive(int phase, _supla_int_t power);
 
   // power in 0.00001 kVA
-  void setPowerApparent(int phase, _supla_int_t power) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.m[0].power_apparent[phase] != power) {
-        valueChanged = true;
-      }
-      emValue.m[0].power_apparent[phase] = power;
-      emValue.measured_values |= EM_VAR_POWER_APPARENT;
-    }
-  }
+  void setPowerApparent(int phase, _supla_int_t power);
 
   // power in 0.001
-  void setPowerFactor(int phase, _supla_int_t powerFactor) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.m[0].power_factor[phase] != powerFactor) {
-        valueChanged = true;
-      }
-      emValue.m[0].power_factor[phase] = powerFactor;
-      emValue.measured_values |= EM_VAR_POWER_FACTOR;
-    }
-  }
+  void setPowerFactor(int phase, _supla_int_t powerFactor);
 
   // phase angle in 0.1 degree
-  void setPhaseAngle(int phase, _supla_int_t phaseAngle) {
-    if (phase >= 0 && phase < MAX_PHASES) {
-      if (emValue.m[0].phase_angle[phase] != phaseAngle) {
-        valueChanged = true;
-      }
-      emValue.m[0].phase_angle[phase] = phaseAngle;
-      emValue.measured_values |= EM_VAR_PHASE_ANGLE;
-    }
-  }
+  void setPhaseAngle(int phase, _supla_int_t phaseAngle);
 
-  void resetReadParameters() {
-    if (emValue.measured_values != 0) {
-      emValue.measured_values = 0;
-      memset(&emValue.m[0], 0, sizeof(TElectricityMeter_Measurement));
-      valueChanged = true;
-    }
-  }
+  void resetReadParameters();
 
   // Please implement this class for reading value from elecricity meter device.
   // It will be called every 5 s. Use set methods defined above in order to
   // set values on channel. Don't use any other method to modify channel values.
-  virtual void readValuesFromDevice() {
-  }
+  virtual void readValuesFromDevice();
 
   // Put here initialization code for electricity meter device.
   // It will be called within SuplaDevce.begin method.
@@ -230,35 +82,30 @@ class ElectricityMeter : public Element {
   // methods:
   // readValuesFromDevice();
   // updateChannelValues();
-  void onInit() {
-  }
+  void onInit();
 
-  void iterateAlways() {
-    if (lastReadTime + 5000 < millis()) {
-      lastReadTime = millis();
-      readValuesFromDevice();
-      updateChannelValues();
-    }
-  }
+  void iterateAlways();
 
   // Implement this method to reset stored energy value (i.e. to set energy
   // counter back to 0 kWh
-  virtual void resetStorage() {
-  }
+  virtual void resetStorage();
+
+  void setResreshRate(unsigned int sec);
 
  protected:
-  Channel *getChannel() {
-    return &extChannel;
-  }
+  Channel *getChannel();
+
   TElectricityMeter_ExtendedValue_V2 emValue;
   ChannelExtended extChannel;
   unsigned _supla_int_t rawCurrent[MAX_PHASES];
   bool valueChanged;
   bool currentMeasurementAvailable;
   unsigned long lastReadTime;
+  unsigned int refreshRateSec;
 };
 
 };  // namespace Sensor
 };  // namespace Supla
 
 #endif
+
diff --git a/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp b/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp
index d710eea3..4589a9fd 100644
--- a/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp
@@ -19,6 +19,7 @@
 #include <supla-common/log.h>
 #include <supla/storage/storage.h>
 #include <supla/actions.h>
+#include <supla/io.h>
 
 #include "impulse_counter.h"
 
@@ -52,9 +53,9 @@ ImpulseCounter::ImpulseCounter(int _impulsePin,
 
 void ImpulseCounter::onInit() {
   if (inputPullup) {
-    pinMode(impulsePin, INPUT_PULLUP);
+    Supla::Io::pinMode(channel.getChannelNumber(), impulsePin, INPUT_PULLUP);
   } else {
-    pinMode(impulsePin, INPUT);
+    Supla::Io::pinMode(channel.getChannelNumber(), impulsePin, INPUT);
   }
 }
 
@@ -88,7 +89,7 @@ void ImpulseCounter::incCounter() {
 }
 
 void ImpulseCounter::onFastTimer() {
-  int currentState = digitalRead(impulsePin);
+  int currentState = Supla::Io::digitalRead(channel.getChannelNumber(), impulsePin);
   if (prevState == (detectLowToHigh == true ? LOW : HIGH)) {
     if (millis() - lastImpulseMillis > debounceDelay) {
       if (currentState == (detectLowToHigh == true ? HIGH : LOW)) {
diff --git a/lib/SuplaDevice/src/supla/storage/storage.cpp b/lib/SuplaDevice/src/supla/storage/storage.cpp
index 52dfaf8e..8e21d098 100644
--- a/lib/SuplaDevice/src/supla/storage/storage.cpp
+++ b/lib/SuplaDevice/src/supla/storage/storage.cpp
@@ -83,6 +83,12 @@ bool Storage::SaveStateAllowed(unsigned long ms) {
   return false;
 }
 
+void Storage::ScheduleSave(unsigned long delayMs) {
+  if (Instance()) {
+    Instance()->scheduleSave(delayMs);
+  }
+}
+
 Storage::Storage(unsigned int storageStartingOffset)
     : storageStartingOffset(storageStartingOffset),
       deviceConfigOffset(0),
@@ -319,3 +325,11 @@ bool Storage::saveStateAllowed(unsigned long ms) {
   return false;
 }
 
+void Storage::scheduleSave(unsigned long delayMs) {
+  unsigned long currentMs = millis();
+  unsigned long newTimestamp = currentMs - saveStatePeriod - 1 + delayMs;
+  
+  if (currentMs - lastWriteTimestamp  < currentMs - newTimestamp) {
+    lastWriteTimestamp = newTimestamp;
+  }
+}
diff --git a/lib/SuplaDevice/src/supla/storage/storage.h b/lib/SuplaDevice/src/supla/storage/storage.h
index 66284302..f25a4091 100644
--- a/lib/SuplaDevice/src/supla/storage/storage.h
+++ b/lib/SuplaDevice/src/supla/storage/storage.h
@@ -36,6 +36,7 @@ class Storage {
   static void PrepareState(bool dryRun = false);
   static bool FinalizeSaveState();
   static bool SaveStateAllowed(unsigned long);
+  static void ScheduleSave(unsigned long delayMs);
 
   Storage(unsigned int storageStartingOffset = 0);
 
@@ -51,6 +52,7 @@ class Storage {
   virtual void prepareState(bool performDryRun);
   virtual bool finalizeSaveState();
   virtual bool saveStateAllowed(unsigned long);
+  virtual void scheduleSave(unsigned long delayMs);
 
   virtual void commit() = 0;
 
diff --git a/lib/SuplaDevice/src/supla/timer.cpp b/lib/SuplaDevice/src/supla/timer.cpp
index b77eb54a..a0a50ec7 100644
--- a/lib/SuplaDevice/src/supla/timer.cpp
+++ b/lib/SuplaDevice/src/supla/timer.cpp
@@ -20,7 +20,7 @@
 #include "timer.h"
 
 #if defined(ARDUINO_ARCH_ESP32)
-#include <esp_timer.h>
+#include <Ticker.h>
 #endif
 
 namespace {
@@ -38,14 +38,14 @@ void esp_fastTimer_cb(void *timer_arg) {
   SuplaDevice.onFastTimer();
 }
 #elif defined(ARDUINO_ARCH_ESP32)
-hw_timer_t *supla_esp_timer = NULL;
-hw_timer_t *supla_esp_fastTimer = NULL;
+Ticker supla_esp_timer;
+Ticker supla_esp_fastTimer;
 
-void IRAM_ATTR esp_timer_cb() {
+void esp_timer_cb() {
   SuplaDevice.onTimer();
 }
 
-void IRAM_ATTR esp_fastTimer_cb() {
+void esp_fastTimer_cb() {
   SuplaDevice.onFastTimer();
 }
 #else
@@ -71,17 +71,8 @@ void initTimers() {
   os_timer_arm(&supla_esp_fastTimer, 1, 1);
 
 #elif defined(ARDUINO_ARCH_ESP32)
-  supla_esp_timer = timerBegin(0, 80, true);                   // timer 0, div 80
-  timerAttachInterrupt(supla_esp_timer, &esp_timer_cb, true);  // attach callback
-  timerAlarmWrite(supla_esp_timer, 10 * 1000, false);          // set time in us
-  timerAlarmEnable(supla_esp_timer);                           // enable interrupt
-
-  supla_esp_fastTimer = timerBegin(1, 80, true);
-  timerAttachInterrupt(supla_esp_fastTimer,
-                       &esp_fastTimer_cb,
-                       true);                       // attach callback
-  timerAlarmWrite(supla_esp_fastTimer, 1 * 1000, false);  // set time in us
-  timerAlarmEnable(supla_esp_fastTimer);                  // enable interrupt
+  supla_esp_timer.attach_ms(10, esp_timer_cb);
+  supla_esp_fastTimer.attach_ms(1, esp_fastTimer_cb);
 #else
   // Timer 1 for interrupt frequency 100 Hz (10 ms)
   TCCR1A = 0;  // set entire TCCR1A register to 0

From a72e11268a37707b44ac07c620a857f6b78a4125 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 14 Jan 2021 08:29:41 +0100
Subject: [PATCH 032/165] aktualizacja SuplaDevice

---
 lib/SuplaDevice/examples/Afore/Afore.ino      |  33 +--
 lib/SuplaDevice/examples/DHT/DHT.ino          |  35 ++-
 .../DallasTemperature/DallasTemperature.ino   |  35 ++-
 lib/SuplaDevice/examples/Fronius/Fronius.ino  |  33 +--
 .../HC_SR04_Distance_sensor.ino               |  37 ++-
 .../ImpulseCounter/ImpulseCounter.ino         |  36 ++-
 .../examples/Pzem_V_2/Pzem_V_2.ino            |  28 +-
 .../examples/Pzem_V_3/Pzem_V_3.ino            |  80 +++---
 lib/SuplaDevice/examples/RGBW/RGBW.ino        |  35 ++-
 .../examples/RollerShutter/RollerShutter.ino  |  35 +--
 .../SequenceButton/SequenceButton.ino         |  35 ++-
 lib/SuplaDevice/extras/test/CMakeLists.txt    |  20 +-
 .../test/ChannelTests/channel_tests.cpp       | 270 ++++++++++++++++++
 .../extras/test/IoTests/io_tests.cpp          |  26 ++
 .../extras/test/UptimeTests/uptime_tests.cpp  |  16 ++
 lib/SuplaDevice/extras/test/doubles/Arduino.h | 109 +++++++
 .../extras/test/doubles/arduino_mock.cpp      |  59 ++++
 lib/SuplaDevice/extras/test/doubles/log.cpp   |  22 ++
 lib/SuplaDevice/extras/test/doubles/srpc.cpp  |  29 ++
 lib/SuplaDevice/src/CMakeLists.txt            |   4 +
 lib/SuplaDevice/src/SuplaDevice.cpp           |   1 -
 .../src/supla-common/IEEE754tools.h           |   7 -
 lib/SuplaDevice/src/supla/channel.cpp         | 119 +++++---
 lib/SuplaDevice/src/supla/channel.h           |  23 +-
 lib/SuplaDevice/src/supla/control/relay.h     |   3 +-
 lib/SuplaDevice/src/supla/control/rgbw_base.h |  26 +-
 .../src/supla/control/roller_shutter.cpp      |  29 +-
 .../src/supla/control/roller_shutter.h        |   4 +-
 lib/SuplaDevice/src/supla/element.cpp         |   4 +
 lib/SuplaDevice/src/supla/element.h           |   3 +-
 lib/SuplaDevice/src/supla/sensor/binary.h     |   2 +-
 lib/SuplaDevice/src/supla/sensor/distance.h   |   5 +-
 .../src/supla/sensor/electricity_meter.h      |   2 +-
 .../sensor/general_purpose_measurement_base.h |   3 +-
 .../src/supla/sensor/impulse_counter.h        |   3 +-
 lib/SuplaDevice/src/supla/sensor/pressure.h   |   4 +-
 lib/SuplaDevice/src/supla/sensor/rain.h       |   4 +-
 .../src/supla/sensor/therm_hygro_meter.cpp    |  37 +++
 .../src/supla/sensor/therm_hygro_meter.h      |  26 +-
 .../supla/sensor/therm_hygro_press_meter.cpp  |  57 ++++
 .../supla/sensor/therm_hygro_press_meter.h    |  41 +--
 .../src/supla/sensor/thermometer.cpp          |  37 +++
 .../src/supla/sensor/thermometer.h            |  24 +-
 .../src/supla/sensor/virtual_binary.h         |   2 +-
 lib/SuplaDevice/src/supla/sensor/weight.h     |   4 +-
 lib/SuplaDevice/src/supla/sensor/wind.h       |   4 +-
 lib/SuplaDevice/src/supla/tools.cpp           |  13 +
 lib/SuplaDevice/src/supla/tools.h             |   2 +
 48 files changed, 1066 insertions(+), 400 deletions(-)
 create mode 100644 lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/IoTests/io_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/doubles/Arduino.h
 create mode 100644 lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp
 create mode 100644 lib/SuplaDevice/extras/test/doubles/log.cpp
 create mode 100644 lib/SuplaDevice/extras/test/doubles/srpc.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/thermometer.cpp

diff --git a/lib/SuplaDevice/examples/Afore/Afore.ino b/lib/SuplaDevice/examples/Afore/Afore.ino
index eaace6d9..859636c9 100644
--- a/lib/SuplaDevice/examples/Afore/Afore.ino
+++ b/lib/SuplaDevice/examples/Afore/Afore.ino
@@ -14,28 +14,25 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/pv/afore.h>
 
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
 
diff --git a/lib/SuplaDevice/examples/DHT/DHT.ino b/lib/SuplaDevice/examples/DHT/DHT.ino
index b91c0fea..e0c85e2a 100644
--- a/lib/SuplaDevice/examples/DHT/DHT.ino
+++ b/lib/SuplaDevice/examples/DHT/DHT.ino
@@ -14,28 +14,25 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/sensor/DHT.h>
 
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 /*
  * This example requires DHT sensor library installed. 
@@ -49,7 +46,7 @@ Supla::EthernetShield ethernet(mac);
  
 void setup() {
 
-  Serial.begin(9600);
+  Serial.begin(115200);
 
   // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
   char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/lib/SuplaDevice/examples/DallasTemperature/DallasTemperature.ino b/lib/SuplaDevice/examples/DallasTemperature/DallasTemperature.ino
index f10308df..81eb8fbc 100644
--- a/lib/SuplaDevice/examples/DallasTemperature/DallasTemperature.ino
+++ b/lib/SuplaDevice/examples/DallasTemperature/DallasTemperature.ino
@@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 
 /*
@@ -26,27 +25,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
 
-  Serial.begin(9600);
+  Serial.begin(115200);
 
   // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
   char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/lib/SuplaDevice/examples/Fronius/Fronius.ino b/lib/SuplaDevice/examples/Fronius/Fronius.ino
index 98b3b7ad..27cc0e75 100644
--- a/lib/SuplaDevice/examples/Fronius/Fronius.ino
+++ b/lib/SuplaDevice/examples/Fronius/Fronius.ino
@@ -14,28 +14,25 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/pv/fronius.h>
 
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
 
diff --git a/lib/SuplaDevice/examples/HC_SR04_Distance_sensor/HC_SR04_Distance_sensor.ino b/lib/SuplaDevice/examples/HC_SR04_Distance_sensor/HC_SR04_Distance_sensor.ino
index 2de1ac58..0bb45c39 100644
--- a/lib/SuplaDevice/examples/HC_SR04_Distance_sensor/HC_SR04_Distance_sensor.ino
+++ b/lib/SuplaDevice/examples/HC_SR04_Distance_sensor/HC_SR04_Distance_sensor.ino
@@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 
 // Add include to HC_SR04 sensor
@@ -22,27 +21,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
 
-  Serial.begin(9600);
+  Serial.begin(115200);
 
   // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
   char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -63,7 +60,7 @@ void setup() {
 
   /*
    * SuplaDevice Initialization.
-   * Server address, LocationID and LocationPassword are available at https://cloud.supla.org 
+   * Server address is available at https://cloud.supla.org 
    * If you do not have an account, you can create it at https://cloud.supla.org/account/create
    * SUPLA and SUPLA CLOUD are free of charge
    * 
diff --git a/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino b/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino
index 5035b970..fe626866 100644
--- a/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino
+++ b/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino
@@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/sensor/impulse_counter.h>
 
@@ -26,29 +25,26 @@ Supla::Eeprom eeprom(STORAGE_OFFSET);
 // #include <supla/storage/fram_spi.h>
 // Supla::FramSpi fram(STORAGE_OFFSET);
 
-
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
 
-  Serial.begin(9600);
+  Serial.begin(115200);
 
   // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
   char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/lib/SuplaDevice/examples/Pzem_V_2/Pzem_V_2.ino b/lib/SuplaDevice/examples/Pzem_V_2/Pzem_V_2.ino
index e03d4aa9..0b8c4918 100644
--- a/lib/SuplaDevice/examples/Pzem_V_2/Pzem_V_2.ino
+++ b/lib/SuplaDevice/examples/Pzem_V_2/Pzem_V_2.ino
@@ -13,24 +13,32 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    */
-  // this example will work only on esp8266 and esp32 boards. On Arduino mega it will not fly.
+
   //dependence: Arduino communication library for Peacefair PZEM-004T Energy monitor  https://github.com/olehs/PZEM004T
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/sensor/PzemV2.h>
 
-// ESP8266 based board:
-#include <supla/network/esp_wifi.h>
-Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+// Choose proper network interface for your card:
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
 
-    Serial.begin(9600);
+    Serial.begin(115200);
 
     // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
     char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/lib/SuplaDevice/examples/Pzem_V_3/Pzem_V_3.ino b/lib/SuplaDevice/examples/Pzem_V_3/Pzem_V_3.ino
index fd435453..85fe0bb6 100644
--- a/lib/SuplaDevice/examples/Pzem_V_3/Pzem_V_3.ino
+++ b/lib/SuplaDevice/examples/Pzem_V_3/Pzem_V_3.ino
@@ -13,56 +13,66 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    */
-  // this example will work only on esp8266 and esp32 boards. On Arduino mega it will not fly.
-  //dependence: Arduino library for the Updated PZEM-004T v3.0 Power and Energy meter  https://github.com/mandulaj/PZEM-004T-v30
 
-#include <SPI.h>
+// dependence: Arduino library for the Updated PZEM-004T v3.0 Power and Energy
+// meter  https://github.com/mandulaj/PZEM-004T-v30
+
 #include <SuplaDevice.h>
 #include <supla/sensor/PzemV3.h>
 
-// ESP8266 based board:
+// Choose proper network interface for your card:
+#ifdef ARDUINO_ARCH_AVR
+// Arduino Mega with EthernetShield W5100:
+#include <supla/network/ethernet_shield.h>
+// Ethernet MAC address
+uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+Supla::EthernetShield ethernet(mac);
+
+// Arduino Mega with ENC28J60:
+// #include <supla/network/ENC28J60.h>
+// Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+// ESP8266 and ESP32 based board:
 #include <supla/network/esp_wifi.h>
 Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
+  Serial.begin(115200);
 
-    Serial.begin(9600);
-
-    // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
-    char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-    // Replace the following AUTHKEY with value that you can retrieve from: https://www.supla.org/arduino/get-authkey
-    char AUTHKEY[SUPLA_AUTHKEY_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+  // Replace the falowing GUID with value that you can retrieve from
+  // https://www.supla.org/arduino/get-guid
+  char GUID[SUPLA_GUID_SIZE] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-    /*
-     * Having your device already registered at cloud.supla.org,
-     * you want to change CHANNEL sequence or remove any of them,
-     * then you must also remove the device itself from cloud.supla.org.
-     * Otherwise you will get "Channel conflict!" error.
-     */
-
-    new Supla::Sensor::PZEMv3(5, 4); // (RX,TX)
+  // Replace the following AUTHKEY with value that you can retrieve from:
+  // https://www.supla.org/arduino/get-authkey
+  char AUTHKEY[SUPLA_AUTHKEY_SIZE] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
+  /*
+   * Having your device already registered at cloud.supla.org,
+   * you want to change CHANNEL sequence or remove any of them,
+   * then you must also remove the device itself from cloud.supla.org.
+   * Otherwise you will get "Channel conflict!" error.
+   */
 
-    /*
-     * SuplaDevice Initialization.
-     * Server address, is available at https://cloud.supla.org
-     * If you do not have an account, you can create it at https://cloud.supla.org/account/create
-     * SUPLA and SUPLA CLOUD are free of charge
-     *
-     */
+  new Supla::Sensor::PZEMv3(5, 4);  // (RX,TX)
 
-    SuplaDevice.begin(GUID, // Global Unique Identifier
-            "svr1.supla.org", // SUPLA server address
-            "email@address", // Email address used to login to Supla Cloud
-            AUTHKEY); // Authorization key
+  /*
+   * SuplaDevice Initialization.
+   * Server address, is available at https://cloud.supla.org
+   * If you do not have an account, you can create it at
+   * https://cloud.supla.org/account/create SUPLA and SUPLA CLOUD are free of
+   * charge
+   *
+   */
 
+  SuplaDevice.begin(
+      GUID,              // Global Unique Identifier
+      "svr1.supla.org",  // SUPLA server address
+      "email@address",   // Email address used to login to Supla Cloud
+      AUTHKEY);          // Authorization key
 }
 
 void loop() {
-    SuplaDevice.iterate();
+  SuplaDevice.iterate();
 }
diff --git a/lib/SuplaDevice/examples/RGBW/RGBW.ino b/lib/SuplaDevice/examples/RGBW/RGBW.ino
index 994fd701..fb446e08 100644
--- a/lib/SuplaDevice/examples/RGBW/RGBW.ino
+++ b/lib/SuplaDevice/examples/RGBW/RGBW.ino
@@ -14,28 +14,25 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/control/rgbw_base.h>
 
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 /*
  * Youtube: https://youtu.be/FE9tqzTjmA4
@@ -83,7 +80,7 @@ class RgbwLeds : public Supla::Control::RGBWBase {
 };
 
 void setup() {
-  Serial.begin(9600);
+  Serial.begin(115200);
 
   // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
   char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino b/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino
index 9747b4e6..7cb0231d 100644
--- a/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino
+++ b/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino
@@ -14,7 +14,6 @@
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/control/roller_shutter.h>
 #include <supla/control/button.h>
@@ -27,30 +26,26 @@ Supla::Eeprom eeprom(STORAGE_OFFSET);
 // #include <supla/storage/fram_spi.h>
 // Supla::FramSpi fram(STORAGE_OFFSET);
 
-
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-// #include <supla/network/esp_wifi.h>
-// Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
 
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 void setup() {
 
-  Serial.begin(9600);
+  Serial.begin(115200);
 
   // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
   char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino b/lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino
index 8647974a..75f81134 100644
--- a/lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino
+++ b/lib/SuplaDevice/examples/SequenceButton/SequenceButton.ino
@@ -14,29 +14,26 @@
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <SPI.h>
 #include <SuplaDevice.h>
 #include <supla/control/relay.h>
 #include <supla/control/sequence_button.h>
 
 // Choose proper network interface for your card:
-// Arduino Mega with EthernetShield W5100:
-//#include <supla/network/ethernet_shield.h>
-// Ethernet MAC address
-//uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
-//Supla::EthernetShield ethernet(mac);
-//
-// Arduino Mega with ENC28J60:
-// #include <supla/network/ENC28J60.h>
-// Supla::ENC28J60 ethernet(mac);
-//
-// ESP8266 based board:
-#include <supla/network/esp_wifi.h>
-Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
-//
-// ESP32 based board:
-// #include <supla/network/esp32_wifi.h>
-// Supla::ESP32Wifi wifi("your_wifi_ssid", "your_wifi_password");
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
 
 
 void setup() {
@@ -58,7 +55,7 @@ void setup() {
     
   auto secretRelay = new Supla::Control::Relay(30, false); // Low level trigger relay on pin 30 
   auto alarmRelay = new Supla::Control::Relay(31, false);  // Low level trigger relay on pin 31
-  auto seqButton = new Supla::Control::SequenceButton(D9, true, true); // Button on pin 28 with internal pullUp 
+  auto seqButton = new Supla::Control::SequenceButton(28, true, true); // Button on pin 28 with internal pullUp 
                                                                        // and LOW is considered as "pressed" state
 
   // Sequence of lenghts [ms] of button being presset, released, pressed, released, etc.
diff --git a/lib/SuplaDevice/extras/test/CMakeLists.txt b/lib/SuplaDevice/extras/test/CMakeLists.txt
index 12e94f97..a96d1608 100644
--- a/lib/SuplaDevice/extras/test/CMakeLists.txt
+++ b/lib/SuplaDevice/extras/test/CMakeLists.txt
@@ -6,17 +6,24 @@ enable_testing()
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_BUILD_TYPE Debug)
 
 include_directories(../../src)
+include_directories(doubles)
 
 add_subdirectory(../../src/ build)
 
+mark_as_advanced(
+BUILD_GMOCK
+BUILD_GTEST
+)
+
 include(FetchContent)
 
 FetchContent_Declare(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
-  GIT_TAG        release-1.8.0
+  GIT_TAG        release-1.10.0
   )
 
 FetchContent_GetProperties(googletest)
@@ -25,11 +32,18 @@ if(NOT googletest_POPULATED)
   add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
 endif()
 
-file(GLOB SRCS UptimeTests/*.cpp)
+file(GLOB TEST_SRC
+  UptimeTests/*.cpp
+  ChannelTests/*cpp
+  IoTests/*.cpp
+  )
+
+file(GLOB DOUBLE_SRC doubles/*.cpp)
 
-add_executable(supladevicetests ${SRCS})
+add_executable(supladevicetests ${TEST_SRC} ${DOUBLE_SRC})
 
 target_link_libraries(supladevicetests
+  gmock
   gtest
   gtest_main
   supladevicelib
diff --git a/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp b/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
new file mode 100644
index 00000000..4fc872f4
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
@@ -0,0 +1,270 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/channel.h>
+#include <supla/channel_extended.h>
+
+TEST(ChannelTests, ChannelMethods) {
+  Supla::Channel first;
+  Supla::Channel second;
+
+  EXPECT_EQ(first.getChannelNumber(), 0);
+  EXPECT_EQ(second.getChannelNumber(), 1);
+
+  EXPECT_EQ(first.isExtended(), false);
+  EXPECT_EQ(first.isUpdateReady(), false);
+  EXPECT_EQ(first.getChannelType(), 0);
+  EXPECT_EQ(first.getExtValue(), nullptr);
+
+  int number = first.getChannelNumber();
+  char emptyArray[SUPLA_CHANNELVALUE_SIZE] = {};
+  EXPECT_EQ(number, Supla::Channel::reg_dev.channels[number].Number);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Type, 0);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].FuncList, 0);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Default, 0);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Flags, SUPLA_CHANNEL_FLAG_CHANNELSTATE);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, emptyArray, SUPLA_CHANNELVALUE_SIZE));
+
+  first.setType(10);
+  EXPECT_EQ(first.getChannelType(), 10);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Type, 10);
+
+  first.setDefault(14);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Default, 14);
+
+  first.setFlag(2);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Flags, SUPLA_CHANNEL_FLAG_CHANNELSTATE | 2);
+
+  first.setFlag(4);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Flags, SUPLA_CHANNEL_FLAG_CHANNELSTATE | 2 | 4);
+
+  first.unsetFlag(2);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Flags, SUPLA_CHANNEL_FLAG_CHANNELSTATE | 4);
+
+  first.unsetFlag(SUPLA_CHANNEL_FLAG_CHANNELSTATE);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].Flags, 4);
+
+  first.setFuncList(11);
+  EXPECT_EQ(Supla::Channel::reg_dev.channels[number].FuncList, 11);
+
+}
+
+TEST(ChannelTests, SetNewValue) {
+  Supla::Channel channel;
+  int number = channel.getChannelNumber();
+  char emptyArray[SUPLA_CHANNELVALUE_SIZE] = {};
+
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, emptyArray, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_FALSE(channel.isUpdateReady());
+
+  char array[SUPLA_CHANNELVALUE_SIZE] = {0, 1, 2, 3, 4, 5, 6, 7};
+  channel.setNewValue(array);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, array, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_TRUE(channel.isUpdateReady());
+
+  channel.clearUpdateReady();
+  EXPECT_FALSE(channel.isUpdateReady());
+
+  channel.setNewValue(array);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, array, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_FALSE(channel.isUpdateReady());
+
+  array[4] = 15;
+  channel.setNewValue(array);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, array, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_TRUE(channel.isUpdateReady());
+
+  ASSERT_EQ(sizeof(double), 8);
+  double temp = 3.1415;
+  channel.setNewValue(temp);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &temp, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  char arrayBool[SUPLA_CHANNELVALUE_SIZE] = {};
+  arrayBool[0] = true;
+  channel.setNewValue(true);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, arrayBool, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  channel.setNewValue(false);
+  arrayBool[0] = false;
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, arrayBool, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  int value = 1234;
+  ASSERT_EQ(sizeof(int), 4);
+  channel.setNewValue(value);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &value, sizeof(int)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+  
+  _supla_int64_t value64 = 124346;
+  ASSERT_EQ(sizeof(value64), 8);
+  channel.setNewValue(value64);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &value64, sizeof(value64)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+  
+  double humi = 95.2234123;
+  temp = 23.443322;
+
+  int expectedTemp = temp * 1000;
+  int expectedHumi = humi * 1000;
+
+  channel.setNewValue(temp, humi);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedTemp, sizeof(expectedTemp)));
+  EXPECT_TRUE(0 == memcmp(&(Supla::Channel::reg_dev.channels[number].value[4]), &expectedHumi, sizeof(expectedHumi)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  // RGBW channel setting
+  channel.setNewValue(1, 2, 3, 4, 5);
+  char rgbwArray[SUPLA_CHANNELVALUE_SIZE] = {5, 4, 3, 2, 1, 0, 0, 0};
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, rgbwArray, SUPLA_CHANNELVALUE_SIZE));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  TElectricityMeter_ExtendedValue_V2 emVal = {};
+  TElectricityMeter_Value expectedValue = {};
+
+  emVal.m_count = 1;
+  emVal.measured_values |= EM_VAR_FORWARD_ACTIVE_ENERGY;
+  emVal.total_forward_active_energy[0] = 1000;
+  emVal.total_forward_active_energy[1] = 2000;
+  emVal.total_forward_active_energy[2] = 4000;
+
+  expectedValue.total_forward_active_energy = (1000 + 2000 + 4000) / 1000;
+
+  channel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  emVal.measured_values |= EM_VAR_VOLTAGE;
+  emVal.m[0].voltage[0] = 10; 
+  emVal.m[0].voltage[1] = 0; 
+  emVal.m[0].voltage[2] = 0; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE1_ON;
+
+  channel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  emVal.m[0].voltage[0] = 0; 
+  emVal.m[0].voltage[1] = 20; 
+  emVal.m[0].voltage[2] = 0; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE2_ON;
+
+  channel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+
+  emVal.m[0].voltage[0] = 0; 
+  emVal.m[0].voltage[1] = 0; 
+  emVal.m[0].voltage[2] = 300; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE3_ON;
+
+  channel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+
+  emVal.m[0].voltage[0] = 10; 
+  emVal.m[0].voltage[1] = 0; 
+  emVal.m[0].voltage[2] = 540; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE1_ON | EM_VALUE_FLAG_PHASE3_ON;
+
+  channel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+
+  emVal.m[0].voltage[0] = 10; 
+  emVal.m[0].voltage[1] = 230; 
+  emVal.m[0].voltage[2] = 540; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE1_ON | EM_VALUE_FLAG_PHASE3_ON | EM_VALUE_FLAG_PHASE2_ON;
+
+  channel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.clearUpdateReady();
+}
+
+TEST(ChannelTests, ExtendedChannelMethods) {
+  Supla::ChannelExtended extChannel;
+
+  EXPECT_TRUE(extChannel.isExtended());
+  EXPECT_NE(nullptr, extChannel.getExtValue() );
+  
+}
+
+TEST(ChannelTests, ChannelValueGetters) {
+  Supla::Channel channel;
+
+  EXPECT_DOUBLE_EQ(channel.getValueDouble(), 0);
+
+  double pi = 3.1415;
+  channel.setNewValue(pi);
+  EXPECT_DOUBLE_EQ(channel.getValueDouble(), pi);
+
+  double e = 2.71828;
+  channel.setNewValue(pi, e);
+  EXPECT_NEAR(channel.getValueDoubleFirst(), pi, 0.001);
+  EXPECT_NEAR(channel.getValueDoubleSecond(), e, 0.001);
+
+  int valueInt = 2021;
+  channel.setNewValue(valueInt);
+  EXPECT_EQ(channel.getValueInt32(), valueInt);
+
+  _supla_int64_t valueInt64 = 202013012021000;
+  channel.setNewValue(valueInt64);
+  EXPECT_EQ(channel.getValueInt64(), valueInt64);
+
+  channel.setNewValue(true);
+  EXPECT_TRUE(channel.getValueBool());
+
+  channel.setNewValue(false);
+  EXPECT_FALSE(channel.getValueBool());
+
+  uint8_t red = 10, green = 20, blue = 30, colorBright = 50, bright = 90;
+  channel.setNewValue(red, green, blue, colorBright, bright);
+  EXPECT_EQ(channel.getValueRed(), red);
+  EXPECT_EQ(channel.getValueGreen(), green);
+  EXPECT_EQ(channel.getValueBlue(), blue);
+  EXPECT_EQ(channel.getValueColorBrightness(), colorBright);
+  EXPECT_EQ(channel.getValueBrightness(), bright);
+  
+
+}
diff --git a/lib/SuplaDevice/extras/test/IoTests/io_tests.cpp b/lib/SuplaDevice/extras/test/IoTests/io_tests.cpp
new file mode 100644
index 00000000..b0cd081d
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/IoTests/io_tests.cpp
@@ -0,0 +1,26 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/io.h>
+
+
+TEST(IoTests, DefaultBehavior) {
+  EXPECT_TRUE(true);
+
+}
+
diff --git a/lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp b/lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp
index 0280d0e1..59241f9b 100644
--- a/lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp
+++ b/lib/SuplaDevice/extras/test/UptimeTests/uptime_tests.cpp
@@ -1,3 +1,19 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include <gtest/gtest.h>
 #include <supla/uptime.h>
 
diff --git a/lib/SuplaDevice/extras/test/doubles/Arduino.h b/lib/SuplaDevice/extras/test/doubles/Arduino.h
new file mode 100644
index 00000000..66d39925
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/doubles/Arduino.h
@@ -0,0 +1,109 @@
+#ifndef _test_double_arduino_h
+#define _test_double_arduino_h
+
+#include <stdint.h>
+
+#include <string>
+
+typedef std::string String;
+
+#define LSBFIRST 0
+
+void digitalWrite(uint8_t pin, uint8_t val);
+int digitalRead(uint8_t pin);
+void pinMode(uint8_t pin, uint8_t mode);
+
+
+class SerialStub {
+ public:
+  SerialStub() {
+  }
+
+  virtual ~SerialStub() {
+  }
+
+  int printf(const char *format, ...) {
+    return 0;
+  }
+  int print(const String &) {
+    return 0;
+  }
+
+  int print(const char[]) {
+    return 0;
+  }
+
+  int print(char) {
+    return 0;
+  }
+
+  int print(unsigned char) {
+    return 0;
+  }
+
+  int print(int) {
+    return 0;
+  }
+
+  int print(unsigned int) {
+    return 0;
+  }
+
+  int print(long) {
+    return 0;
+  }
+
+  int print(unsigned long) {
+    return 0;
+  }
+
+  int print(double) {
+    return 0;
+  }
+
+
+  int println(const String &s) {
+    return 0;
+  }
+
+  int println(const char[]) {
+    return 0;
+  }
+
+  int println(char) {
+    return 0;
+  }
+
+  int println(unsigned char) {
+    return 0;
+  }
+
+  int println(int) {
+    return 0;
+  }
+
+  int println(unsigned int) {
+    return 0;
+  }
+
+  int println(long) {
+    return 0;
+  }
+
+  int println(unsigned long) {
+    return 0;
+  }
+
+  int println(double) {
+    return 0;
+  }
+
+  int println(void) {
+    return 0;
+  }
+
+};
+
+extern SerialStub Serial;
+
+#endif
diff --git a/lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp b/lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp
new file mode 100644
index 00000000..442b1c71
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp
@@ -0,0 +1,59 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+
+#include "Arduino.h"
+#include <gmock/gmock.h>
+
+SerialStub Serial;
+
+class DigitalInterface {
+  public:
+    DigitalInterface() {
+      instance = this;
+    }
+    virtual ~DigitalInterface() {
+      instance = nullptr;
+    }
+
+    virtual void digitalWrite(uint8_t, uint8_t) = 0;
+    virtual int digitalRead(uint8_t) = 0;
+    virtual void pinMode(uint8_t, uint8_t) = 0;
+    
+    static DigitalInterface *instance;
+};
+
+DigitalInterface *DigitalInterface::instance = nullptr;
+
+class DigitalInterfaceMock : public DigitalInterface {
+  MOCK_METHOD(void, digitalWrite, (uint8_t, uint8_t), (override));
+//  MOCK_METHOD(int, digitalRead, (uint8_t), (override));
+ // MOCK_METHOD(void, pinMode, (uint8_t, uint8_t), (override));
+
+};
+
+void digitalWrite(uint8_t pin, uint8_t val) {
+  DigitalInterface::instance->digitalWrite(pin, val);
+}
+
+int digitalRead(uint8_t pin) {
+  return DigitalInterface::instance->digitalRead(pin);
+}
+
+void pinMode(uint8_t pin, uint8_t mode) {
+  DigitalInterface::instance->pinMode(pin, mode);
+}
+
diff --git a/lib/SuplaDevice/extras/test/doubles/log.cpp b/lib/SuplaDevice/extras/test/doubles/log.cpp
new file mode 100644
index 00000000..e117cc36
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/doubles/log.cpp
@@ -0,0 +1,22 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <supla-common/log.h>
+
+void supla_log(int __pri, const char *__fmt, ...) {
+  return;
+}
+
diff --git a/lib/SuplaDevice/extras/test/doubles/srpc.cpp b/lib/SuplaDevice/extras/test/doubles/srpc.cpp
new file mode 100644
index 00000000..5ac9386a
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/doubles/srpc.cpp
@@ -0,0 +1,29 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <supla-common/srpc.h>
+
+_supla_int_t SRPC_ICACHE_FLASH srpc_ds_async_channel_extendedvalue_changed(
+    void *_srpc, unsigned char channel_number,
+    TSuplaChannelExtendedValue *value) {
+  return 0;
+}
+         
+_supla_int_t SRPC_ICACHE_FLASH srpc_ds_async_channel_value_changed(
+    void *_srpc, unsigned char channel_number, char *value) {
+  return 0;
+}
+
diff --git a/lib/SuplaDevice/src/CMakeLists.txt b/lib/SuplaDevice/src/CMakeLists.txt
index 2643ea2b..a4a988b7 100644
--- a/lib/SuplaDevice/src/CMakeLists.txt
+++ b/lib/SuplaDevice/src/CMakeLists.txt
@@ -1,5 +1,9 @@
 set(SRCS 
   supla/uptime.cpp
+  supla/channel.cpp
+  supla/channel_extended.cpp
+  supla/io.cpp
+  supla/tools.cpp
 )
 
 add_library(supladevicelib SHARED ${SRCS})
diff --git a/lib/SuplaDevice/src/SuplaDevice.cpp b/lib/SuplaDevice/src/SuplaDevice.cpp
index 210a909e..de04f397 100644
--- a/lib/SuplaDevice/src/SuplaDevice.cpp
+++ b/lib/SuplaDevice/src/SuplaDevice.cpp
@@ -330,7 +330,6 @@ void SuplaDeviceClass::iterate(void) {
     if (!srpc_ds_async_registerdevice_e(srpc, &Supla::Channel::reg_dev)) {
       supla_log(LOG_DEBUG, "Fatal SRPC failure!");
     }
-    Supla::Channel::clearAllUpdateReady();
 
   } else if (registered == 1) {
     if (Supla::Network::Ping() == false) {
diff --git a/lib/SuplaDevice/src/supla-common/IEEE754tools.h b/lib/SuplaDevice/src/supla-common/IEEE754tools.h
index 5a42beec..c38cfbc1 100644
--- a/lib/SuplaDevice/src/supla-common/IEEE754tools.h
+++ b/lib/SuplaDevice/src/supla-common/IEEE754tools.h
@@ -13,13 +13,6 @@
 #ifndef IEEE754tools_h
 #define IEEE754tools_h
 
-
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "Arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
 // IEEE754 float layout; 
 struct IEEEfloat
 {
diff --git a/lib/SuplaDevice/src/supla/channel.cpp b/lib/SuplaDevice/src/supla/channel.cpp
index b6c9a658..c0c231b0 100644
--- a/lib/SuplaDevice/src/supla/channel.cpp
+++ b/lib/SuplaDevice/src/supla/channel.cpp
@@ -14,13 +14,14 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include <string.h>
+
 #include "supla/channel.h"
 #include "supla-common/log.h"
 #include "supla-common/srpc.h"
 #include "tools.h"
 
 namespace Supla {
-Channel *Channel::firstPtr = nullptr;
 
 unsigned long Channel::lastCommunicationTimeMs = 0;
 TDS_SuplaRegisterDevice_E Channel::reg_dev;
@@ -30,44 +31,20 @@ Channel::Channel() {
   channelNumber = -1;
   if (reg_dev.channel_count < SUPLA_CHANNELMAXCOUNT) {
     channelNumber = reg_dev.channel_count;
+
+    memset(&reg_dev.channels[channelNumber], 0, sizeof(reg_dev.channels[channelNumber]));
     reg_dev.channels[channelNumber].Number = channelNumber;
+
     reg_dev.channel_count++;
   } else {
 // TODO: add status CHANNEL_LIMIT_EXCEEDED
   }
 
-  if (firstPtr == nullptr) {
-    firstPtr = this;
-  } else {
-    last()->nextPtr = this;
-  }
-  nextPtr = nullptr;
   setFlag(SUPLA_CHANNEL_FLAG_CHANNELSTATE);
 }
 
-Channel *Channel::begin() {
-  return firstPtr;
-}
-
-Channel *Channel::last() {
-  Channel *ptr = firstPtr;
-  while (ptr && ptr->nextPtr) {
-    ptr = ptr->nextPtr;
-  }
-  return ptr;
-}
-
-int Channel::size() {
-  int count = 0;
-  Channel *ptr = firstPtr;
-  if (ptr) {
-    count++;
-  }
-  while (ptr->nextPtr) {
-    count++;
-    ptr = ptr->nextPtr;
-  }
-  return count;
+Channel::~Channel() {
+  reg_dev.channel_count--;
 }
 
 void Channel::setNewValue(double dbl) {
@@ -84,8 +61,8 @@ void Channel::setNewValue(double dbl) {
 
 void Channel::setNewValue(double temp, double humi) {
   char newValue[SUPLA_CHANNELVALUE_SIZE];
-  long t = temp * 1000.00;
-  long h = humi * 1000.00;
+  _supla_int_t t = temp * 1000.00;
+  _supla_int_t h = humi * 1000.00;
 
   memcpy(newValue, &t, 4);
   memcpy(&(newValue[4]), &h, 4);
@@ -111,12 +88,12 @@ void Channel::setNewValue(_supla_int64_t value) {
   }
 }
 
-void Channel::setNewValue(int value) {
+void Channel::setNewValue(_supla_int_t value) {
   char newValue[SUPLA_CHANNELVALUE_SIZE];
 
   memset(newValue, 0, SUPLA_CHANNELVALUE_SIZE);
 
-  memcpy(newValue, &value, sizeof(int));
+  memcpy(newValue, &value, sizeof(value));
   if (setNewValue(newValue)) {
     supla_log(
         LOG_DEBUG, "Channel(%d) value changed to %d", channelNumber, value);
@@ -235,18 +212,6 @@ TSuplaChannelExtendedValue *Channel::getExtValue() {
   return nullptr;
 }
 
-void Channel::clearAllUpdateReady() {
-  for (auto channel = begin(); channel != nullptr; channel = channel->next()) {
-    if (!channel->isExtended()) {
-      channel->clearUpdateReady();
-    }
-  }
-}
-
-Channel *Channel::next() {
-  return nextPtr;
-}
-
 void Channel::setUpdateReady() {
   valueChanged = true;
 };
@@ -283,4 +248,66 @@ _supla_int_t Channel::getChannelType() {
   return -1;
 }
 
+double Channel::getValueDouble() {
+  double value;
+  if (sizeof(double) == 8) {
+    memcpy(&value, reg_dev.channels[channelNumber].value, 8);
+  } else if (sizeof(double) == 4) {
+    value = doublePacked2float((uint8_t *)(reg_dev.channels[channelNumber].value));
+  }
+  
+  return value;
+}
+
+double Channel::getValueDoubleFirst() { 
+  _supla_int_t value;
+  memcpy(&value, reg_dev.channels[channelNumber].value, 4);
+
+  return value / 1000.0;
+}
+
+double Channel::getValueDoubleSecond() {
+  _supla_int_t value;
+  memcpy(&value, &(reg_dev.channels[channelNumber].value[4]), 4);
+
+  return value / 1000.0;
+}
+
+_supla_int_t Channel::getValueInt32() {
+  _supla_int_t value;
+  memcpy(&value, reg_dev.channels[channelNumber].value, sizeof(value));
+  return value;
+}
+ 
+_supla_int64_t Channel::getValueInt64() {
+  _supla_int64_t value;
+  memcpy(&value, reg_dev.channels[channelNumber].value, sizeof(value));
+  return value;
+}
+
+bool Channel::getValueBool() {
+  return reg_dev.channels[channelNumber].value[0];
+}
+
+uint8_t Channel::getValueRed() {
+  return reg_dev.channels[channelNumber].value[4];
+}
+
+uint8_t Channel::getValueGreen() {
+  return reg_dev.channels[channelNumber].value[3];
+}
+
+uint8_t Channel::getValueBlue() {
+  return reg_dev.channels[channelNumber].value[2];
+}
+
+uint8_t Channel::getValueColorBrightness() {
+  return reg_dev.channels[channelNumber].value[1];
+}
+
+uint8_t Channel::getValueBrightness() {
+  return reg_dev.channels[channelNumber].value[0];
+}
+
+
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/channel.h b/lib/SuplaDevice/src/supla/channel.h
index c27b68a5..a91d347f 100644
--- a/lib/SuplaDevice/src/supla/channel.h
+++ b/lib/SuplaDevice/src/supla/channel.h
@@ -26,14 +26,11 @@ namespace Supla {
 class Channel {
  public:
   Channel();
-
-  static Channel *begin();
-  static Channel *last();
-  static int size();
+  ~Channel();
 
   void setNewValue(double dbl);
   void setNewValue(double temp, double humi);
-  void setNewValue(int value);
+  void setNewValue(_supla_int_t value);
   void setNewValue(bool value);
   void setNewValue(TElectricityMeter_ExtendedValue_V2 &emValue);
   void setNewValue(uint8_t red,
@@ -44,6 +41,18 @@ class Channel {
   void setNewValue(_supla_int64_t value);
   bool setNewValue(char *newValue);
 
+  double getValueDouble();
+  double getValueDoubleFirst();
+  double getValueDoubleSecond();
+  _supla_int_t getValueInt32();
+  _supla_int64_t getValueInt64();
+  bool getValueBool();
+  uint8_t getValueRed();
+  uint8_t getValueGreen();
+  uint8_t getValueBlue();
+  uint8_t getValueColorBrightness();
+  uint8_t getValueBrightness();
+
   virtual bool isExtended();
   bool isUpdateReady();
   int getChannelNumber();
@@ -57,8 +66,6 @@ class Channel {
   void clearUpdateReady();
   void sendUpdate(void *srpc);
   virtual TSuplaChannelExtendedValue *getExtValue();
-  static void clearAllUpdateReady();
-  Channel *next();
 
   static unsigned long lastCommunicationTimeMs;
   static TDS_SuplaRegisterDevice_E reg_dev;
@@ -69,8 +76,6 @@ class Channel {
   bool valueChanged;
   int channelNumber;
 
-  Channel *nextPtr;
-  static Channel *firstPtr;
 };
 
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/control/relay.h b/lib/SuplaDevice/src/supla/control/relay.h
index f7a8813f..ce9effb9 100644
--- a/lib/SuplaDevice/src/supla/control/relay.h
+++ b/lib/SuplaDevice/src/supla/control/relay.h
@@ -66,8 +66,9 @@ class Relay : public Element, public Triggerable {
   void iterateAlways();
   int handleNewValueFromServer(TSD_SuplaChannelNewValue *newValue);
 
- protected:
   Channel *getChannel();
+
+ protected:
   Channel channel;
   int pin;
   bool highIsOn;
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.h b/lib/SuplaDevice/src/supla/control/rgbw_base.h
index 452a66cf..17f733d8 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.h
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.h
@@ -20,10 +20,10 @@
 #include <Arduino.h>
 #include <stdint.h>
 
+#include "../actions.h"
 #include "../channel.h"
 #include "../element.h"
 #include "../triggerable.h"
-#include "../actions.h"
 
 namespace Supla {
 namespace Control {
@@ -50,15 +50,16 @@ class RGBWBase : public Element, public Triggerable {
   void setFadeEffectTime(int timeMs);
   void onTimer();
 
-void onInit() {
+  void onInit() {
+    // Send to Supla server new values
+    channel.setNewValue(
+        curRed, curGreen, curBlue, curColorBrightness, curBrightness);
+  }
+
+  Channel *getChannel();
 
-  // Send to Supla server new values
-  channel.setNewValue(
-      curRed, curGreen, curBlue, curColorBrightness, curBrightness);
-}
  protected:
   uint8_t addWithLimit(int value, int addition, int limit = 255);
-  Channel *getChannel();
   void iterateDimmerRGBW(int rgbStep, int wStep);
 
   Channel channel;
@@ -74,13 +75,12 @@ void onInit() {
   bool dimIterationDirection;
   int iterationDelayCounter;
   int fadeEffect;
-  int hwRed;                   // 0 - 255
-  int hwGreen;                 // 0 - 255
-  int hwBlue;                  // 0 - 255
-  int hwColorBrightness;       // 0 - 100
-  int hwBrightness;            // 0 - 100
+  int hwRed;              // 0 - 255
+  int hwGreen;            // 0 - 255
+  int hwBlue;             // 0 - 255
+  int hwColorBrightness;  // 0 - 100
+  int hwBrightness;       // 0 - 100
   unsigned long lastTick;
-
 };
 
 };  // namespace Control
diff --git a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
index 12e91b88..56102b77 100644
--- a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
+++ b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
@@ -14,9 +14,10 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "roller_shutter.h"
 #include <supla/storage/storage.h>
 
+#include "roller_shutter.h"
+
 namespace Supla {
 namespace Control {
 
@@ -53,8 +54,10 @@ RollerShutter::RollerShutter(int pinUp, int pinDown, bool highIsOn)
 }
 
 void RollerShutter::onInit() {
-  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? LOW : HIGH);
-  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(
+      channel.getChannelNumber(), pinUp, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(
+      channel.getChannelNumber(), pinDown, highIsOn ? LOW : HIGH);
   Supla::Io::pinMode(channel.getChannelNumber(), pinUp, OUTPUT);
   Supla::Io::pinMode(channel.getChannelNumber(), pinDown, OUTPUT);
 }
@@ -273,19 +276,23 @@ void RollerShutter::stopMovement() {
 }
 
 void RollerShutter::relayDownOn() {
-  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? HIGH : LOW);
+  Supla::Io::digitalWrite(
+      channel.getChannelNumber(), pinDown, highIsOn ? HIGH : LOW);
 }
 
 void RollerShutter::relayUpOn() {
-  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? HIGH : LOW);
+  Supla::Io::digitalWrite(
+      channel.getChannelNumber(), pinUp, highIsOn ? HIGH : LOW);
 }
 
 void RollerShutter::relayDownOff() {
-  Supla::Io::digitalWrite(channel.getChannelNumber(), pinDown, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(
+      channel.getChannelNumber(), pinDown, highIsOn ? LOW : HIGH);
 }
 
 void RollerShutter::relayUpOff() {
-  Supla::Io::digitalWrite(channel.getChannelNumber(), pinUp, highIsOn ? LOW : HIGH);
+  Supla::Io::digitalWrite(
+      channel.getChannelNumber(), pinUp, highIsOn ? LOW : HIGH);
 }
 
 void RollerShutter::startClosing() {
@@ -455,10 +462,10 @@ void RollerShutter::onTimer() {
   }
   // if (newCurrentPosition != currentPosition) {
   // currentPosition = newCurrentPosition;
-  channel.setNewValue(
-      currentPosition);  // value set on channel will be send to server
-                         // during iterateConnected() execution
-                         // }
+  channel.setNewValue(static_cast<_supla_int_t>(
+      currentPosition));  // value set on channel will be send to server
+                          // during iterateConnected() execution
+                          // }
 }
 
 Channel *RollerShutter::getChannel() {
diff --git a/lib/SuplaDevice/src/supla/control/roller_shutter.h b/lib/SuplaDevice/src/supla/control/roller_shutter.h
index 26e46f81..716a121e 100644
--- a/lib/SuplaDevice/src/supla/control/roller_shutter.h
+++ b/lib/SuplaDevice/src/supla/control/roller_shutter.h
@@ -59,6 +59,8 @@ class RollerShutter : public Element, public Triggerable {
   void onLoadState();
   void onSaveState();
 
+  Channel *getChannel();
+
  protected:
   virtual void stopMovement();
   virtual void relayDownOn();
@@ -74,8 +76,6 @@ class RollerShutter : public Element, public Triggerable {
   bool lastDirectionWasClose();
   bool inMove();
 
-  Channel *getChannel();
-
   Channel channel;
 
   uint32_t closingTimeMs;
diff --git a/lib/SuplaDevice/src/supla/element.cpp b/lib/SuplaDevice/src/supla/element.cpp
index b7f1b22c..ac879eb5 100644
--- a/lib/SuplaDevice/src/supla/element.cpp
+++ b/lib/SuplaDevice/src/supla/element.cpp
@@ -95,6 +95,10 @@ Channel *Element::getChannel() {
   return nullptr;
 }
 
+Channel *Element::getSecondaryChannel() {
+  return nullptr;
+}
+
 void Element::handleGetChannelState(TDSC_ChannelState &channelState) {
   (void)(channelState);
   return;
diff --git a/lib/SuplaDevice/src/supla/element.h b/lib/SuplaDevice/src/supla/element.h
index f2ee9fdc..82f76341 100644
--- a/lib/SuplaDevice/src/supla/element.h
+++ b/lib/SuplaDevice/src/supla/element.h
@@ -76,11 +76,12 @@ class Element {
   virtual int handleCalcfgFromServer(TSD_DeviceCalCfgRequest *request);
 
   int getChannelNumber();
+  virtual Channel *getChannel();
+  virtual Channel *getSecondaryChannel();
 
   Element &disableChannelState();
 
  protected:
-  virtual Channel *getChannel();
   static Element *firstPtr;
   Element *nextPtr;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/binary.h b/lib/SuplaDevice/src/supla/sensor/binary.h
index 31db9fff..4e5e41b9 100644
--- a/lib/SuplaDevice/src/supla/sensor/binary.h
+++ b/lib/SuplaDevice/src/supla/sensor/binary.h
@@ -30,9 +30,9 @@ class Binary : public Element {
   bool getValue();
   void iterateAlways();
   void onInit();
+  Channel *getChannel();
 
  protected:
-  Channel *getChannel();
 
   Channel channel;
   int pin;
diff --git a/lib/SuplaDevice/src/supla/sensor/distance.h b/lib/SuplaDevice/src/supla/sensor/distance.h
index 953078a1..a24a8c74 100644
--- a/lib/SuplaDevice/src/supla/sensor/distance.h
+++ b/lib/SuplaDevice/src/supla/sensor/distance.h
@@ -20,7 +20,7 @@
 #include "supla/channel.h"
 #include "supla/element.h"
 
-#define DISTANCE_NOT_AVAILABLE -1
+#define DISTANCE_NOT_AVAILABLE -1.0
 
 namespace Supla {
 namespace Sensor {
@@ -43,10 +43,11 @@ class Distance : public Element {
     }
   }
 
- protected:
   Channel *getChannel() {
     return &channel;
   }
+
+ protected:
   Channel channel;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/electricity_meter.h b/lib/SuplaDevice/src/supla/sensor/electricity_meter.h
index 713ea99c..e67bd517 100644
--- a/lib/SuplaDevice/src/supla/sensor/electricity_meter.h
+++ b/lib/SuplaDevice/src/supla/sensor/electricity_meter.h
@@ -92,9 +92,9 @@ class ElectricityMeter : public Element {
 
   void setResreshRate(unsigned int sec);
 
- protected:
   Channel *getChannel();
 
+ protected:
   TElectricityMeter_ExtendedValue_V2 emValue;
   ChannelExtended extChannel;
   unsigned _supla_int_t rawCurrent[MAX_PHASES];
diff --git a/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h b/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h
index 6c494824..ec5e5661 100644
--- a/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h
+++ b/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h
@@ -37,10 +37,11 @@ class GeneralPurposeMeasurementBase : public Element {
     }
   }
 
- protected:
   Channel *getChannel() {
     return &channel;
   }
+
+ protected:
   Channel channel;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/impulse_counter.h b/lib/SuplaDevice/src/supla/sensor/impulse_counter.h
index 6d6da313..eed631c3 100644
--- a/lib/SuplaDevice/src/supla/sensor/impulse_counter.h
+++ b/lib/SuplaDevice/src/supla/sensor/impulse_counter.h
@@ -46,6 +46,8 @@ class ImpulseCounter : public Element, public Triggerable {
   // Increment the counter by 1
   void incCounter();
 
+  Channel *getChannel();
+
  protected:
   int prevState;  // Store previous state of pin (LOW/HIGH). It is used to track
                   // changes on pin state.
@@ -61,7 +63,6 @@ class ImpulseCounter : public Element, public Triggerable {
 
   unsigned _supla_int64_t counter;  // Actual count of impulses
 
-  Channel *getChannel();
   Channel channel;
 
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/pressure.h b/lib/SuplaDevice/src/supla/sensor/pressure.h
index d320fb33..cdb9a77d 100644
--- a/lib/SuplaDevice/src/supla/sensor/pressure.h
+++ b/lib/SuplaDevice/src/supla/sensor/pressure.h
@@ -43,11 +43,11 @@ class Pressure : public Element {
     }
   }
 
-
- protected:
   Channel *getChannel() {
     return &channel;
   }
+
+ protected:
   Channel channel;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/rain.h b/lib/SuplaDevice/src/supla/sensor/rain.h
index dd060d27..40300bc4 100644
--- a/lib/SuplaDevice/src/supla/sensor/rain.h
+++ b/lib/SuplaDevice/src/supla/sensor/rain.h
@@ -43,11 +43,11 @@ class Rain: public Element {
     }
   }
 
-
- protected:
   Channel *getChannel() {
     return &channel;
   }
+
+ protected:
   Channel channel;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.cpp b/lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.cpp
new file mode 100644
index 00000000..b9604cfd
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.cpp
@@ -0,0 +1,37 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "therm_hygro_meter.h"
+
+Supla::Sensor::ThermHygroMeter::ThermHygroMeter() {
+  channel.setType(SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR);
+  channel.setDefault(SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE);
+}
+
+double Supla::Sensor::ThermHygroMeter::getTemp() {
+  return TEMPERATURE_NOT_AVAILABLE;
+}
+
+double Supla::Sensor::ThermHygroMeter::getHumi() {
+  return HUMIDITY_NOT_AVAILABLE;
+}
+
+void Supla::Sensor::ThermHygroMeter::iterateAlways() {
+  if (millis() - lastReadTime > 10000) {
+    lastReadTime = millis();
+    channel.setNewValue(getTemp(), getHumi());
+  }
+}
diff --git a/lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.h b/lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.h
index 3e9f019a..ab79fea1 100644
--- a/lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.h
+++ b/lib/SuplaDevice/src/supla/sensor/therm_hygro_meter.h
@@ -25,27 +25,11 @@ namespace Supla {
 namespace Sensor {
 class ThermHygroMeter : public Thermometer {
  public:
-  ThermHygroMeter() {
-    channel.setType(SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR);
-    channel.setDefault(SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE);
-  }
-
-  virtual double getTemp() {
-    return TEMPERATURE_NOT_AVAILABLE;
-  }
-
-  virtual double getHumi() {
-    return HUMIDITY_NOT_AVAILABLE;
-  }
-
-  void iterateAlways() {
-    if (millis() - lastReadTime > 10000) {
-      lastReadTime = millis();
-      channel.setNewValue(getTemp(), getHumi());
-    }
-  }
-
- protected:
+  ThermHygroMeter();
+  virtual double getTemp();
+  virtual double getHumi();
+  void iterateAlways();
+
 };
 
 };  // namespace Sensor
diff --git a/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp
new file mode 100644
index 00000000..409fc14c
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "therm_hygro_press_meter.h"
+
+Supla::Sensor::ThermHygroPressMeter::ThermHygroPressMeter() {
+  pressureChannel.setType(SUPLA_CHANNELTYPE_PRESSURESENSOR);
+  pressureChannel.setDefault(SUPLA_CHANNELFNC_PRESSURESENSOR);
+}
+
+double Supla::Sensor::ThermHygroPressMeter::getPressure() {
+  return PRESSURE_NOT_AVAILABLE;
+}
+
+void Supla::Sensor::ThermHygroPressMeter::iterateAlways() {
+  if (millis() - lastReadTime > 10000) {
+    pressureChannel.setNewValue(getPressure());
+  }
+  ThermHygroMeter::iterateAlways();
+}
+
+bool Supla::Sensor::ThermHygroPressMeter::iterateConnected(void *srpc) {
+  bool response = true;
+  if (pressureChannel.isUpdateReady() &&
+      millis() - pressureChannel.lastCommunicationTimeMs > 100) {
+    pressureChannel.lastCommunicationTimeMs = millis();
+    pressureChannel.sendUpdate(srpc);
+    response = false;
+  }
+
+  if (!Element::iterateConnected(srpc)) {
+    response = false;
+  }
+  return response;
+}
+
+Supla::Element &Supla::Sensor::ThermHygroPressMeter::disableChannelState() {
+  pressureChannel.unsetFlag(SUPLA_CHANNEL_FLAG_CHANNELSTATE);
+  return ThermHygroMeter::disableChannelState();
+}
+
+Supla::Channel *Supla::Sensor::ThermHygroPressMeter::getSecondaryChannel() {
+  return &pressureChannel;
+}
diff --git a/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h
index 55441650..77d1156a 100644
--- a/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h
+++ b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h
@@ -25,41 +25,12 @@ namespace Supla {
 namespace Sensor {
 class ThermHygroPressMeter : public ThermHygroMeter {
  public:
-  ThermHygroPressMeter() {
-    pressureChannel.setType(SUPLA_CHANNELTYPE_PRESSURESENSOR);
-    pressureChannel.setDefault(SUPLA_CHANNELFNC_PRESSURESENSOR);
-  }
-
-  virtual double getPressure() {
-    return PRESSURE_NOT_AVAILABLE;
-  }
-
-  void iterateAlways() {
-    if (millis() - lastReadTime > 10000) {
-      pressureChannel.setNewValue(getPressure());
-    }
-    ThermHygroMeter::iterateAlways();
-  }
-
-  bool iterateConnected(void *srpc) {
-    bool response = true;
-    if (pressureChannel.isUpdateReady() &&
-        millis() - pressureChannel.lastCommunicationTimeMs > 100) {
-      pressureChannel.lastCommunicationTimeMs = millis();
-      pressureChannel.sendUpdate(srpc);
-      response = false;
-    }
-
-    if (!Element::iterateConnected(srpc)) {
-      response = false;
-    }
-    return response;
-  }
-
-  Element &disableChannelState() {
-    pressureChannel.unsetFlag(SUPLA_CHANNEL_FLAG_CHANNELSTATE);
-    return ThermHygroMeter::disableChannelState();
-  }
+  ThermHygroPressMeter();
+  virtual double getPressure();
+  void iterateAlways();
+  bool iterateConnected(void *srpc);
+  Element &disableChannelState();
+  Channel *getSecondaryChannel();
 
  protected:
   Channel pressureChannel;
diff --git a/lib/SuplaDevice/src/supla/sensor/thermometer.cpp b/lib/SuplaDevice/src/supla/sensor/thermometer.cpp
new file mode 100644
index 00000000..9525fb91
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/thermometer.cpp
@@ -0,0 +1,37 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "thermometer.h"
+
+Supla::Sensor::Thermometer::Thermometer() : lastReadTime(0) {
+  channel.setType(SUPLA_CHANNELTYPE_THERMOMETER);
+  channel.setDefault(SUPLA_CHANNELFNC_THERMOMETER);
+}
+
+double Supla::Sensor::Thermometer::getValue() {
+  return TEMPERATURE_NOT_AVAILABLE;
+}
+
+void Supla::Sensor::Thermometer::iterateAlways() {
+  if (lastReadTime + 10000 < millis()) {
+    lastReadTime = millis();
+    channel.setNewValue(getValue());
+  }
+}
+
+Supla::Channel *Supla::Sensor::Thermometer::getChannel() {
+  return &channel;
+}
diff --git a/lib/SuplaDevice/src/supla/sensor/thermometer.h b/lib/SuplaDevice/src/supla/sensor/thermometer.h
index 8dd11942..71f810fb 100644
--- a/lib/SuplaDevice/src/supla/sensor/thermometer.h
+++ b/lib/SuplaDevice/src/supla/sensor/thermometer.h
@@ -17,6 +17,7 @@
 #ifndef _thermometer_h
 #define _thermometer_h
 
+#include <Arduino.h>
 #include "supla/channel.h"
 #include "supla/element.h"
 
@@ -26,26 +27,13 @@ namespace Supla {
 namespace Sensor {
 class Thermometer : public Element {
  public:
-  Thermometer() : lastReadTime(0) {
-    channel.setType(SUPLA_CHANNELTYPE_THERMOMETER);
-    channel.setDefault(SUPLA_CHANNELFNC_THERMOMETER);
-  }
-
-  virtual double getValue() {
-    return TEMPERATURE_NOT_AVAILABLE;
-  }
-
-  void iterateAlways() {
-    if (lastReadTime + 10000 < millis()) {
-      lastReadTime = millis();
-      channel.setNewValue(getValue());
-    }
-  }
+  Thermometer();
+  virtual double getValue();
+  void iterateAlways();
+
+  Channel *getChannel();
 
  protected:
-  Channel *getChannel() {
-    return &channel;
-  }
   Channel channel;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/virtual_binary.h b/lib/SuplaDevice/src/supla/sensor/virtual_binary.h
index 5c30c5f6..62d39b85 100644
--- a/lib/SuplaDevice/src/supla/sensor/virtual_binary.h
+++ b/lib/SuplaDevice/src/supla/sensor/virtual_binary.h
@@ -33,9 +33,9 @@ class VirtualBinary : public Element, public Triggerable {
   void iterateAlways();
   void onInit();
   void runAction(int event, int action);
+  Channel *getChannel();
 
  protected:
-  Channel *getChannel();
   Channel channel;
   bool state;
   unsigned long lastReadTime;
diff --git a/lib/SuplaDevice/src/supla/sensor/weight.h b/lib/SuplaDevice/src/supla/sensor/weight.h
index 8c318cbd..c5b8f8c4 100644
--- a/lib/SuplaDevice/src/supla/sensor/weight.h
+++ b/lib/SuplaDevice/src/supla/sensor/weight.h
@@ -43,11 +43,11 @@ class Weight : public Element {
     }
   }
 
-
- protected:
   Channel *getChannel() {
     return &channel;
   }
+
+ protected:
   Channel channel;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/wind.h b/lib/SuplaDevice/src/supla/sensor/wind.h
index 6869bc83..49b38afb 100644
--- a/lib/SuplaDevice/src/supla/sensor/wind.h
+++ b/lib/SuplaDevice/src/supla/sensor/wind.h
@@ -43,11 +43,11 @@ class Wind: public Element {
     }
   }
 
-
- protected:
   Channel *getChannel() {
     return &channel;
   }
+
+ protected:
   Channel channel;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/tools.cpp b/lib/SuplaDevice/src/supla/tools.cpp
index a4c9038c..f053ad41 100644
--- a/lib/SuplaDevice/src/supla/tools.cpp
+++ b/lib/SuplaDevice/src/supla/tools.cpp
@@ -41,3 +41,16 @@ void float2DoublePacked(float number, uint8_t *bar, int byteOrder) {
   }
 #endif
 }
+
+float doublePacked2float(uint8_t *bar) {
+  _FLOATCONV fl;
+  _DBLCONV dbl;
+  for (int i = 0; i < 8; i++) {
+    dbl.b[i] = bar[i]; 
+  }
+  fl.p.s = dbl.p.s;
+  fl.p.m = dbl.p.m;
+  fl.p.e = dbl.p.e + 127 - 1023;  // exponent adjust
+
+  return fl.f;
+}
diff --git a/lib/SuplaDevice/src/supla/tools.h b/lib/SuplaDevice/src/supla/tools.h
index 0a2c2a6d..ab2ac31f 100644
--- a/lib/SuplaDevice/src/supla/tools.h
+++ b/lib/SuplaDevice/src/supla/tools.h
@@ -19,9 +19,11 @@
 #ifndef _tools_H_
 #define _tools_H_
 
+#include <Arduino.h>
 #include "supla-common/IEEE754tools.h"
 
 void float2DoublePacked(float number, uint8_t *bar, int byteOrder = LSBFIRST);
+float doublePacked2float(uint8_t *bar);
 
 
 #endif

From 758093613b38a6e7aa6e9fabb7f0d0f76c9d3a51 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 14 Jan 2021 08:30:00 +0100
Subject: [PATCH 033/165] wsparcie dla MCP23017

---
 platformio.ini                |  16 +-
 src/GUI-Generic.ino           |  33 +++--
 src/GUI-Generic_Config.h      |   1 +
 src/GUIGenericCommon.h        |   2 +-
 src/Markup.cpp                |  96 +++++++++---
 src/Markup.h                  |   8 +-
 src/SuplaCommonPROGMEM.h      |  36 ++++-
 src/SuplaConfigESP.cpp        | 266 +++++++++++++++++++++++++++++++---
 src/SuplaConfigESP.h          |  32 +++-
 src/SuplaConfigManager.cpp    |  33 ++---
 src/SuplaConfigManager.h      |  12 +-
 src/SuplaDeviceGUI.cpp        |   2 +-
 src/SuplaDeviceGUI.h          |   6 +-
 src/SuplaHTTPUpdateServer.cpp |   2 +-
 src/SuplaTemplateBoard.cpp    |   4 +
 src/SuplaWebPageControl.cpp   | 216 ++++++++++++---------------
 src/SuplaWebPageControl.h     |  31 ++--
 src/SuplaWebPageRelay.cpp     | 217 ++++++++++++---------------
 src/SuplaWebPageRelay.h       |  30 ++--
 src/SuplaWebPageSensor.cpp    |  88 ++++++-----
 src/SuplaWebPageSensor.h      |  20 +--
 src/SuplaWebServer.cpp        | 126 ++++++++++++++--
 src/SuplaWebServer.h          |  33 ++++-
 23 files changed, 883 insertions(+), 427 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 36bfbc41..9f97ff4b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.6"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.8"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -43,7 +43,8 @@ build_flags =   -D BUILD_VERSION='"GUI 1.1.6"'
                 -D SUPLA_HC_SR04
                 -D SUPLA_IMPULSE_COUNTER
                 -D SUPLA_OLED
-                -D SUPLA_HLW8012             
+                -D SUPLA_HLW8012
+                -D SUPLA_MCP23017             
 
 [env]
 framework = arduino
@@ -52,6 +53,8 @@ upload_speed = 256000
 monitor_speed = 74880
 upload_resetmethod = nodemcu
 board_build.flash_mode = dout
+; set frequency to 160MHz
+board_build.f_cpu = 160000000L
 lib_deps = 
 	milesburton/DallasTemperature@^3.9.1
 	adafruit/DHT sensor library@^1.4.0
@@ -123,7 +126,7 @@ board = nodemcuv2
 board_build.ldscript = eagle.flash.4m1m.ld
 build_flags =   ${common.build_flags}
                 -D DEBUG_MODE
-build_unflags = -DUSE_CUSTOM
+;build_unflags = -D SUPLA_IMPULSE_COUNTER    
 
 [env:GUI_Generic_blank]
 board = nodemcuv2
@@ -145,4 +148,9 @@ build_unflags = -D SUPLA_OTA
                 -D SUPLA_MAX6675
                 -D SUPLA_HC_SR04
                 -D SUPLA_IMPULSE_COUNTER    
-  
\ No newline at end of file
+  
+[env:GUI_Generic_MCP23017]
+board = esp8285
+board_build.ldscript = eagle.flash.1m64.ld
+build_flags =   ${common.build_flags}
+build_unflags = -D SUPLA_IMPULSE_COUNTER   
\ No newline at end of file
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 70fd892b..10f3ae50 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -15,6 +15,8 @@
 */
 #include "SuplaDeviceGUI.h"
 
+#include <supla/control/MCP23017/supla_mcp23017.h>
+
 #define DRD_TIMEOUT 5  // Number of seconds after reset during which a subseqent reset will be considered a double reset.
 #define DRD_ADDRESS 0  // RTC Memory Address for the DoubleResetDetector to use
 DoubleResetDetector drd(DRD_TIMEOUT, DRD_ADDRESS);
@@ -32,8 +34,8 @@ void setup() {
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
   uint8_t rollershutters = ConfigManager->get(KEY_MAX_ROLLERSHUTTER)->getValueInt();
 
-  if (ConfigESP->getGpio(FUNCTION_RELAY) != OFF_GPIO && ConfigManager->get(KEY_MAX_RELAY)->getValueInt() > 0) {
-    for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
+    if (ConfigESP->getGpio(nr, FUNCTION_RELAY) != OFF_GPIO) {
 #ifdef SUPLA_ROLLERSHUTTER
       if (rollershutters > 0) {
 #ifdef SUPLA_BUTTON
@@ -65,8 +67,8 @@ void setup() {
 #endif
 
 #ifdef SUPLA_LIMIT_SWITCH
-  if (ConfigESP->getGpio(FUNCTION_LIMIT_SWITCH) != OFF_GPIO && ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt() > 0) {
-    for (nr = 1; nr <= ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt(); nr++) {
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt(); nr++) {
+    if (ConfigESP->getGpio(nr, FUNCTION_LIMIT_SWITCH) != OFF_GPIO) {
       new Supla::Sensor::Binary(ConfigESP->getGpio(nr, FUNCTION_LIMIT_SWITCH), true);
     }
   }
@@ -78,16 +80,16 @@ void setup() {
 #endif
 
 #ifdef SUPLA_DHT11
-  if (ConfigESP->getGpio(FUNCTION_DHT11) != OFF_GPIO && ConfigManager->get(KEY_MAX_DHT11)->getValueInt() > 0) {
-    for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT11)->getValueInt(); nr++) {
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT11)->getValueInt(); nr++) {
+    if (ConfigESP->getGpio(nr, FUNCTION_DHT11) != OFF_GPIO) {
       new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT11), DHT11);
     }
   }
 #endif
 
 #ifdef SUPLA_DHT22
-  if (ConfigESP->getGpio(FUNCTION_DHT22) != OFF_GPIO && ConfigManager->get(KEY_MAX_DHT22)->getValueInt() > 0) {
-    for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
+    if (ConfigESP->getGpio(nr, FUNCTION_DHT22) != OFF_GPIO) {
       Supla::GUI::sensorDHT22.push_back(new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT22), DHT22));
     }
   }
@@ -112,7 +114,7 @@ void setup() {
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_HTU21D) || defined(SUPLA_SHT71) || \
-    defined(SUPLA_BH1750) || defined(SUPLA_MAX44009)
+    defined(SUPLA_BH1750) || defined(SUPLA_MAX44009) || defined(SUPLA_MCP23017)
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
     Wire.begin(ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
 #ifdef SUPLA_BME280
@@ -157,6 +159,17 @@ void setup() {
       Supla::GUI::oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
     }
 #endif
+
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+      if (!mcp1.begin(0))
+        Serial.println(F("MCP23017 1 not found!"));  // begin(uint8_t address)  "Pin 100 - 115"
+      if (!mcp2.begin(1))
+        Serial.println(F("MCP23017 2 not found!"));  // begin(uint8_t address)  "Pin 116 - 131"
+      if (!mcp3.begin(2))
+        Serial.println(F("MCP23017 3 not found!"));  // begin(uint8_t address)  "Pin 132 - 147"
+      if (!mcp4.begin(3))
+        Serial.println(F("MCP23017 4 not found!"));  // begin(uint8_t address)  "Pin 148 - 163"
+    }
   }
 #endif
 
@@ -170,7 +183,7 @@ void setup() {
 #ifdef SUPLA_IMPULSE_COUNTER
   if (ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt() > 0) {
     for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
-      if (ConfigESP->getGpio(FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
+      if (ConfigESP->getGpio(nr, FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
         Supla::GUI::addImpulseCounter(ConfigESP->getGpio(nr, FUNCTION_IMPULSE_COUNTER), ConfigESP->getLevel(nr, FUNCTION_IMPULSE_COUNTER),
                                       ConfigESP->getMemory(nr, FUNCTION_IMPULSE_COUNTER),
                                       ConfigManager->get(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT)->getValueInt());
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 70aa3273..c3d7cb17 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -36,6 +36,7 @@
 #define SUPLA_SHT3x
 #define SUPLA_SI7021
 #define SUPLA_OLED
+//#define SUPLA_MCP23017
 // #define SUPLA_HTU21D    // 0x40 NOT SUPPORTED
 // #define SUPLA_SHT71     // 0x44 AND 0x45 NOT SUPPORTED
 // #define SUPLA_BH1750    // 0x23 AND 0x5C NOT SUPPORTED
diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 62672230..3ed890bc 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -6,7 +6,7 @@
 #else
 #define QUOTE(x)        QUOTE_1(x)
 #define QUOTE_1(x)      #x
-#define INCLUDE_FILE(x) QUOTE(language/x.h)
+#define INCLUDE_FILE(x) QUOTE(language / x.h)
 #include INCLUDE_FILE(UI_LANGUAGE)
 #endif
 
diff --git a/src/Markup.cpp b/src/Markup.cpp
index afdc7cf2..fc52249e 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -138,7 +138,38 @@ void addListGPIOBox(String& html, const String& input_id, const String& name, ui
   html += F(" ");
   html += name;
   html += F("</label>");
-  html += addListGPIOSelect(input_id.c_str(), function, nr);
+  addListGPIOSelect(html, input_id, function, nr);
+  html += F("</i>");
+}
+
+void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr) {
+  if (nr == 1) {
+    uint8_t address = ConfigESP->getAdressMCP23017(function);
+    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address);
+  }
+
+  html += F("<i>");
+  html += F("<label>");
+  if (ConfigESP->getGpioMCP23017(nr, function) != OFF_GPIO) {
+    html += F("<a href='");
+    html += PATH_START;
+    html += url;
+    if (nr > 0) {
+      html += nr;
+    }
+    html += F("'>");
+  }
+  if (nr > 0) {
+    html += nr;
+    html += F(". ");
+  }
+  html += name;
+  if (ConfigESP->getGpioMCP23017(nr, function) != OFF_GPIO) {
+    html += WebServer->SuplaIconEdit();
+    html += F("</a>");
+  }
+  html += F("</label>");
+  addListMCP23017GPIO(html, input_id, function, nr);
   html += F("</i>");
 }
 
@@ -171,15 +202,22 @@ void addListGPIOLinkBox(String& html, const String& input_id, const String& name
     html += F("</a>");
   }
   html += F("</label>");
-  html += addListGPIOSelect(input_id.c_str(), function, nr);
+  addListGPIOSelect(html, input_id, function, nr);
   html += F("</i>");
 }
 
-void addListBox(String& html, const String& input_id, const String& name, const char* const* array_P, uint8_t size, uint8_t selected) {
+void addListBox(String& html, const String& input_id, const String& name, const char* const* array_P, uint8_t size, uint8_t selected, uint8_t nr) {
   html += F("<i><label>");
+  if (nr != 0) {
+    html += nr;
+    html += F(". ");
+  }
   html += name;
   html += "</label><select name='";
   html += input_id;
+  if (nr != 0) {
+    html += nr;
+  }
   html += F("'>");
 
   for (uint8_t suported = 0; suported < size; suported++) {
@@ -212,35 +250,59 @@ void addButtonSubmit(String& html, const String& name) {
   html += F("<br><br>");
 }
 
-String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr) {
-  String page = "";
-  page += F("<select name='");
-  page += input;
+void addListGPIOSelect(String& html, const String& input_id, uint8_t function, uint8_t nr) {
+  html += F("<select name='");
+  html += input_id;
   if (nr != 0) {
-    page += nr;
+    html += nr;
   }
   else {
     nr = 1;
   }
-  page += F("'>");
+  html += F("'>");
 
   uint8_t selected = ConfigESP->getGpio(nr, function);
 
   for (uint8_t suported = 0; suported < sizeof(GPIO_P) / sizeof(GPIO_P[0]); suported++) {
-    if (ConfigESP->checkBusyGpio(suported, function) == false || selected == suported) {
-      page += F("<option value='");
-      page += suported;
+    if (ConfigESP->checkBusyGpio(suported, function) || selected == suported) {
+      html += F("<option value='");
+      html += suported;
+      if (selected == suported) {
+        html += F("' selected>");
+      }
+      else {
+        html += F("'>");
+      }
+      html += PGMT(GPIO_P[suported]);
+    }
+  }
+  html += F("</select>");
+}
+
+void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function, uint8_t nr) {
+  ;
+  html += F("<select name='");
+  html += input_id;
+  html += nr;
+  html += F("'>");
+
+  uint8_t selected = ConfigESP->getGpioMCP23017(nr, function);
+  uint8_t address = ConfigESP->getAdressMCP23017(function);
+
+  for (uint8_t suported = 0; suported < sizeof(GPIO_MCP23017_P) / sizeof(GPIO_MCP23017_P[0]); suported++) {
+    if (ConfigESP->checkBusyGpioMCP23017(suported, function) || selected == suported) {
+      html += F("<option value='");
+      html += suported;
       if (selected == suported) {
-        page += F("' selected>");
+        html += F("' selected>");
       }
       else {
-        page += F("'>");
+        html += F("'>");
       }
-      page += PGMT(GPIO_P[suported]);
+      html += PGMT(GPIO_MCP23017_P[suported]);
     }
   }
-  page += F("</select>");
-  return page;
+  html += F("</select>");
 }
 
 String getURL(const String& url) {
diff --git a/src/Markup.h b/src/Markup.h
index 872ac2d7..582d59fa 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -31,15 +31,19 @@ void addLinkBox(String& html, const String& name, const String& url);
 
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0);
 
+void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr = 0);
+
 void addListGPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr = 0);
 
-void addListBox(String& html, const String& input_id, const String& name, const char* const* list_P, uint8_t size, uint8_t selected);
+void addListBox(String& html, const String& input_id, const String& name, const char* const* list_P, uint8_t size, uint8_t selected, uint8_t nr = 0);
 
 void addButton(String& html, const String& name, const String& url);
 
 void addButtonSubmit(String& html, const String& name);
 
-String addListGPIOSelect(const char* input, uint8_t function, uint8_t nr = 0);
+void addListGPIOSelect(String& html, const String& input_id, uint8_t function, uint8_t nr = 0);
+
+void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function, uint8_t nr);
 
 String getURL(const String& url);
 
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 29eea492..ffab8c05 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -21,7 +21,7 @@ const char HTTP_STYLE[] PROGMEM =
     "#00d151;height:42px}i:last-child{border:none}label{position:absolute;display:inline-block;top:0;left:8px;color:#00d151;line-height:41px;}i "
     "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-"
+    "150px);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 "
@@ -31,7 +31,8 @@ const char HTTP_STYLE[] PROGMEM =
     "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}i 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}}iframe{margin:auto;display:block;}.formcenter{color:#000;width:50%;margin: 25px auto 25px auto;}</style> ";
+    "#00d151}select{width:100%;float:none;margin:0}}iframe{margin:auto;display:block;}.formcenter{color:#000;width:50%;margin: 25px auto 25px "
+    "auto;}</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,"
@@ -54,8 +55,9 @@ 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_RBT[] PROGMEM =
-    "<form method='post' action='rbt'><button type='submit'>Restart</button></form>";
+const char HTTP_FAVICON[] PROGMEM = "<link rel='icon' href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAB3RJTUUH5AUUCCQbIwTFfgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAARnQU1BAACxjwv8YQUAAAAwUExURf7nNZuNIOvWMci2KWRbFJGEHnRpFy8rCdrGLSAdBgwLAod6G7inJkI8DVJLEKeYIg6cTsoAAAGUSURBVHjaY2CAAFUGNLCF4QAyl4mhmP8BB4LPcWtdAe+BEBiX9QD77Kzl24GKHCAC/OVZH5hkVyUCFQlCRJhnKjAwLVlVb8lQDOY/ZFrG8FDVQbVqbU8BWODc3BX8dbMMGJhfrUyAaOla+/dAP8jyncsbgJTKgVP/b+pOAUudegAkGMsrGZhE1EFyDGwLwNaucmZyl1TgKTdg4JvAwMBzn3txeKWrMwP7wQcMWiAtf2c9YDjUfYBJapsDw66bm4AiUesOnJty0/O9iwLDPI5EhhCD6/q3Chk4dgCleJYpAEOmfCkDB+sbsK1886YBRfgWMTBwbi896wR04YZuAyAH6OmzDCbr3RgYsj6A1HEBPXCfgWHONgaG6eUBII0LFTiA7jn+iIF/MbMTyEu3lphtAJtpvl4BTLPNWgVSySA+y28aWIDdyGtVBgNH5psshVawwHGGO+arLr7MYFoJjZr/zBPYj85a1sC4ulwAIsIdcJzh2qt1WReYBWBR48gxgd1ziQIi6hTYEsxR45pZwRU9+oWgNAB1F3c/H6bYqgAAAABJRU5ErkJggg==' type='image/x-png' />\n";
+
+const char HTTP_RBT[] PROGMEM = "<form method='post' action='rbt'><button type='submit'>Restart</button></form>";
 
 const char GPIO0[] PROGMEM = "GPIO0-D3";
 const char GPIO1[] PROGMEM = "GPIO1-TX";
@@ -77,6 +79,26 @@ 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 GPIO_A0[] PROGMEM = "A0";
+const char GPIO_A1[] PROGMEM = "A1";
+const char GPIO_A2[] PROGMEM = "A2";
+const char GPIO_A3[] PROGMEM = "A3";
+const char GPIO_A4[] PROGMEM = "A4";
+const char GPIO_A5[] PROGMEM = "A5";
+const char GPIO_A6[] PROGMEM = "A6";
+const char GPIO_A7[] PROGMEM = "A7";
+const char GPIO_B0[] PROGMEM = "B0";
+const char GPIO_B1[] PROGMEM = "B1";
+const char GPIO_B2[] PROGMEM = "B2";
+const char GPIO_B3[] PROGMEM = "B3";
+const char GPIO_B4[] PROGMEM = "B4";
+const char GPIO_B5[] PROGMEM = "B5";
+const char GPIO_B6[] PROGMEM = "B6";
+const char GPIO_B7[] PROGMEM = "B7";
+
+const char* const GPIO_MCP23017_P[] PROGMEM = {GPIO_A0, GPIO_A1, GPIO_A2, GPIO_A3, GPIO_A4, GPIO_A5, GPIO_A6, GPIO_A7,  GPIO_B0,
+                                               GPIO_B1, GPIO_B2, GPIO_B3, GPIO_B4, GPIO_B5, GPIO_B6, GPIO_B7, GPIONULL, OFF};
+
 const char ADR44[] PROGMEM = "0x44";
 const char ADR45[] PROGMEM = "0x45";
 const char ADR44_ADR45[] PROGMEM = "0x44 & 0x45";
@@ -87,6 +109,10 @@ const char ADR76_ADR77[] PROGMEM = "0x76 & 0x77";
 const char* const BME280_P[] PROGMEM = {OFF, ADR76, ADR77, ADR76_ADR77};
 const char* const SHT3x_P[] PROGMEM = {OFF, ADR44, ADR45, ADR44_ADR45};
 
+const char ADR20[] PROGMEM = "0x20";
+const char ADR21[] PROGMEM = "0x21";
+const char* const MCP23017_P[] PROGMEM = {ADR20, ADR21, OFF};
+
 const char* const STATE_P[] PROGMEM = {OFF, ON};
 
 const char LOW_STATE_CONTROL[] PROGMEM = S_LOW;
@@ -112,7 +138,7 @@ const char* const CFG_MODE_P[] PROGMEM = {CFG_10_PRESSES, CFG_5SEK_HOLD};
 const char SSD1306[] PROGMEM = "SSD1306 - 0,96''";
 const char SH1106[] PROGMEM = "SH1106 - 1,3''";
 const char SSD1306_WEMOS_SHIELD[] PROGMEM = "SSD1306 - 0,66'' WEMOS OLED shield";
-const char *const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106, SSD1306_WEMOS_SHIELD};
+const char* const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106, SSD1306_WEMOS_SHIELD};
 #endif
 
 String StateString(uint8_t adr);
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 978c3738..fd04ca0c 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -20,6 +20,7 @@
 #include "SuplaConfigManager.h"
 #include "SuplaDeviceGUI.h"
 #include "GUIGenericCommon.h"
+#include "SuplaWebPageSensor.h"
 
 SuplaConfigESP::SuplaConfigESP() {
   configModeESP = NORMAL_MODE;
@@ -95,11 +96,7 @@ void SuplaConfigESP::runAction(int event, int action) {
 }
 
 void SuplaConfigESP::rebootESP() {
-  delay(1000);
-  WiFi.forceSleepBegin();
-  wdt_reset();
   ESP.restart();
-  while (1) wdt_reset();
 }
 
 void SuplaConfigESP::configModeInit() {
@@ -117,8 +114,9 @@ void SuplaConfigESP::iterateAlways() {
   }
 }
 
-String SuplaConfigESP::getConfigNameAP() {
-  return "SUPLA-ESP8266-" + getMacAddress(false);
+const String SuplaConfigESP::getConfigNameAP() {
+  String name = F("SUPLA-ESP8266-");
+  return name += getMacAddress(false);
 }
 const char *SuplaConfigESP::getLastStatusSupla() {
   return supla_status.msg;
@@ -251,6 +249,25 @@ int SuplaConfigESP::getGpio(int nr, int function) {
         return gpio;
       }
     }
+    // return OFF_GPIO;
+    //"Pin 100 - 115"
+    // Pin 116 - 131"
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+      switch (getAdressMCP23017(function)) {
+        case 0:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function &&
+              ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+            return gpio + 100;
+          }
+          break;
+        case 1:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function &&
+              ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+            return gpio + 100 + 16;
+          }
+          break;
+      }
+    }
   }
   return OFF_GPIO;
 }
@@ -260,10 +277,28 @@ int SuplaConfigESP::getLevel(int nr, int function) {
     uint8_t key = KEY_GPIO + gpio;
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
-        uint8_t level = ConfigManager->get(key)->getElement(LEVEL).toInt();
-        return level;
+        return ConfigManager->get(key)->getElement(LEVEL).toInt();
       }
     }
+
+    switch (getAdressMCP23017(function)) {
+      case 0:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(LEVEL).toInt();
+            ;
+          }
+        }
+        break;
+      case 1:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(LEVEL).toInt();
+            ;
+          }
+        }
+        break;
+    }
   }
   return OFF_GPIO;
 }
@@ -273,10 +308,28 @@ int SuplaConfigESP::getMemory(int nr, int function) {
     uint8_t key = KEY_GPIO + gpio;
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
-        uint8_t level = ConfigManager->get(key)->getElement(MEMORY).toInt();
-        return level;
+        return ConfigManager->get(key)->getElement(MEMORY).toInt();
       }
     }
+
+    switch (getAdressMCP23017(function)) {
+      case 0:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(MEMORY).toInt();
+            ;
+          }
+        }
+        break;
+      case 1:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(MEMORY).toInt();
+            ;
+          }
+        }
+        break;
+    }
   }
   return OFF_GPIO;
 }
@@ -286,10 +339,29 @@ int SuplaConfigESP::getAction(int nr, int function) {
     uint8_t key = KEY_GPIO + gpio;
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
-        uint8_t action = ConfigManager->get(key)->getElement(ACTION).toInt();
-        return action;
+        return ConfigManager->get(key)->getElement(ACTION).toInt();
+        ;
       }
     }
+
+    switch (getAdressMCP23017(function)) {
+      case 0:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(ACTION).toInt();
+            ;
+          }
+        }
+        break;
+      case 1:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(ACTION).toInt();
+            ;
+          }
+        }
+        break;
+    }
   }
   return OFF_GPIO;
 }
@@ -304,7 +376,7 @@ bool SuplaConfigESP::checkBusyCfg(int gpio) {
 
 int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
   if (gpio == 6 || gpio == 7 || gpio == 8 || gpio == 11) {
-    return true;
+    return false;
   }
   else {
     uint8_t key = KEY_GPIO + gpio;
@@ -316,15 +388,15 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
     }
     if (checkBusyCfg(gpio)) {
       if (function != FUNCTION_BUTTON) {
-        return true;
+        return false;
       }
     }
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() != FUNCTION_OFF) {
       if (ConfigManager->get(key)->getElement(FUNCTION).toInt() != function) {
-        return true;
+        return false;
       }
     }
-    return false;
+    return true;
   }
 }
 
@@ -356,7 +428,7 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
   ConfigManager->setElement(key, NR, 0);
   ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
   ConfigManager->setElement(key, LEVEL, 0);
-  ConfigManager->setElement(key, MEMORY, 0);
+  ConfigManager->setElement(key, MEMORY, 2);
   ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
 }
 
@@ -374,10 +446,148 @@ uint8_t SuplaConfigESP::countFreeGpio(uint8_t exception) {
   return count;
 }
 
+bool SuplaConfigESP::checkBusyGpioMCP23017(uint8_t gpio, uint8_t function) {
+  if (gpio == OFF_GPIO) {
+    return true;
+  }
+  else if (gpio == 16) {
+    return false;
+  }
+  else {
+    uint8_t key = KEY_GPIO + gpio;
+    switch (getAdressMCP23017(function)) {
+      case 0:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() != FUNCTION_OFF) {
+          return false;
+        }
+        break;
+      case 1:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() != FUNCTION_OFF) {
+          return false;
+        }
+        break;
+    }
+  }
+  return true;
+}
+
+uint8_t SuplaConfigESP::getGpioMCP23017(uint8_t nr, uint8_t function) {
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+
+    switch (getAdressMCP23017(function)) {
+      case 0:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+            return gpio;
+          }
+        }
+        break;
+      case 1:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+            return gpio;
+          }
+        }
+        break;
+    }
+  }
+  return OFF_GPIO;
+}
+
+uint8_t SuplaConfigESP::getAdressMCP23017(uint8_t function) {
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() != 0) {
+      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+        return 0;
+      }
+    }
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() != 0) {
+      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+        return 1;
+      }
+    }
+  }
+  return 2;
+}
+
+void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory) {
+  uint8_t key = KEY_GPIO + gpio;
+
+  uint8_t _gpio = ConfigESP->getGpioMCP23017(nr, function);
+  ConfigESP->clearGpioMCP23017(_gpio, function);
+
+  if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
+    ConfigManager->setElement(key, LEVEL, 0);
+    ConfigManager->setElement(key, MEMORY, 2);
+    ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
+  }
+  else {
+    ConfigManager->setElement(key, LEVEL, level);
+    ConfigManager->setElement(key, MEMORY, memory);
+    ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
+  }
+
+  switch (adress) {
+    case 0:
+      ConfigManager->setElement(key, MCP23017_NR_1, nr);
+      ConfigManager->setElement(key, MCP23017_FUNCTION_1, function);
+      break;
+    case 1:
+      ConfigManager->setElement(key, MCP23017_NR_2, nr);
+      ConfigManager->setElement(key, MCP23017_FUNCTION_2, function);
+      break;
+  }
+}
+
+void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t function) {
+  uint8_t key = KEY_GPIO + gpio;
+  uint8_t adress = getAdressMCP23017(function);
+
+  ConfigManager->setElement(key, getNrMCP23017(adress), 0);
+  ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
+}
+
+void SuplaConfigESP::clearFunctionGpio(uint8_t function) {
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      ConfigManager->setElement(key, NR, 0);
+      ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
+    }
+  }
+}
+
+uint8_t SuplaConfigESP::getFunctionMCP23017(uint8_t adress) {
+  switch (adress) {
+    case 0:
+      return MCP23017_FUNCTION_1;
+      break;
+    case 1:
+      return MCP23017_FUNCTION_2;
+      break;
+  }
+  return OFF_GPIO;
+}
+
+uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
+  switch (adress) {
+    case 0:
+      return MCP23017_NR_1;
+      break;
+    case 1:
+      return MCP23017_NR_2;
+      break;
+  }
+  return OFF_GPIO;
+}
+
 void SuplaConfigESP::factoryReset(bool forceReset) {
   delay(1000);
-  pinMode(0, INPUT);
-  if (!digitalRead(0) || forceReset) {
+  pinMode(0, INPUT_PULLUP);
+  if (digitalRead(0) != HIGH || forceReset) {
     Serial.println(F("FACTORY RESET!!!"));
 
     EEPROM.begin(1024);
@@ -426,3 +636,21 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
     // rebootESP();
   }
 }
+
+uint32_t lowestRAM = 0;
+uint32_t lowestFreeStack = 0;
+
+void checkRAM() {
+  uint32_t freeRAM = ESP.getFreeHeap();
+  Serial.print(F("freeRAM: "));
+  Serial.println(freeRAM);
+  if (freeRAM <= lowestRAM) {
+    lowestRAM = freeRAM;
+  }
+  uint32_t freeStack = ESP.getFreeContStack();
+  Serial.print(F("freeStack: "));
+  Serial.println(freeStack);
+  if (freeStack <= lowestFreeStack) {
+    lowestFreeStack = freeStack;
+  }
+}
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index b96df291..7a0c9ae9 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -22,8 +22,20 @@
 #include <supla/element.h>
 #include "GUI-Generic_Config.h"
 
-enum _configModeESP { NORMAL_MODE, CONFIG_MODE };
-enum _ConfigMode { CONFIG_MODE_10_ON_PRESSES, CONFIG_MODE_5SEK_HOLD, FACTORYRESET };
+#include <cont.h>
+#include <user_interface.h>
+
+enum _configModeESP
+{
+  NORMAL_MODE,
+  CONFIG_MODE
+};
+enum _ConfigMode
+{
+  CONFIG_MODE_10_ON_PRESSES,
+  CONFIG_MODE_5SEK_HOLD,
+  FACTORYRESET
+};
 
 typedef struct {
   int status;
@@ -81,7 +93,16 @@ class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
 
   int getAction(int nr, int function);
   void factoryReset(bool forceReset = false);
-  String getConfigNameAP();
+  const String getConfigNameAP();
+
+  bool checkBusyGpioMCP23017(uint8_t gpio, uint8_t function);
+  uint8_t getGpioMCP23017(uint8_t nr, uint8_t function);
+  uint8_t getAdressMCP23017(uint8_t function);
+  void setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory);
+  void clearGpioMCP23017(uint8_t gpio, uint8_t function);
+  void clearFunctionGpio(uint8_t function);
+  uint8_t getFunctionMCP23017(uint8_t adress);
+  uint8_t getNrMCP23017(uint8_t adress);
 
  private:
   void configModeInit();
@@ -97,4 +118,9 @@ class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
 void ledBlinking_func(void *timer_arg);
 void status_func(int status, const char *msg);
 
+
+uint32_t getFreeStackWatermark();
+unsigned long FreeMem();
+void checkRAM();
+
 #endif  // SuplaConfigESP_h
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 4854a66b..1b999582 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -34,8 +34,10 @@ ConfigOption::ConfigOption(uint8_t key, const char *value, int maxLength) {
   strncpy(_key, key, size);
   _key[size - 1] = '\0';
 */
-  _key = key; 
+  _key = key;
   _maxLength = maxLength + 1;
+
+  _value = new char[_maxLength];
   setValue(value);
 }
 
@@ -82,8 +84,9 @@ int ConfigOption::getLength() {
   return _maxLength;
 }
 
-String ConfigOption::getElement(int index) {
+const String ConfigOption::getElement(int index) {
   String data = _value;
+  data.reserve(_maxLength);
   int found = 0;
   int strIndex[] = {0, -1};
   int maxIndex = data.length() - 1;
@@ -97,8 +100,9 @@ String ConfigOption::getElement(int index) {
   return found > index ? data.substring(strIndex[0], strIndex[1]) : "";
 }
 
-String ConfigOption::replaceElement(int index, int newvalue) {
+const String ConfigOption::replaceElement(int index, int newvalue) {
   String data = _value;
+  data.reserve(_maxLength);
   int lenght = SETTINGSCOUNT;
   String table;
   for (int i = 0; i <= lenght; i++) {
@@ -115,16 +119,8 @@ String ConfigOption::replaceElement(int index, int newvalue) {
 }
 
 void ConfigOption::setValue(const char *value) {
-  // size_t size = _maxLength + 1;
-  //_value = (char *)malloc(sizeof(char) * (size));
-
-  // if (value != NULL) {
-  //  memcpy(_value, value, size - 1);
-  // _value[size - 1] = 0;
-  //}
   if (value != NULL) {
     size_t size = getLength();
-    _value = new char[size];
     strncpy(_value, value, size);
     _value[size - 1] = '\0';
   }
@@ -162,13 +158,13 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_MAX_IMPULSE_COUNTER, "0", 2);
 
   uint8_t nr, key;
-  
+
   for (nr = 0; nr <= 17; nr++) {
     key = KEY_GPIO + nr;
-    this->addKey(key, "0,0,0,0,0,0", 16);
+    this->addKey(key, "0,0,0,0,0,0", 28);
   }
-  
-  this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 14);
+
+  this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 16);
   this->addKey(KEY_BOARD, "0", 2);
   this->addKey(KEY_CFG_MODE, "0", 2);
 
@@ -334,7 +330,8 @@ uint8_t SuplaConfigManager::save() {
     if (configFile) {
       uint8_t *content = (uint8_t *)malloc(sizeof(uint8_t) * length);
       for (i = 0; i < _optionCount; i++) {
-        Serial.println("Save key " + String(_options[i]->getKey()) + ": " + String(_options[i]->getValue()));
+        Serial.printf_P(PSTR("Save key=%d"), _options[i]->getKey());
+        Serial.printf_P(PSTR(" value=%s\n"), _options[i]->getValue());
         memcpy(content + offset, _options[i]->getValue(), _options[i]->getLength());
         offset += _options[i]->getLength();
       }
@@ -355,7 +352,9 @@ uint8_t SuplaConfigManager::save() {
 
 void SuplaConfigManager::showAllValue() {
   for (int i = 0; i < _optionCount; i++) {
-    Serial.println("Key: " + String(_options[i]->getKey()) + " Value: " + String(_options[i]->getValue()));
+    // Serial.println("Key: " + String(_options[i]->getKey()) + " Value: " + String(_options[i]->getValue()));
+    Serial.printf_P(PSTR("Key=%d"), _options[i]->getKey());
+    Serial.printf_P(PSTR(" value=%s\n"), _options[i]->getValue());
   }
 }
 
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 73b6a35b..10eb2dde 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -86,6 +86,14 @@ enum _settings
   MEMORY,
   CFG,
   ACTION,
+  MCP23017_NR_1,
+  MCP23017_FUNCTION_1,
+  MCP23017_NR_2,
+  MCP23017_FUNCTION_2,
+  MCP23017_NR_3,
+  MCP23017_FUNCTION_3,
+  MCP23017_NR_4,
+  MCP23017_FUNCTION_4,
   SETTINGSCOUNT
 };
 
@@ -138,8 +146,8 @@ class ConfigOption {
 
   int getLength();
   void setValue(const char *value);
-  String getElement(int index);
-  String replaceElement(int index, int value);
+  const String getElement(int index);
+  const String replaceElement(int index, int value);
 
  private:
   uint8_t _key;
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 6e2d5471..3bc9c2ff 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -27,6 +27,7 @@ Supla::Eeprom eeprom(STORAGE_OFFSET);
 namespace Supla {
 namespace GUI {
 void begin() {
+
 #ifdef DEBUG_MODE
   new Supla::Sensor::EspFreeHeap();
 #endif
@@ -50,7 +51,6 @@ void begin() {
                     (char *)ConfigManager->get(KEY_SUPLA_AUTHKEY)->getValue());  // Authorization key
 
   ConfigManager->showAllValue();
-
   WebServer->begin();
 }
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index b6dde7a5..59f0d387 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -28,6 +28,7 @@
 #include "SuplaConfigManager.h"
 #include "SuplaWebServer.h"
 #include "SuplaWebPageRelay.h"
+#include "SuplaWebPageSensor.h"
 
 #include "SuplaWebPageDownload.h"
 #include "SuplaWebPageUpload.h"
@@ -47,16 +48,15 @@
 #include <supla/sensor/DHT.h>
 #include <supla/sensor/HC_SR04.h>
 #include <supla/sensor/binary.h>
+
 #ifdef SUPLA_BME280
 #include <supla/sensor/BME280.h>
-#include "SuplaWebPageSensor.h"
 #endif
 #ifdef SUPLA_SI7021_SONOFF
 #include <supla/sensor/Si7021_sonoff.h>
 #endif
 #ifdef SUPLA_BME280
 #include <supla/sensor/BME280.h>
-#include "SuplaWebPageSensor.h"
 #endif
 #ifdef SUPLA_SHT3x
 #include <supla/sensor/SHT3x.h>
@@ -76,6 +76,8 @@
 
 #include <supla/sensor/HJ101.h>
 
+#include <Wire.h>
+
 namespace Supla {
 namespace GUI {
 
diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 7a68aaf8..593fd9cc 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -133,7 +133,7 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
         else if (_authenticated && upload.status == UPLOAD_FILE_ABORTED) {
           Update.end();
           if (_serial_output)
-            Serial.println("Update was aborted");
+            Serial.println(F("Update was aborted"));
         }
         delay(0);
       });
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 474322b8..ebe6a4af 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -38,12 +38,14 @@ void addButtonCFG(uint8_t gpio) {
   ConfigESP->setGpio(gpio, FUNCTION_CFG_BUTTON);
 }
 
+#ifdef SUPLA_HLW8012
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
   ConfigESP->setGpio(pinCF, FUNCTION_CF);
   ConfigESP->setGpio(pinCF1, FUNCTION_CF1);
   ConfigESP->setGpio(pinSEL, FUNCTION_SEL);
   Supla::GUI::addHLW8012(ConfigESP->getGpio(FUNCTION_CF), ConfigESP->getGpio(FUNCTION_CF1), ConfigESP->getGpio(FUNCTION_SEL));
 }
+#endif
 
 void chooseTemplateBoard(uint8_t board) {
   ConfigManager->set(KEY_MAX_BUTTON, "0");
@@ -193,11 +195,13 @@ void chooseTemplateBoard(uint8_t board) {
       addButtonCFG(13);
       addButton(13, Supla::ON_RELEASE);
       addRelay(15);
+#ifdef SUPLA_HLW8012
       addHLW8012(5, 4, 12);
       Supla::GUI::counterHLW8012->setCurrentMultiplier(18388);
       Supla::GUI::counterHLW8012->setVoltageMultiplier(247704);
       Supla::GUI::counterHLW8012->setPowerMultiplier(2586583);
       Supla::GUI::counterHLW8012->saveState();
+#endif
       break;
   }
 }
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 9033f567..28411956 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -35,7 +35,7 @@ void SuplaWebPageControl::handleControl() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_control(0));
+  supla_webpage_control(0);
 }
 
 void SuplaWebPageControl::handleControlSave() {
@@ -45,14 +45,22 @@ void SuplaWebPageControl::handleControlSave() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  String key, input;
-  uint8_t nr, current_value, last_value;
+
+  uint8_t nr, last_value;
 #ifdef SUPLA_BUTTON
   last_value = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
-    if (!WebServer->saveGPIO(INPUT_BUTTON_GPIO, FUNCTION_BUTTON, nr, INPUT_MAX_BUTTON)) {
-      WebServer->sendContent(supla_webpage_control(6));
-      return;
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+      if (!WebServer->saveGpioMCP23017(INPUT_BUTTON_GPIO, FUNCTION_BUTTON, nr, INPUT_MAX_BUTTON)) {
+        supla_webpage_control(6);
+        return;
+      }
+    }
+    else {
+      if (!WebServer->saveGPIO(INPUT_BUTTON_GPIO, FUNCTION_BUTTON, nr, INPUT_MAX_BUTTON)) {
+        supla_webpage_control(6);
+        return;
+      }
     }
   }
 
@@ -65,7 +73,7 @@ void SuplaWebPageControl::handleControlSave() {
   last_value = ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
     if (!WebServer->saveGPIO(INPUT_LIMIT_SWITCH_GPIO, FUNCTION_LIMIT_SWITCH, nr, INPUT_MAX_LIMIT_SWITCH)) {
-      WebServer->sendContent(supla_webpage_control(6));
+      supla_webpage_control(6);
       return;
     }
   }
@@ -77,55 +85,58 @@ void SuplaWebPageControl::handleControlSave() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      //      Serial.println(F("E_CONFIG_OK: Config save"));
-      WebServer->sendContent(supla_webpage_control(1));
+      supla_webpage_control(1);
       break;
     case E_CONFIG_FILE_OPEN:
-      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_control(2));
+      supla_webpage_control(2);
       break;
   }
 }
 
-String SuplaWebPageControl::supla_webpage_control(int save) {
-  uint8_t nr, suported, selected;
-  String pagebutton, key;
+void SuplaWebPageControl::supla_webpage_control(int save) {
+  uint8_t nr, countFreeGpio;
 
-  pagebutton += SuplaSaveResult(save);
-  pagebutton += SuplaJavaScript(PATH_CONTROL);
-  pagebutton += F("<form method='post' action='");
-  pagebutton += PATH_SAVE_CONTROL;
-  pagebutton += F("'>");
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_CONTROL);
+  addForm(webContentBuffer, F("post"), PATH_SAVE_CONTROL);
 
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
-  addFormHeader(pagebutton, String(S_GPIO_SETTINGS_FOR_BUTTONS));
-  addNumberBox(pagebutton, INPUT_MAX_BUTTON, S_QUANTITY, KEY_MAX_BUTTON, ConfigESP->countFreeGpio(FUNCTION_BUTTON));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_BUTTONS));
+
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    countFreeGpio = 16;
+  }
+  else {
+    countFreeGpio = ConfigESP->countFreeGpio(FUNCTION_BUTTON);
+  }
+
+  addNumberBox(webContentBuffer, INPUT_MAX_BUTTON, S_QUANTITY, KEY_MAX_BUTTON, countFreeGpio);
+
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_BUTTON)->getValueInt(); nr++) {
-    addListGPIOLinkBox(pagebutton, INPUT_BUTTON_GPIO, S_BUTTON, FUNCTION_BUTTON, PATH_BUTTON_SET, nr);
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+      addListMCP23017GPIOLinkBox(webContentBuffer, INPUT_BUTTON_GPIO, S_BUTTON, FUNCTION_BUTTON, PATH_BUTTON_SET, nr);
+    }
+    else {
+      addListGPIOLinkBox(webContentBuffer, INPUT_BUTTON_GPIO, S_BUTTON, FUNCTION_BUTTON, PATH_BUTTON_SET, nr);
+    }
   }
-  addFormHeaderEnd(pagebutton);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_LIMIT_SWITCH
-  addFormHeader(pagebutton, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
-  addNumberBox(pagebutton, INPUT_MAX_LIMIT_SWITCH, S_QUANTITY, KEY_MAX_LIMIT_SWITCH, ConfigESP->countFreeGpio(FUNCTION_LIMIT_SWITCH));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
+  addNumberBox(webContentBuffer, INPUT_MAX_LIMIT_SWITCH, S_QUANTITY, KEY_MAX_LIMIT_SWITCH, ConfigESP->countFreeGpio(FUNCTION_LIMIT_SWITCH));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt(); nr++) {
-    addListGPIOBox(pagebutton, INPUT_LIMIT_SWITCH_GPIO, S_LIMIT_SWITCH, FUNCTION_LIMIT_SWITCH, nr);
+    addListGPIOBox(webContentBuffer, INPUT_LIMIT_SWITCH_GPIO, S_LIMIT_SWITCH, FUNCTION_LIMIT_SWITCH, nr);
   }
-  addFormHeaderEnd(pagebutton);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
-  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>");
-  pagebutton += S_RETURN;
-  pagebutton += F("</button></a><br><br>");
-  return pagebutton;
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
+
+  WebServer->sendContent();
 }
 
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
@@ -134,7 +145,7 @@ void SuplaWebPageControl::handleButtonSet() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_button_set(0));
+  supla_webpage_button_set(0);
 }
 
 void SuplaWebPageControl::handleButtonSaveSet() {
@@ -144,16 +155,28 @@ void SuplaWebPageControl::handleButtonSaveSet() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String readUrl, nr_button, input;
-  uint8_t place;
+  String readUrl, nr_button, input, path;
+  uint8_t place, key, gpio;
+
+  input.reserve(10);
+  readUrl.reserve(11);
+  nr_button.reserve(2);
+  path.reserve(14);
 
-  String path = PATH_START;
+  path = PATH_START;
   path += PATH_SAVE_BUTTON_SET;
   readUrl = WebServer->httpServer.uri();
 
   place = readUrl.indexOf(path);
   nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
-  uint8_t key = KEY_GPIO + ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
+
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    gpio = ConfigESP->getGpioMCP23017(nr_button.toInt(), FUNCTION_BUTTON);
+  }
+  else {
+    gpio = ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
+  }
+  key = KEY_GPIO + gpio;
 
   input = INPUT_BUTTON_LEVEL;
   input += nr_button;
@@ -165,99 +188,46 @@ void SuplaWebPageControl::handleButtonSaveSet() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      //      Serial.println(F("E_CONFIG_OK: Dane zapisane"));
-      WebServer->sendContent(supla_webpage_control(1));
+      supla_webpage_control(1);
       break;
-
     case E_CONFIG_FILE_OPEN:
-      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_control(2));
+      supla_webpage_control(2);
       break;
   }
 }
 
-String SuplaWebPageControl::supla_webpage_button_set(int save) {
-  String readUrl, nr_button, key;
-  uint8_t place, selected, suported;
+void SuplaWebPageControl::supla_webpage_button_set(int save) {
+  String path, readUrl, nr_button;
+  uint8_t place, selected;
+
+  path.reserve(10);
+  readUrl.reserve(11);
+  nr_button.reserve(2);
 
-  String path = PATH_START;
+  path = PATH_START;
   path += PATH_BUTTON_SET;
   readUrl = WebServer->httpServer.uri();
 
   place = readUrl.indexOf(path);
   nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
 
-  String page = "";
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_CONTROL);
-  uint8_t buttons = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
-  if (nr_button.toInt() <= buttons && ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON) != OFF_GPIO) {
-    page += F("<form method='post' action='");
-    page += PATH_SAVE_BUTTON_SET;
-    page += nr_button;
-    page += F("'><div class='w'><h3>");
-    page += S_BUTTON_NR_SETTINGS;
-    page += F(" ");
-    page += nr_button;
-    page += F("</h3>");
-
-    page += F("<i><label>");
-    page += S_REACTION_TO;
-    page += F("</label><select name='");
-    page += INPUT_BUTTON_LEVEL;
-    page += nr_button;
-    page += F("'>");
-    selected = ConfigESP->getLevel(nr_button.toInt(), FUNCTION_BUTTON);
-    for (suported = 0; suported < 3; suported++) {
-      page += F("<option value='");
-      page += suported;
-      if (selected == suported) {
-        page += F("' selected>");
-      }
-      else
-        page += F("'>");
-      page += TriggerString(suported);
-    }
-    page += F("</select></i>");
-
-    page += F("<i><label>");
-    page += S_ACTION;
-    page += F("</label><select name='");
-    page += INPUT_BUTTON_ACTION;
-    page += nr_button;
-    page += F("'>");
-    selected = ConfigESP->getAction(nr_button.toInt(), FUNCTION_BUTTON);
-    for (suported = 0; suported < 3; suported++) {
-      page += F("<option value='");
-      page += suported;
-      if (selected == suported) {
-        page += F("' selected>");
-      }
-      else
-        page += F("'>");
-      page += PGMT(ACTION_P[suported]);
-    }
-    page += F("</select></i>");
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_CONTROL);
 
-    page += F("</div><button type='submit'>");
-    page += S_SAVE;
-    page += F("</button></form>");
-  }
-  else {
-    page += F("<div class='w'><h3>");
-    page += S_NO_BUTTON_NR;
-    page += F(" </h3>");
-    page += nr_button;
-    page += F("</h3>");
-  }
-  page += F("<br>");
-  page += F("<a href='");
-  page += PATH_START;
-  page += PATH_CONTROL;
-  page += F("'><button>");
-  page += S_RETURN;
-  page += F("</button></a><br><br>");
-
-  return page;
+  addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET + nr_button);
+  addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
+
+  selected = ConfigESP->getLevel(nr_button.toInt(), FUNCTION_BUTTON);
+  addListBox(webContentBuffer, INPUT_BUTTON_LEVEL + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
+
+  selected = ConfigESP->getAction(nr_button.toInt(), FUNCTION_BUTTON);
+  addListBox(webContentBuffer, INPUT_BUTTON_ACTION + nr_button, S_ACTION, ACTION_P, 3, selected);
+
+  addFormHeaderEnd(webContentBuffer);
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_RELAY);
+
+  WebServer->sendContent();
 }
 #endif
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index 99ef91f1..c7043de2 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -4,18 +4,18 @@
 #include "SuplaWebServer.h"
 #include "SuplaDeviceGUI.h"
 
-#define  PATH_CONTROL               "control"
-#define  PATH_SAVE_CONTROL          "savecontrol"
-#define  PATH_BUTTON_SET            "setbutton"
-#define  PATH_SAVE_BUTTON_SET       "savesetbutton"
-#define  INPUT_TRIGGER              "trs"
-#define  INPUT_BUTTON_SET           "bts"
-#define  INPUT_BUTTON_GPIO          "btg"
-#define  INPUT_BUTTON_LEVEL         "icl"
-#define  INPUT_BUTTON_ACTION        "bta"
-#define  INPUT_LIMIT_SWITCH_GPIO    "lsg"
-#define  INPUT_MAX_BUTTON           "mbt"
-#define  INPUT_MAX_LIMIT_SWITCH     "mls"
+#define PATH_CONTROL            "control"
+#define PATH_SAVE_CONTROL       "savecontrol"
+#define PATH_BUTTON_SET         "setbutton"
+#define PATH_SAVE_BUTTON_SET    "savesetbutton"
+#define INPUT_TRIGGER           "trs"
+#define INPUT_BUTTON_SET        "bts"
+#define INPUT_BUTTON_GPIO       "btg"
+#define INPUT_BUTTON_LEVEL      "icl"
+#define INPUT_BUTTON_ACTION     "bta"
+#define INPUT_LIMIT_SWITCH_GPIO "lsg"
+#define INPUT_MAX_BUTTON        "mbt"
+#define INPUT_MAX_LIMIT_SWITCH  "mls"
 
 /*enum _trigger_button {
   TRIGGER_PRESS,
@@ -32,15 +32,14 @@ class SuplaWebPageControl {
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_RSUPLA_BUTTONELAY) || defined(SUPLA_ROLLERSHUTTER))
   void handleButtonSet();
   void handleButtonSaveSet();
-#endif
 
  private:
-  String supla_webpage_control(int save);
+  void supla_webpage_control(int save);
+#endif
 
 #ifdef SUPLA_BUTTON
-  String supla_webpage_button_set(int save);
+  void supla_webpage_button_set(int save);
 #endif
-
 };
 
 extern SuplaWebPageControl* WebPageControl;
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index a2e44450..9d3115d7 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -4,6 +4,7 @@
 #include "SuplaCommonPROGMEM.h"
 #include "GUIGenericCommon.h"
 #include "Markup.h"
+#include "SuplaWebPageSensor.h"
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 SuplaWebPageRelay *WebPageRelay = new SuplaWebPageRelay();
@@ -13,23 +14,25 @@ SuplaWebPageRelay::SuplaWebPageRelay() {
 
 void SuplaWebPageRelay::createWebPageRelay() {
   String path;
+  path.reserve(11);
+
   path += PATH_START;
   path += PATH_RELAY;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageRelay::handleRelay, this));
+  WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelay, this));
   path = PATH_START;
   path += PATH_SAVE_RELAY;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageRelay::handleRelaySave, this));
+  WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySave, this));
 
-  for (uint8_t i = 1; i <= MAX_GPIO; i++) {
+  for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
     path = PATH_START;
     path += PATH_RELAY_SET;
     path += i;
-    WebServer->httpServer.on(path, std::bind(&SuplaWebPageRelay::handleRelaySet, this));
+    WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySet, this));
 
     path = PATH_START;
     path += PATH_SAVE_RELAY_SET;
     path += i;
-    WebServer->httpServer.on(path, std::bind(&SuplaWebPageRelay::handleRelaySaveSet, this));
+    WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSet, this));
   }
 }
 
@@ -38,12 +41,10 @@ void SuplaWebPageRelay::handleRelay() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_relay(0));
+  supla_webpage_relay(0);
 }
 
 void SuplaWebPageRelay::handleRelaySave() {
-  //  Serial.println(F("HTTP_POST - metoda handleRelaySave"));
-
   if (ConfigESP->configModeESP == NORMAL_MODE) {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
@@ -53,9 +54,17 @@ void SuplaWebPageRelay::handleRelaySave() {
 
   last_value = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
-    if (!WebServer->saveGPIO(INPUT_RELAY_GPIO, FUNCTION_RELAY, nr, INPUT_MAX_RELAY)) {
-      WebServer->sendContent(supla_webpage_relay(6));
-      return;
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+      if (!WebServer->saveGpioMCP23017(INPUT_RELAY_GPIO, FUNCTION_RELAY, nr, INPUT_MAX_RELAY)) {
+        supla_webpage_relay(6);
+        return;
+      }
+    }
+    else {
+      if (!WebServer->saveGPIO(INPUT_RELAY_GPIO, FUNCTION_RELAY, nr, INPUT_MAX_RELAY)) {
+        supla_webpage_relay(6);
+        return;
+      }
     }
   }
 
@@ -65,42 +74,47 @@ void SuplaWebPageRelay::handleRelaySave() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      //      Serial.println(F("E_CONFIG_OK: Config save"));
-      WebServer->sendContent(supla_webpage_relay(1));
+      supla_webpage_relay(1);
       break;
     case E_CONFIG_FILE_OPEN:
-      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_relay(2));
+      supla_webpage_relay(2);
       break;
   }
 }
 
-String SuplaWebPageRelay::supla_webpage_relay(int save) {
-  uint8_t selected, suported, nr;
-
-  String pagerelay = "";
-  pagerelay += SuplaSaveResult(save);
-  pagerelay += SuplaJavaScript(PATH_RELAY);
-  pagerelay += F("<form method='post' action='");
-  pagerelay += PATH_SAVE_RELAY;
-  pagerelay += F("'>");
-  addFormHeader(pagerelay, String(S_GPIO_SETTINGS_FOR_RELAYS));
-  addNumberBox(pagerelay, INPUT_MAX_RELAY, S_QUANTITY, KEY_MAX_RELAY, ConfigESP->countFreeGpio(FUNCTION_RELAY));
+void SuplaWebPageRelay::supla_webpage_relay(int save) {
+  uint8_t nr, countFreeGpio;
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_RELAY);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_RELAY);
+  addFormHeader(webContentBuffer, S_GPIO_SETTINGS_FOR_RELAYS);
+
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    countFreeGpio = 16;
+  }
+  else {
+    countFreeGpio = ConfigESP->countFreeGpio(FUNCTION_RELAY);
+  }
+
+  addNumberBox(webContentBuffer, INPUT_MAX_RELAY, S_QUANTITY, KEY_MAX_RELAY, countFreeGpio);
+
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
-    addListGPIOLinkBox(pagerelay, INPUT_RELAY_GPIO, S_RELAY, FUNCTION_RELAY, PATH_RELAY_SET, nr);
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+      addListMCP23017GPIOLinkBox(webContentBuffer, INPUT_RELAY_GPIO, S_RELAY, FUNCTION_RELAY, PATH_RELAY_SET, nr);
+    }
+    else {
+      addListGPIOLinkBox(webContentBuffer, INPUT_RELAY_GPIO, S_RELAY, FUNCTION_RELAY, PATH_RELAY_SET, nr);
+    }
   }
-  addFormHeaderEnd(pagerelay);
-  pagerelay += F("<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>");
-  pagerelay += S_RETURN;
-  pagerelay += F("</button></a><br><br>");
-  return pagerelay;
+  addFormHeaderEnd(webContentBuffer);
+
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
+
+  WebServer->sendContent();
 }
 
 void SuplaWebPageRelay::handleRelaySet() {
@@ -108,18 +122,21 @@ void SuplaWebPageRelay::handleRelaySet() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_relay_set(0));
+  supla_webpage_relay_set(0);
 }
 
 void SuplaWebPageRelay::handleRelaySaveSet() {
-  //  Serial.println(F("HTTP_POST - metoda handleRelaySaveSet"));
   if (ConfigESP->configModeESP == NORMAL_MODE) {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
 
   String readUrl, nr_relay, input;
-  uint8_t place;
+  uint8_t place, key, gpio;
+
+  input.reserve(9);
+  readUrl.reserve(11);
+  nr_relay.reserve(2);
 
   String path = PATH_START;
   path += PATH_SAVE_RELAY_SET;
@@ -127,7 +144,15 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
 
   place = readUrl.indexOf(path);
   nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
-  uint8_t key = KEY_GPIO + ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY);
+
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    gpio = ConfigESP->getGpioMCP23017(nr_relay.toInt(), FUNCTION_RELAY);
+  }
+  else {
+    gpio = ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY);
+  }
+
+  key = KEY_GPIO + gpio;
 
   input = INPUT_RELAY_MEMORY;
   input += nr_relay;
@@ -139,96 +164,46 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      //      Serial.println(F("E_CONFIG_OK: Dane zapisane"));
-      WebServer->sendContent(supla_webpage_relay(1));
+      supla_webpage_relay(1);
       break;
-
     case E_CONFIG_FILE_OPEN:
-      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_relay(2));
+      supla_webpage_relay(2);
       break;
   }
 }
 
-String SuplaWebPageRelay::supla_webpage_relay_set(int save) {
-  String readUrl, nr_relay, key;
-  uint8_t place, selected, suported;
+void SuplaWebPageRelay::supla_webpage_relay_set(int save) {
+  String path, readUrl, nr_relay;
+  uint8_t place, selected;
 
-  String path = PATH_START;
+  path.reserve(9);
+  readUrl.reserve(11);
+  nr_relay.reserve(2);
+
+  path = PATH_START;
   path += PATH_RELAY_SET;
   readUrl = WebServer->httpServer.uri();
 
   place = readUrl.indexOf(path);
   nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
 
-  String page = "";
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_RELAY);
-  uint8_t relays = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
-  if (nr_relay.toInt() <= relays && ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY) != OFF_GPIO) {
-    page += F("<form method='post' action='");
-    page += PATH_SAVE_RELAY_SET;
-    page += nr_relay;
-    page += F("'><div class='w'><h3>");
-    page += S_RELAY_NR_SETTINGS;
-    page += F(" ");
-    page += nr_relay;
-    page += F("</h3>");
-    page += F("<i><label>");
-    page += S_STATE_CONTROL;
-    page += F("</label><select name='");
-    page += INPUT_RELAY_LEVEL;
-    page += nr_relay;
-    page += F("'>");
-    selected = ConfigESP->getLevel(nr_relay.toInt(), FUNCTION_RELAY);
-    for (suported = 0; suported < 2; suported++) {
-      page += F("<option value='");
-      page += suported;
-      if (selected == suported) {
-        page += F("' selected>");
-      }
-      else
-        page += F("'>");
-      page += LevelString(suported);
-    }
-    page += F("</select></i>");
-    page += F("<i><label>");
-    page += S_REACTION_AFTER_RESET;
-    page += F("</label><select name='");
-    page += INPUT_RELAY_MEMORY;
-    page += nr_relay;
-    page += F("'>");
-    selected = ConfigESP->getMemory(nr_relay.toInt(), FUNCTION_RELAY);
-    for (suported = 0; suported < 3; suported++) {
-      page += F("<option value='");
-      page += suported;
-      if (selected == suported) {
-        page += F("' selected>");
-      }
-      else
-        page += F("'>");
-      page += MemoryString(suported);
-    }
-    page += F("</select></i>");
-    page += F("</div><button type='submit'>");
-    page += S_SAVE;
-    page += F("</button></form>");
-  }
-  else {
-    page += F("<div class='w'><h3>");
-    page += S_NO_RELAY_NR;
-    page += F(" ");
-    page += nr_relay;
-    page += F("</h3>");
-  }
-  page += F("<br>");
-  page += F("<a href='");
-  page += PATH_START;
-  page += PATH_RELAY;
-  page += F("'><button>");
-  page += S_RETURN;
-  page += F("</button></a><br><br>");
-
-  return page;
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_RELAY);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_RELAY_SET + nr_relay);
+  addFormHeader(webContentBuffer, S_RELAY_NR_SETTINGS + nr_relay);
+
+  selected = ConfigESP->getLevel(nr_relay.toInt(), FUNCTION_RELAY);
+  addListBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_relay, S_STATE_CONTROL, LEVEL_P, 2, selected);
+
+  selected = ConfigESP->getMemory(nr_relay.toInt(), FUNCTION_RELAY);
+  addListBox(webContentBuffer, INPUT_RELAY_MEMORY + nr_relay, S_REACTION_AFTER_RESET, MEMORY_P, 3, selected);
+
+  addFormHeaderEnd(webContentBuffer);
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_RELAY);
+
+  WebServer->sendContent();
 }
 #endif
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index 88c71aa5..50b65fc1 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -4,23 +4,25 @@
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 
-#define PATH_RELAY           "relay"
-#define PATH_SAVE_RELAY      "saverelay"
-#define PATH_RELAY_SET       "setrelay"
-#define PATH_SAVE_RELAY_SET  "savesetrelay"
-#define INPUT_MAX_RELAY      "mrl"
-#define INPUT_RELAY_GPIO     "rlg"
-#define INPUT_RELAY_LEVEL    "irl"
-#define INPUT_RELAY_MEMORY   "irm"
-#define INPUT_RELAY_DURATION "ird"
-#define INPUT_ROLLERSHUTTER  "irsr"
+#define PATH_RELAY                "relay"
+#define PATH_SAVE_RELAY           "saverelay"
+#define PATH_RELAY_SET            "setrelay"
+#define PATH_SAVE_RELAY_SET       "savesetrelay"
+#define INPUT_MAX_RELAY           "mrl"
+#define INPUT_RELAY_GPIO          "rlg"
+#define INPUT_ADRESS_MCP23017     "iam"
+#define INPUT_RELAY_LEVEL         "irl"
+#define INPUT_RELAY_MEMORY        "irm"
+#define INPUT_RELAY_DURATION      "ird"
+#define INPUT_ROLLERSHUTTER       "irsr"
 
-enum _memory_relay {
+enum _memory_relay
+{
   MEMORY_RELAY_OFF,
   MEMORY_RELAY_ON,
   MEMORY_RELAY_RESTORE
 };
-  
+
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 
 class SuplaWebPageRelay {
@@ -33,8 +35,8 @@ class SuplaWebPageRelay {
   void handleRelaySaveSet();
 
  private:
-  String supla_webpage_relay_set(int save);
-  String supla_webpage_relay(int save);
+  void supla_webpage_relay_set(int save);
+  void supla_webpage_relay(int save);
 };
 
 extern SuplaWebPageRelay* WebPageRelay;
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 7e683f54..3234d52e 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -31,7 +31,7 @@ void SuplaWebPageSensor::createWebPageSensor() {
 #endif
 #endif
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT30) || defined(SUPLA_SI7021)
+#if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MCP23017)
   path = PATH_START;
   path += PATH_I2C;
   WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handlei2c, this));
@@ -80,9 +80,9 @@ void SuplaWebPageSensor::createWebPageSensor() {
   path += PATH_SAVE_HLW8012_CALIBRATE;
   WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleHLW8012CalibrateSave, this));
 #endif
-
 #endif
 }
+
 #ifdef SUPLA_DS18B20
 void SuplaWebPageSensor::handleSearchDS() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
@@ -273,8 +273,7 @@ void SuplaWebPageSensor::handle1WireSave() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String key, input;
-  uint8_t nr, current_value, last_value;
+  uint8_t nr, last_value;
 
 #ifdef SUPLA_DHT11
   last_value = ConfigManager->get(KEY_MAX_DHT11)->getValueInt();
@@ -333,9 +332,8 @@ void SuplaWebPageSensor::handle1WireSave() {
 }
 
 String SuplaWebPageSensor::supla_webpage_1wire(int save) {
-  uint8_t nr, suported, selected;
-  uint16_t max;
-  String page, key;
+  uint8_t nr, max;
+  String page;
 
   page += SuplaSaveResult(save);
   page += SuplaJavaScript(PATH_1WIRE);
@@ -392,7 +390,7 @@ String SuplaWebPageSensor::supla_webpage_1wire(int save) {
 }
 #endif
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT30) || defined(SUPLA_SI7021)
+#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
 void SuplaWebPageSensor::handlei2c() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
@@ -408,9 +406,8 @@ void SuplaWebPageSensor::handlei2cSave() {
   }
 
   String input;
-  uint8_t key, nr, current_value, last_value;
+  uint8_t key;
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x)
   if (!WebServer->saveGPIO(INPUT_SDA_GPIO, FUNCTION_SDA)) {
     WebServer->sendContent(supla_webpage_i2c(6));
     return;
@@ -419,7 +416,6 @@ void SuplaWebPageSensor::handlei2cSave() {
     WebServer->sendContent(supla_webpage_i2c(6));
     return;
   }
-#endif
 
 #ifdef SUPLA_BME280
   key = KEY_ACTIVE_SENSOR;
@@ -459,6 +455,19 @@ void SuplaWebPageSensor::handlei2cSave() {
   }
 #endif
 
+#ifdef SUPLA_MCP23017
+  key = KEY_ACTIVE_SENSOR;
+  input = INPUT_MCP23017;
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_MCP23017, WebServer->httpServer.arg(input).toInt());
+
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+      ConfigESP->clearFunctionGpio(FUNCTION_RELAY);
+      ConfigESP->clearFunctionGpio(FUNCTION_BUTTON);
+    }
+  }
+#endif
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       WebServer->sendContent(supla_webpage_i2c(1));
@@ -471,23 +480,22 @@ void SuplaWebPageSensor::handlei2cSave() {
 }
 
 String SuplaWebPageSensor::supla_webpage_i2c(int save) {
-  uint8_t nr, suported, selected, size;
-  String page, key;
+  uint8_t selected;
+  String page = "";
   page += SuplaSaveResult(save);
   page += SuplaJavaScript(PATH_I2C);
 
   addForm(page, F("post"), PATH_SAVE_I2C);
-#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED)
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " i2c");
-  addListGPIOBox(page, INPUT_SDA_GPIO, "SDA", FUNCTION_SDA);
-  addListGPIOBox(page, INPUT_SCL_GPIO, "SCL", FUNCTION_SCL);
+  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + F(" i2c"));
+  addListGPIOBox(page, INPUT_SDA_GPIO, F("SDA"), FUNCTION_SDA);
+  addListGPIOBox(page, INPUT_SCL_GPIO, F("SCL"), FUNCTION_SCL);
   addFormHeaderEnd(page);
 
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
 #ifdef SUPLA_BME280
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt();
     addFormHeader(page);
-    addListBox(page, INPUT_BME280, "BME280 adres", BME280_P, 4, selected);
+    addListBox(page, INPUT_BME280, F("BME280 adres"), BME280_P, 4, selected);
     addNumberBox(page, INPUT_ALTITUDE_BME280, S_ALTITUDE_ABOVE_SEA_LEVEL, KEY_ALTITUDE_BME280, 1500);
     addFormHeaderEnd(page);
 #endif
@@ -495,25 +503,31 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #ifdef SUPLA_SHT3x
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SHT3x).toInt();
     addFormHeader(page);
-    addListBox(page, INPUT_SHT3x, "SHT3x", SHT3x_P, 4, selected);
+    addListBox(page, INPUT_SHT3x, F("SHT3x"), SHT3x_P, 4, selected);
     addFormHeaderEnd(page);
 #endif
 
 #ifdef SUPLA_SI7021
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SI7021).toInt();
     addFormHeader(page);
-    addListBox(page, INPUT_SI7021, "SI7021", STATE_P, 2, selected);
+    addListBox(page, INPUT_SI7021, F("SI7021"), STATE_P, 2, selected);
     addFormHeaderEnd(page);
 #endif
 
 #ifdef SUPLA_OLED
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
     addFormHeader(page);
-    addListBox(page, INPUT_OLED, "OLED", OLED_P, 4, selected);
+    addListBox(page, INPUT_OLED, F("OLED"), OLED_P, 4, selected);
     addFormHeaderEnd(page);
 #endif
-  }
+
+#ifdef SUPLA_MCP23017
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt();
+    addFormHeader(page);
+    addListBox(page, INPUT_MCP23017, F("MCP23017"), STATE_P, 2, selected);
+    addFormHeaderEnd(page);
 #endif
+  }
 
   addButtonSubmit(page, S_SAVE);
   addFormEnd(page);
@@ -539,8 +553,8 @@ void SuplaWebPageSensor::handleSpiSave() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String key, input;
-  uint8_t nr, current_value, last_value;
+  String input;
+  uint8_t key;
 
 #if defined(SUPLA_MAX6675)
   if (!WebServer->saveGPIO(INPUT_CLK_GPIO, FUNCTION_CLK)) {
@@ -578,7 +592,7 @@ void SuplaWebPageSensor::handleSpiSave() {
 
 String SuplaWebPageSensor::supla_webpage_spi(int save) {
   uint8_t nr, suported, selected;
-  String page, key;
+  String page;
   page += SuplaSaveResult(save);
   page += SuplaJavaScript(PATH_SPI);
   page += F("<form method='post' action='");
@@ -626,7 +640,6 @@ void SuplaWebPageSensor::handleOtherSave() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String key, input;
   uint8_t nr, current_value, last_value;
 
 #ifdef SUPLA_HC_SR04
@@ -684,15 +697,16 @@ void SuplaWebPageSensor::handleOtherSave() {
 
 String SuplaWebPageSensor::supla_webpage_other(int save) {
   uint8_t nr, suported, selected;
-  String page, key;
+  String page = "";
+
   page += SuplaSaveResult(save);
   page += SuplaJavaScript(PATH_OTHER);
 
   addForm(page, F("post"), PATH_SAVE_OTHER);
 #ifdef SUPLA_HC_SR04
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " HC-SR04");
-  addListGPIOBox(page, INPUT_TRIG_GPIO, "TRIG", FUNCTION_TRIG);
-  addListGPIOBox(page, INPUT_ECHO_GPIO, "ECHO", FUNCTION_ECHO);
+  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
+  addListGPIOBox(page, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
+  addListGPIOBox(page, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
   addFormHeaderEnd(page);
 #endif
 
@@ -700,18 +714,18 @@ String SuplaWebPageSensor::supla_webpage_other(int save) {
   addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " " + S_IMPULSE_COUNTER);
   addNumberBox(page, INPUT_MAX_IMPULSE_COUNTER, S_QUANTITY, KEY_MAX_IMPULSE_COUNTER, ConfigESP->countFreeGpio(FUNCTION_IMPULSE_COUNTER));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
-    addListGPIOLinkBox(page, INPUT_IMPULSE_COUNTER_GPIO, "IC GPIO", FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
+    addListGPIOLinkBox(page, INPUT_IMPULSE_COUNTER_GPIO, F("IC GPIO"), FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
   }
   addFormHeaderEnd(page);
 #endif
 
 #ifdef SUPLA_HLW8012
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " HLW8012");
-  addListGPIOBox(page, INPUT_CF, "CF", FUNCTION_CF);
-  addListGPIOBox(page, INPUT_CF1, "CF1", FUNCTION_CF1);
-  addListGPIOBox(page, INPUT_SEL, "SELi", FUNCTION_SEL);
+  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + F(" HLW8012"));
+  addListGPIOBox(page, INPUT_CF, F("CF"), FUNCTION_CF);
+  addListGPIOBox(page, INPUT_CF1, F("CF1"), FUNCTION_CF1);
+  addListGPIOBox(page, INPUT_SEL, F("SELi"), FUNCTION_SEL);
   if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
-    addLinkBox(page, "Kalibracja", PATH_HLW8012_CALIBRATE);
+    addLinkBox(page, F("Kalibracja"), PATH_HLW8012_CALIBRATE);
   }
   addFormHeaderEnd(page);
 #endif
@@ -774,7 +788,7 @@ void SuplaWebPageSensor::handleImpulseCounterSaveSet() {
 }
 
 String SuplaWebPageSensor::supla_impulse_counter_set(int save) {
-  String readUrl, nr, key;
+  String readUrl, nr;
   uint8_t place, selected, suported;
 
   String path = PATH_START;
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 8113cffa..362c6df7 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -27,6 +27,7 @@
 #define INPUT_SHT3x                            "sht30"
 #define INPUT_SI7021                           "si7021"
 #define INPUT_OLED                             "oled"
+#define INPUT_MCP23017                         "mcp"
 #define INPUT_SI7021_SONOFF                    "si7021sonoff"
 #define INPUT_TRIG_GPIO                        "trig"
 #define INPUT_ECHO_GPIO                        "echo"
@@ -44,14 +45,15 @@
 #define INPUT_IMPULSE_COUNTER_CHANGE_VALUE     "iccv"
 #define INPUT_MAX_IMPULSE_COUNTER              "imic"
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT30) || defined(SUPLA_SI7021) || defined(SUPLA_MAX6675)
+#if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MAX6675) || defined(SUPLA_MCP23017)
 enum _sensor
 {
   SENSOR_BME280,
   SENSOR_SHT3x,
   SENSOR_SI7021,
   SENSOR_MAX6675,
-  SENSOR_OLED
+  SENSOR_OLED,
+  SENSOR_MCP23017
 };
 #endif
 
@@ -78,20 +80,18 @@ class SuplaWebPageSensor {
   SuplaWebPageSensor();
   void createWebPageSensor();
 
-#if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
-  void handle1Wire();
-  void handle1WireSave();
-#endif
-
 #ifdef SUPLA_DS18B20
   void handleSearchDS();
   void handleDSSave();
   void showDS18B20(String& content, bool readonly = false);
 #endif
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT30) || defined(SUPLA_SI7021)
+#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
+  void handle1Wire();
+  void handle1WireSave();
   void handlei2c();
   void handlei2cSave();
+  String supla_webpage_i2c(int save);
 #endif
 
 #if defined(SUPLA_MAX6675)
@@ -116,10 +116,6 @@ class SuplaWebPageSensor {
 #endif
 #endif
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT30) || defined(SUPLA_SI7021)
-  String supla_webpage_i2c(int save);
-#endif
-
 #if defined(SUPLA_MAX6675)
   String supla_webpage_spi(int save);
 #endif
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 561a3ea0..242d0402 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -34,7 +34,7 @@ void SuplaWebServer::begin() {
   strcpy(this->www_password, ConfigManager->get(KEY_LOGIN_PASS)->getValue());
 
   httpServer.onNotFound(std::bind(&SuplaWebServer::handleNotFound, this));
-  httpServer.begin();
+  httpServer.begin(80);
 }
 
 void SuplaWebServer::iterateAlways() {
@@ -62,10 +62,7 @@ void SuplaWebServer::createWebServer() {
 #if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH)
   WebPageControl->createWebPageControl();
 #endif
-#if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF) || defined(SUPLA_BME280) || \
-    defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MAX6675) || defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
   WebPageSensor->createWebPageSensor();
-#endif
 #ifdef SUPLA_CONFIG
   WebPageConfig->createWebPageConfig();
 #endif
@@ -225,7 +222,7 @@ String SuplaWebServer::deviceSettings(int save) {
   addButton(content, S_SENSORS_1WIRE, PATH_1WIRE);
 #endif
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT30) || defined(SUPLA_SI7021)
+#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
   addButton(content, S_SENSORS_I2C, PATH_I2C);
 #endif
 
@@ -276,7 +273,7 @@ void SuplaWebServer::handleBoardSave() {
   }
 }
 
-const String SuplaWebServer::SuplaIconEdit() {
+const String& SuplaWebServer::SuplaIconEdit() {
   return F(
       "<img "
       "src='data:image/"
@@ -287,22 +284,29 @@ const String SuplaWebServer::SuplaIconEdit() {
       "kPDGFsHiQkAQDjTS5MMLyE4wAAAABJRU5ErkJggg=='>");
 }
 
-void SuplaWebServer::sendContent(const String content) {
+void SuplaWebServer::sendContent(const String& content) {
   // httpServer.send(200, "text/html", "");
-  const int bufferSize = 1000;
-  String _buffer;
-  int bufferCounter = 0;
+  // const int bufferSize = 1000;
+  // String _buffer;
+  //_buffer.reserve(bufferSize);
+  // int bufferCounter = 0;
+
   int fileSize = content.length();
 
 #ifdef DEBUG_MODE
-  Serial.print("Content size: ");
+  Serial.print(F("Content size: "));
   Serial.println(fileSize);
+  checkRAM();
 #endif
 
-  httpServer.setContentLength(fileSize);
+  httpServer.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+  httpServer.sendHeader("Pragma", "no-cache");
+  httpServer.sendHeader("Expires", "-1");
+  httpServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
   httpServer.chunkedResponseModeStart(200, "text/html");
 
   httpServer.sendContent_P(HTTP_META);
+  httpServer.sendContent_P(HTTP_FAVICON);
   httpServer.sendContent_P(HTTP_STYLE);
   httpServer.sendContent_P(HTTP_LOGO);
 
@@ -317,7 +321,7 @@ void SuplaWebServer::sendContent(const String content) {
   httpServer.sendContent_P(HTTP_COPYRIGHT);
 
   // httpServer.send(200, "text/html", "");
-  for (int i = 0; i < fileSize; i++) {
+  /*for (int i = 0; i < fileSize; i++) {
     _buffer += content[i];
     bufferCounter++;
 
@@ -333,9 +337,72 @@ void SuplaWebServer::sendContent(const String content) {
     yield();
     bufferCounter = 0;
     _buffer = "";
+  }*/
+
+  httpServer.sendContent(content);
+  httpServer.sendContent_P(HTTP_RBT);
+  httpServer.chunkedResponseFinalize();
+}
+
+String webContentBuffer;
+
+void SuplaWebServer::sendContent() {
+  // httpServer.send(200, "text/html", "");
+  // const int bufferSize = 1000;
+  // String _buffer;
+  //_buffer.reserve(bufferSize);
+  // int bufferCounter = 0;
+
+  httpServer.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+  httpServer.sendHeader("Pragma", "no-cache");
+  httpServer.sendHeader("Expires", "-1");
+  httpServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
+  httpServer.chunkedResponseModeStart(200, "text/html");
+
+  httpServer.sendContent_P(HTTP_META);
+  httpServer.sendContent_P(HTTP_FAVICON);
+  httpServer.sendContent_P(HTTP_STYLE);
+  httpServer.sendContent_P(HTTP_LOGO);
+
+  String summary = FPSTR(HTTP_SUMMARY);
+
+  summary.replace("{h}", ConfigManager->get(KEY_HOST_NAME)->getValue());
+  summary.replace("{s}", ConfigESP->getLastStatusSupla());
+  summary.replace("{v}", Supla::Channel::reg_dev.SoftVer);
+  summary.replace("{g}", ConfigManager->get(KEY_SUPLA_GUID)->getValueHex(SUPLA_GUID_SIZE));
+  summary.replace("{m}", ConfigESP->getMacAddress(true));
+  httpServer.sendContent(summary);
+  httpServer.sendContent_P(HTTP_COPYRIGHT);
+
+  // httpServer.send(200, "text/html", "");
+  /*for (int i = 0; i < fileSize; i++) {
+    _buffer += content[i];
+    bufferCounter++;
+
+    if (bufferCounter >= bufferSize) {
+      httpServer.sendContent(_buffer);
+      yield();
+      bufferCounter = 0;
+      _buffer = "";
+    }
   }
+  if (bufferCounter > 0) {
+    httpServer.sendContent(_buffer);
+    yield();
+    bufferCounter = 0;
+    _buffer = "";
+  }*/
+
+  httpServer.sendContent(webContentBuffer);
   httpServer.sendContent_P(HTTP_RBT);
   httpServer.chunkedResponseFinalize();
+
+#ifdef DEBUG_MODE
+  Serial.printf_P(PSTR("Content size=%d\n"), webContentBuffer.length());
+  Serial.printf_P(PSTR("Sent INDEX...Free mem=%d\n"), ESP.getFreeHeap());
+  checkRAM();
+#endif
+  webContentBuffer = "";
 }
 
 void SuplaWebServer::handleNotFound() {
@@ -347,6 +414,7 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   uint8_t current_value, key;
   String input;
   input = _input;
+
   if (nr != 0) {
     input += nr;
   }
@@ -354,6 +422,10 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
     nr = 1;
   }
 
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") == 0) {
+    return true;
+  }
+
   key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
 
   if (ConfigESP->getGpio(nr, function) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
@@ -383,4 +455,32 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
     }
   }
   return true;
+}
+
+bool SuplaWebServer::saveGpioMCP23017(const String& input, uint8_t function, uint8_t nr, const String& input_max) {
+  uint8_t key, address, addressInput, gpio, gpioInput, functionElementInput;
+  String _input = input + nr;
+
+  if (strcmp(WebServer->httpServer.arg(_input).c_str(), "") == 0) {
+    return true;
+  }
+
+  addressInput = WebServer->httpServer.arg(INPUT_ADRESS_MCP23017).toInt();
+  functionElementInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
+  gpioInput = WebServer->httpServer.arg(_input).toInt();
+
+  key = KEY_GPIO + gpioInput;
+  gpio = ConfigESP->getGpioMCP23017(nr, function);
+  address = ConfigESP->getAdressMCP23017(function);
+
+  if (functionElementInput == FUNCTION_OFF) {
+    ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, 1, 0);
+  }
+  else if (gpio == gpioInput && functionElementInput == function) {
+    ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
+  }
+  else {
+    return false;
+  }
+  return true;
 }
\ No newline at end of file
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 51a4219e..333c7fc4 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -53,6 +53,25 @@
 #define INPUT_ROLLERSHUTTER "irsr"
 #define INPUT_BOARD         "board"
 
+
+extern String webContentBuffer;
+
+//https://www.esp8266.com/viewtopic.php?p=84249#p84249
+class MyWebServer : public ESP8266WebServer {
+  public:
+  virtual ~MyWebServer() {
+    if (this->_currentArgs) {
+      delete[] this->_currentArgs;
+      this->_currentArgs = nullptr;
+    }
+
+    if (this->_postArgs) {
+      delete[] this->_postArgs;
+      this->_postArgs = nullptr;
+    }
+  }
+};
+
 class SuplaWebServer : public Supla::Element {
  public:
   SuplaWebServer();
@@ -61,19 +80,20 @@ class SuplaWebServer : public Supla::Element {
   char www_username[MAX_MLOGIN];
   char www_password[MAX_MPASSWORD];
 
-  const String SuplaFavicon();
-  const String SuplaIconEdit();
+  const String& SuplaIconEdit();
   String supla_webpage_start(int save);
 
-  void sendContent(const String content);
+  void sendContent(const String& content);
+  void sendContent();
+
+  MyWebServer httpServer;
 
-  ESP8266WebServer httpServer = {80};
-  
 #ifdef SUPLA_OTA
-   ESP8266HTTPUpdateServer httpUpdater;
+  ESP8266HTTPUpdateServer httpUpdater;
 #endif
 
   bool saveGPIO(const String& input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
+  bool saveGpioMCP23017(const String& input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
 
  private:
   void iterateAlways();
@@ -92,5 +112,4 @@ class SuplaWebServer : public Supla::Element {
 
   void handleNotFound();
 };
-
 #endif  // SuplaWebServer_h

From 5996f7308759a08de3cb3dcadfbf7e9abc6c7409 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 15 Jan 2021 13:26:32 +0100
Subject: [PATCH 034/165] =?UTF-8?q?nowy=20spos=C3=B3b=20pobierania=20warto?=
 =?UTF-8?q?=C5=9Bci=20dla=20OLEDa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GUI-Generic.ino    |  19 ++--
 src/SuplaDeviceGUI.cpp |  20 ----
 src/SuplaDeviceGUI.h   |  20 ----
 src/SuplaOled.cpp      | 212 ++++++++++++++++++++++++-----------------
 src/SuplaOled.h        |  33 ++++---
 5 files changed, 147 insertions(+), 157 deletions(-)

diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 10f3ae50..fbd59496 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -90,7 +90,7 @@ void setup() {
 #ifdef SUPLA_DHT22
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
     if (ConfigESP->getGpio(nr, FUNCTION_DHT22) != OFF_GPIO) {
-      Supla::GUI::sensorDHT22.push_back(new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT22), DHT22));
+      new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT22), DHT22);
     }
   }
 #endif
@@ -103,7 +103,7 @@ void setup() {
 
 #ifdef SUPLA_SI7021_SONOFF
   if (ConfigESP->getGpio(FUNCTION_SI7021_SONOFF) != OFF_GPIO) {
-    Supla::GUI::sensorSi7021Sonoff.push_back(new Supla::Sensor::Si7021Sonoff(ConfigESP->getGpio(FUNCTION_SI7021_SONOFF)));
+    new Supla::Sensor::Si7021Sonoff(ConfigESP->getGpio(FUNCTION_SI7021_SONOFF));
   }
 #endif
 
@@ -121,14 +121,14 @@ void setup() {
 
     switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt()) {
       case BME280_ADDRESS_0X76:
-        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
+        new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
         break;
       case BME280_ADDRESS_0X77:
-        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
+        new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
         break;
       case BME280_ADDRESS_0X76_AND_0X77:
-        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
-        Supla::GUI::sensorBme280.push_back(new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt()));
+        new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+        new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
         break;
     }
 #endif
@@ -155,8 +155,8 @@ void setup() {
 #endif
 #ifdef SUPLA_OLED
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
-      Supla::GUI::oled = new SuplaOled();
-      Supla::GUI::oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
+      SuplaOled *oled = new SuplaOled();
+      oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
     }
 #endif
 
@@ -175,8 +175,7 @@ void setup() {
 
 #ifdef SUPLA_MAX6675
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
-    Supla::GUI::sensorMAX6675_K.push_back(
-        new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0)));
+    new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
   }
 #endif
 
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 3bc9c2ff..9f1cf5c1 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -164,26 +164,6 @@ std::vector<Supla::Control::Button *> button;
 std::vector<DS18B20 *> sensorDS;
 #endif
 
-#ifdef SUPLA_BME280
-std::vector<Supla::Sensor::BME280 *> sensorBme280;
-#endif
-
-#ifdef SUPLA_SI7021_SONOFF
-std::vector<Supla::Sensor::Si7021Sonoff *> sensorSi7021Sonoff;
-#endif
-
-#ifdef SUPLA_DHT22
-std::vector<Supla::Sensor::DHT *> sensorDHT22;
-#endif
-
-#ifdef SUPLA_MAX6675
-std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
-#endif
-
-#ifdef SUPLA_OLED
-SuplaOled *oled;
-#endif
-
 #ifdef SUPLA_HLW8012
 Supla::Sensor::HJ101 *counterHLW8012;
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 59f0d387..02399296 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -114,26 +114,6 @@ extern std::vector<Supla::Sensor::ImpulseCounter *> impulseCounter;
 void addImpulseCounter(int pin, bool lowToHigh, bool inputPullup, unsigned int debounceDelay);
 #endif
 
-#ifdef SUPLA_BME280
-extern std::vector<Supla::Sensor::BME280 *> sensorBme280;
-#endif
-
-#ifdef SUPLA_SI7021_SONOFF
-extern std::vector<Supla::Sensor::Si7021Sonoff *> sensorSi7021Sonoff;
-#endif
-
-#ifdef SUPLA_DHT22
-extern std::vector<Supla::Sensor::DHT *> sensorDHT22;
-#endif
-
-#ifdef SUPLA_MAX6675
-extern std::vector<Supla::Sensor::MAX6675_K *> sensorMAX6675_K;
-#endif
-
-#ifdef SUPLA_OLED
-extern SuplaOled *oled;
-#endif
-
 #ifdef SUPLA_HLW8012
 extern Supla::Sensor::HJ101 *counterHLW8012;
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 5f792999..842d200e 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -2,7 +2,9 @@
 #include "SuplaDeviceGUI.h"
 
 #ifdef SUPLA_OLED
+
 uint8_t* framesCountSensor;
+uint8_t* chanelSensor;
 
 String getTempString(double temperature) {
   if (temperature == -275) {
@@ -49,7 +51,7 @@ int32_t readRssi(void) {
   return (2 * (rssi + 100));
 }
 
-void displaySignal(OLEDDisplay* display) {
+void displayUiSignal(OLEDDisplay* display) {
   int x = display->getWidth() - 17;
   int y = 0;
   int value = readRssi();
@@ -84,7 +86,7 @@ void displaySignal(OLEDDisplay* display) {
   }
 }
 
-void displayRelayState(OLEDDisplay* display) {
+void displayUiRelayState(OLEDDisplay* display) {
   int y = 0;
   int x = 0;
 
@@ -108,18 +110,18 @@ void displayRelayState(OLEDDisplay* display) {
 }
 
 void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state) {
-  displaySignal(display);
+  displayUiSignal(display);
   if (Supla::GUI::relay.size()) {
-    displayRelayState(display);
+    displayUiRelayState(display);
   }
 }
 
-void displaySuplaStatus(OLEDDisplay* display) {
+void displayUiSuplaStatus(OLEDDisplay* display) {
   int x = 0;
   int y = display->getHeight() / 3;
   display->clear();
 
-  displaySignal(display);
+  displayUiSignal(display);
 
   display->setFont(ArialMT_Plain_10);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
@@ -140,14 +142,14 @@ void displayConfigMode(OLEDDisplay* display) {
   display->display();
 }
 
-void displayBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+void displayUiBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
   // display->drawXbm(10, 17, supla_logo_width, supla_logo_height, supla_logo_bits);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
   display->setFont(ArialMT_Plain_16);
   display->drawString(10, display->getHeight() / 2, F("SUPLA"));
 }
 
-void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name) {
+void displayUiTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name) {
   uint8_t temp_width, temp_height;
 
   int drawHeightIcon = display->getHeight() / 2 - 10;
@@ -177,7 +179,7 @@ void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int
   display->drawString(x + temp_width + (getTempString(temp).length() * 12), y + drawStringIcon, "ºC");
 }
 
-void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity) {
+void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity) {
   uint8_t humidity_width, humidity_height;
 
   int drawHeightIcon = display->getHeight() / 2 - 10;
@@ -202,7 +204,7 @@ void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x,
   display->drawString(x + humidity_width + (getHumidityString(humidity).length() * 12), y + drawStringIcon, "%");
 }
 
-void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure) {
+void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure) {
   uint8_t pressure_width, pressure_height;
 
   int drawHeightIcon = display->getHeight() / 2 - 10;
@@ -227,41 +229,58 @@ void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x,
   display->drawString(x + pressure_width + (getPressureString(pressure).length() * 14), y + drawStringIcon, "hPa");
 }
 
-void displayDs18b20(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displayTemp(display, state, x, y, Supla::GUI::sensorDS[getFramesCountSensor(state)]->getValue(),
-              String(ConfigManager->get(KEY_DS_NAME + getFramesCountSensor(state))->getValue()));
-}
-
-void displayBme280Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displayTemp(display, state, x, y, Supla::GUI::sensorBme280[getFramesCountSensor(state)]->getTemp());
-}
-
-void displayBme280Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displaHumidity(display, state, x, y, Supla::GUI::sensorBme280[getFramesCountSensor(state)]->getHumi());
-}
-
-void displayBme280Pressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displayPressure(display, state, x, y, Supla::GUI::sensorBme280[getFramesCountSensor(state)]->getPressure());
-}
-
-void displaySi7021SonoffTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displayTemp(display, state, x, y, Supla::GUI::sensorSi7021Sonoff[getFramesCountSensor(state)]->getTemp());
-}
-
-void displaySi7021SonoffHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displaHumidity(display, state, x, y, Supla::GUI::sensorSi7021Sonoff[getFramesCountSensor(state)]->getHumi());
+void displayTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+    if (element->getChannel()) {
+      auto channel = element->getChannel();
+      if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
+        double lastTemperature = channel->getValueDouble();
+
+        if (ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt() >= state->currentFrame) {
+          displayUiTemperature(display, state, x, y, lastTemperature, ConfigManager->get(KEY_DS_NAME + state->currentFrame)->getValue());
+        }
+        else {
+          displayUiTemperature(display, state, x, y, lastTemperature);
+        }
+      }
+    }
+  }
 }
 
-void displayDHT22Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displayTemp(display, state, x, y, Supla::GUI::sensorDHT22[getFramesCountSensor(state)]->getTemp());
+void displayDoubleTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+    if (element->getChannel()) {
+      auto channel = element->getChannel();
+      if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
+        double lastTemperature = channel->getValueDoubleFirst();
+        displayUiTemperature(display, state, x, y, lastTemperature);
+      }
+    }
+  }
 }
 
-void displayDHT22Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displaHumidity(display, state, x, y, Supla::GUI::sensorDHT22[getFramesCountSensor(state)]->getHumi());
+void displayDoubleHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+    if (element->getChannel()) {
+      auto channel = element->getChannel();
+      if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
+        double lastHumidit = channel->getValueDoubleSecond();
+        displaUiHumidity(display, state, x, y, lastHumidit);
+      }
+    }
+  }
 }
 
-void displayMAX6675Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  displayTemp(display, state, x, y, Supla::GUI::sensorMAX6675_K[getFramesCountSensor(state)]->getValue());
+void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+    if (element->getSecondaryChannel()) {
+      auto channel = element->getSecondaryChannel();
+      if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
+        double lastPressure = channel->getValueDouble();
+        displayUiPressure(display, state, x, y, lastPressure);
+      }
+    }
+  }
 }
 
 SuplaOled::SuplaOled() {
@@ -281,60 +300,43 @@ SuplaOled::SuplaOled() {
     ui = new OLEDDisplayUi(display);
 
     overlays[0] = {msOverlay};
-
-    int maxFrame = Supla::GUI::sensorDS.size() + (Supla::GUI::sensorBme280.size() * 3) + Supla::GUI::sensorSi7021Sonoff.size() +
-                   (Supla::GUI::sensorDHT22.size() * 2) + Supla::GUI::sensorMAX6675_K.size();
-
-    if (maxFrame == 0)
-      maxFrame = 1;
+    int maxFrame = getMaxFrame();
 
     frames = (FrameCallback*)malloc(sizeof(FrameCallback) * maxFrame);
-    framesCountSensor = (uint8_t*)malloc(sizeof(uint8_t) * maxFrame);
-
-    for (int i = 0; i < Supla::GUI::sensorDS.size(); i++) {
-      frames[frameCount] = {displayDs18b20};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-    }
-
-    for (int i = 0; i < Supla::GUI::sensorBme280.size(); i++) {
-      frames[frameCount] = {displayBme280Temp};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-      frames[frameCount] = {displayBme280Humidity};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-      frames[frameCount] = {displayBme280Pressure};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-    }
-
-    for (int i = 0; i < Supla::GUI::sensorSi7021Sonoff.size(); i++) {
-      frames[frameCount] = {displaySi7021SonoffTemp};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-      frames[frameCount] = {displaySi7021SonoffHumidity};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-    }
-
-    for (int i = 0; i < Supla::GUI::sensorDHT22.size(); i++) {
-      frames[frameCount] = {displayDHT22Temp};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-      frames[frameCount] = {displayDHT22Humidity};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
-    }
-
-    for (int i = 0; i < Supla::GUI::sensorMAX6675_K.size(); i++) {
-      frames[frameCount] = {displayMAX6675Temp};
-      framesCountSensor[frameCount] = i;
-      frameCount += 1;
+    chanelSensor = (uint8_t*)malloc(sizeof(uint8_t) * maxFrame);
+
+    for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+      if (element->getChannel()) {
+        auto channel = element->getChannel();
+        Serial.println(channel->getChannelType());
+
+        if (channel->getChannelType() == SUPLA_CHANNELTYPE_THERMOMETER) {
+          frames[frameCount] = {displayTemperature};
+          chanelSensor[frameCount] = channel->getChannelNumber();
+          frameCount += 1;
+        }
+
+        if (channel->getChannelType() == SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR) {
+          frames[frameCount] = {displayDoubleTemperature};
+          chanelSensor[frameCount] = channel->getChannelNumber();
+          frameCount += 1;
+          frames[frameCount] = {displayDoubleHumidity};
+          chanelSensor[frameCount] = channel->getChannelNumber();
+          frameCount += 1;
+        }
+      }
+      if (element->getSecondaryChannel()) {
+        auto channel = element->getSecondaryChannel();
+        if (channel->getChannelType() == SUPLA_CHANNELTYPE_PRESSURESENSOR) {
+          frames[frameCount] = {displayPressure};
+          chanelSensor[frameCount] = channel->getChannelNumber();
+          frameCount += 1;
+        }
+      }
     }
 
     if (frameCount == 0) {
-      frames[frameCount] = {displayBlank};
+      frames[frameCount] = {displayUiBlank};
       frameCount += 1;
     }
 
@@ -359,7 +361,7 @@ SuplaOled::SuplaOled() {
 void SuplaOled::iterateAlways() {
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
     if (ConfigESP->supla_status.status != STATUS_REGISTERED_AND_READY) {
-      displaySuplaStatus(display);
+      displayUiSuplaStatus(display);
       return;
     }
 
@@ -384,7 +386,7 @@ void SuplaOled::iterateAlways() {
 void SuplaOled::addButtonOled(int pin) {
   if (pin != OFF_GPIO) {
     Supla::Control::Button* button = new Supla::Control::Button(pin, true, true);
-    button->addAction(TURN_ON_OLED, Supla::GUI::oled, Supla::ON_PRESS);
+    button->addAction(TURN_ON_OLED, this, Supla::ON_PRESS);
   }
 }
 
@@ -395,4 +397,34 @@ void SuplaOled::runAction(int event, int action) {
     oledON = true;
   }
 }
+
+int SuplaOled::getMaxFrame() {
+  int maxFrame = 0;
+  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+    if (element->getChannel()) {
+      auto channel = element->getChannel();
+      Serial.println(channel->getChannelType());
+
+      if (channel->getChannelType() == SUPLA_CHANNELTYPE_THERMOMETER) {
+        maxFrame += 1;
+      }
+
+      if (channel->getChannelType() == SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR) {
+        maxFrame += 2;
+      }
+    }
+
+    if (element->getSecondaryChannel()) {
+      auto channel = element->getSecondaryChannel();
+      if (channel->getChannelType() == SUPLA_CHANNELTYPE_PRESSURESENSOR) {
+        maxFrame += 1;
+      }
+    }
+  }
+
+  if (maxFrame == 0)
+    maxFrame = 1;
+
+  return maxFrame;
+}
 #endif
\ No newline at end of file
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index dc3b6c4d..2f9987e6 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -29,24 +29,22 @@ String getHumidityString(double humidity);
 String getPressureString(double pressure);
 uint8_t getFramesCountSensor(OLEDDisplayUiState* state);
 int32_t readRssi(void);
-void displaySignal(OLEDDisplay* display);
-void displayRelayState(OLEDDisplay* display);
+
 void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state);
-void displaySuplaStatus(OLEDDisplay* display);
-void displayConfigMode(OLEDDisplay* display);
-void displayBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displayTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name = "\n");
-void displaHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity);
-void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure);
-void displayDs18b20(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displayBme280Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displayBme280Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displayBme280Pressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displaySi7021SonoffTemp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displaySi7021SonoffHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displayDHT22Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displayDHT22Humidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
-void displayMAX6675Temp(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+
+void displayUiSignal(OLEDDisplay* display);
+void displayUiRelayState(OLEDDisplay* display);
+void displayUiSuplaStatus(OLEDDisplay* display);
+void displayUiConfigMode(OLEDDisplay* display);
+void displayUiBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayUiTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name = "\n");
+void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity);
+void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure);
+
+void displayTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayDoubleTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayDoubleHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
+void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
 
 class SuplaOled : public Supla::Triggerable, public Supla::Element {
  public:
@@ -56,6 +54,7 @@ class SuplaOled : public Supla::Triggerable, public Supla::Element {
  private:
   void iterateAlways();
   void runAction(int event, int action);
+  int getMaxFrame();
 
   OLEDDisplay* display;
   OLEDDisplayUi* ui;

From 513f90c7f026aadc8820e918d29497871c81baea Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 16 Jan 2021 10:20:24 +0100
Subject: [PATCH 035/165] =?UTF-8?q?mo=C5=BCliwo=C5=9B=C4=87=20okre=C5=9Ble?=
 =?UTF-8?q?nia=20nazwy=20dla=20ka=C5=BCdego=20ekranu=20dla=20OLEDa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini             |   6 +-
 src/GUI-Generic.ino        |  17 +++---
 src/GUIGenericCommon.cpp   |  38 ++++++++++++
 src/GUIGenericCommon.h     |   5 ++
 src/Markup.cpp             |  22 ++++++-
 src/Markup.h               |  16 ++++++
 src/SuplaConfigESP.cpp     |   4 +-
 src/SuplaConfigManager.cpp |  47 +++++++++------
 src/SuplaConfigManager.h   |  14 +++--
 src/SuplaDeviceGUI.cpp     |   6 +-
 src/SuplaOled.cpp          | 115 +++++++++++++------------------------
 src/SuplaOled.h            |  10 +---
 src/SuplaWebPageSensor.cpp |  56 ++++++++++++------
 src/SuplaWebPageSensor.h   |   3 +
 14 files changed, 219 insertions(+), 140 deletions(-)
 create mode 100644 src/GUIGenericCommon.cpp

diff --git a/platformio.ini b/platformio.ini
index 9f97ff4b..ffe3d704 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.8"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.10"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -41,7 +41,7 @@ build_flags =   -D BUILD_VERSION='"GUI 1.1.8"'
                 -D SUPLA_SI7021
                 -D SUPLA_MAX6675
                 -D SUPLA_HC_SR04
-                -D SUPLA_IMPULSE_COUNTER
+                ;-D SUPLA_IMPULSE_COUNTER
                 -D SUPLA_OLED
                 -D SUPLA_HLW8012
                 -D SUPLA_MCP23017             
@@ -126,7 +126,7 @@ board = nodemcuv2
 board_build.ldscript = eagle.flash.4m1m.ld
 build_flags =   ${common.build_flags}
                 -D DEBUG_MODE
-;build_unflags = -D SUPLA_IMPULSE_COUNTER    
+build_unflags = -D SUPLA_IMPULSE_COUNTER    
 
 [env:GUI_Generic_blank]
 board = nodemcuv2
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index fbd59496..1d47261d 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -79,6 +79,12 @@ void setup() {
                            ConfigManager->get(KEY_CFG_MODE)->getValueInt(), ConfigESP->getLevel(FUNCTION_CFG_LED));
 #endif
 
+#ifdef SUPLA_DS18B20
+  if (ConfigESP->getGpio(FUNCTION_DS18B20) != OFF_GPIO) {
+    Supla::GUI::addDS18B20MultiThermometer(ConfigESP->getGpio(FUNCTION_DS18B20));
+  }
+#endif
+
 #ifdef SUPLA_DHT11
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT11)->getValueInt(); nr++) {
     if (ConfigESP->getGpio(nr, FUNCTION_DHT11) != OFF_GPIO) {
@@ -95,12 +101,6 @@ void setup() {
   }
 #endif
 
-#ifdef SUPLA_DS18B20
-  if (ConfigESP->getGpio(FUNCTION_DS18B20) != OFF_GPIO) {
-    Supla::GUI::addDS18B20MultiThermometer(ConfigESP->getGpio(FUNCTION_DS18B20));
-  }
-#endif
-
 #ifdef SUPLA_SI7021_SONOFF
   if (ConfigESP->getGpio(FUNCTION_SI7021_SONOFF) != OFF_GPIO) {
     new Supla::Sensor::Si7021Sonoff(ConfigESP->getGpio(FUNCTION_SI7021_SONOFF));
@@ -114,11 +114,11 @@ void setup() {
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_HTU21D) || defined(SUPLA_SHT71) || \
-    defined(SUPLA_BH1750) || defined(SUPLA_MAX44009) || defined(SUPLA_MCP23017)
+    defined(SUPLA_BH1750) || defined(SUPLA_MAX44009) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
     Wire.begin(ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
-#ifdef SUPLA_BME280
 
+#ifdef SUPLA_BME280
     switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt()) {
       case BME280_ADDRESS_0X76:
         new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
@@ -153,6 +153,7 @@ void setup() {
       new Supla::Sensor::Si7021();
     }
 #endif
+
 #ifdef SUPLA_OLED
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
       SuplaOled *oled = new SuplaOled();
diff --git a/src/GUIGenericCommon.cpp b/src/GUIGenericCommon.cpp
new file mode 100644
index 00000000..86e92967
--- /dev/null
+++ b/src/GUIGenericCommon.cpp
@@ -0,0 +1,38 @@
+#include "GUIGenericCommon.h"
+#include "SuplaDeviceGUI.h"
+
+uint8_t *HexToBytes(String _value) {
+  int size = 16;
+  uint8_t *buffer = (uint8_t *)malloc(sizeof(uint8_t) * (size));
+
+  for (int i = 0; i < size; i++) {
+    sscanf(&_value[i * 2], "%2hhx", &buffer[i]);
+  }
+  return buffer;
+}
+
+int getNumberChannels() {
+  int maxFrame = 0;
+  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
+    if (element->getChannel()) {
+      auto channel = element->getChannel();
+      
+      if (channel->getChannelType() == SUPLA_CHANNELTYPE_THERMOMETER) {
+        maxFrame += 1;
+      }
+
+      if (channel->getChannelType() == SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR) {
+        maxFrame += 2;
+      }
+    }
+
+    if (element->getSecondaryChannel()) {
+      auto channel = element->getSecondaryChannel();
+      if (channel->getChannelType() == SUPLA_CHANNELTYPE_PRESSURESENSOR) {
+        maxFrame += 1;
+      }
+    }
+  }
+
+  return maxFrame;
+}
\ No newline at end of file
diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 3ed890bc..7fcd07c8 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -10,4 +10,9 @@
 #include INCLUDE_FILE(UI_LANGUAGE)
 #endif
 
+#include "SuplaDeviceGUI.h"
+
+uint8_t *HexToBytes(String _value);
+int getNumberChannels();
+
 #endif  // GUI_GENERIC_COMMON_H
diff --git a/src/Markup.cpp b/src/Markup.cpp
index fc52249e..0ba76b4a 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -25,7 +25,7 @@ void addFormHeaderEnd(String& html) {
 void addTextBox(String& html,
                 const String& input_id,
                 const String& name,
-                uint8_t value_key,
+                const String& value,
                 const String& placeholder,
                 int minlength,
                 int maxlength,
@@ -46,7 +46,6 @@ void addTextBox(String& html,
   }
 
   html += F("' value='");
-  String value = String(ConfigManager->get(value_key)->getValue());
   if (value != placeholder) {
     html += value;
   }
@@ -73,11 +72,30 @@ void addTextBox(String& html,
   html += F("</label></i> ");
 }
 
+void addTextBox(String& html,
+                const String& input_id,
+                const String& name,
+                uint8_t value_key,
+                const String& placeholder,
+                int minlength,
+                int maxlength,
+                bool required,
+                bool readonly,
+                bool password) {
+  String value = String(ConfigManager->get(value_key)->getValue());
+  return addTextBox(html, input_id, name, value, "", minlength, maxlength, required, readonly, password);
+}
+
 void addTextBox(
     String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required, bool readonly) {
   return addTextBox(html, input_id, name, value_key, "", minlength, maxlength, required, readonly, false);
 }
 
+void addTextBox(
+    String& html, const String& input_id, const String& name, const String& value, int minlength, int maxlength, bool required, bool readonly) {
+  return addTextBox(html, input_id, name, value, "", minlength, maxlength, required, readonly, false);
+}
+
 void addTextBoxPassword(String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required) {
   return addTextBox(html, input_id, name, value_key, "", minlength, maxlength, required, false, true);
 }
diff --git a/src/Markup.h b/src/Markup.h
index 582d59fa..b06c2556 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -9,6 +9,17 @@ void addFormEnd(String& html);
 void addFormHeader(String& html, const String& name = "\n");
 void addFormHeaderEnd(String& html);
 
+void addTextBox(String& html,
+                const String& input_id,
+                const String& name,
+                const String& value,
+                const String& placeholder,
+                int minlength,
+                int maxlength,
+                bool required,
+                bool readonly = false,
+                bool password = false);
+
 void addTextBox(String& html,
                 const String& input_id,
                 const String& name,
@@ -19,8 +30,13 @@ void addTextBox(String& html,
                 bool required,
                 bool readonly = false,
                 bool password = false);
+
 void addTextBox(
     String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required, bool readonly = false);
+
+void addTextBox(
+    String& html, const String& input_id, const String& name, const String& value, int minlength, int maxlength, bool required,  bool readonly = false);
+
 void addTextBoxPassword(String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required);
 
 void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index fd04ca0c..143de405 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -624,12 +624,12 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
       ConfigManager->set(key, "0,0,0,0,0");
     }
 
-    for (nr = 0; nr <= MAX_DS18B20; nr++) {
+   /* for (nr = 0; nr <= MAX_DS18B20; nr++) {
       key = KEY_DS + nr;
       ConfigManager->set(key, "");
       key = KEY_DS_NAME + nr;
       ConfigManager->set(key, "");
-    }
+    }*/
 
     ConfigManager->save();
 
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 1b999582..77b3f46a 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -53,15 +53,6 @@ int ConfigOption::getValueInt() {
   return atoi(_value);
 }
 
-uint8_t *ConfigOption::getValueBin(size_t size) {
-  uint8_t *buffer = (uint8_t *)malloc(sizeof(uint8_t) * (size));
-
-  for (int i = 0; i < size; i++) {
-    sscanf(&_value[i * 2], "%2hhx", &buffer[i]);
-  }
-  return buffer;
-}
-
 const char *ConfigOption::getValueHex(size_t size) {
   char *buffer = (char *)malloc(sizeof(char) * (size * 2));
   int a, b;
@@ -118,6 +109,22 @@ const String ConfigOption::replaceElement(int index, int newvalue) {
   return table;
 }
 
+const String ConfigOption::replaceElement(int index, const char *newvalue) {
+  int lenght = SETTINGSCOUNT;
+  String table;
+  for (int i = 0; i <= lenght; i++) {
+    if (i == index) {
+      table += newvalue;
+    }
+    else {
+      table += this->getElement(i);
+    }
+    if (i < lenght - 1)
+      table += SEPARATOR;
+  }
+  return table;
+}
+
 void ConfigOption::setValue(const char *value) {
   if (value != NULL) {
     size_t size = getLength();
@@ -161,19 +168,14 @@ SuplaConfigManager::SuplaConfigManager() {
 
   for (nr = 0; nr <= 17; nr++) {
     key = KEY_GPIO + nr;
-    this->addKey(key, "0,0,0,0,0,0", 28);
+    this->addKey(key, "0,0,0,0,0,0", SETTINGSCOUNT * 2);
   }
 
   this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 16);
   this->addKey(KEY_BOARD, "0", 2);
   this->addKey(KEY_CFG_MODE, "0", 2);
-
-  for (nr = 0; nr <= MAX_DS18B20; nr++) {
-    key = KEY_DS + nr;
-    this->addKey(key, MAX_DS18B20_ADDRESS_HEX);
-    key = KEY_DS_NAME + nr;
-    this->addKey(key, MAX_DS18B20_NAME);
-  }
+  this->addKey(KEY_ADDR_DS18B20, MAX_DS18B20_ADDRESS_HEX * MAX_DS18B20);
+  this->addKey(KEY_NAME_SENSOR, MAX_DS18B20_NAME * MAX_DS18B20);
 
   this->load();
   //  switch (this->load()) {
@@ -394,6 +396,17 @@ bool SuplaConfigManager::setElement(uint8_t key, int index, int newvalue) {
   return false;
 }
 
+bool SuplaConfigManager::setElement(uint8_t key, int index, const char *newvalue) {
+  for (int i = 0; i < _optionCount; i++) {
+    if (key == _options[i]->getKey()) {
+      String data = _options[i]->replaceElement(index, newvalue);
+      _options[i]->setValue(data.c_str());
+      return true;
+    }
+  }
+  return false;
+}
+
 void SuplaConfigManager::setGUIDandAUTHKEY() {
   if (strcmp(this->get(KEY_SUPLA_GUID)->getValue(), "") != 0 || strcmp(this->get(KEY_SUPLA_AUTHKEY)->getValue(), "") != 0) {
     return;
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 10eb2dde..db8f15b9 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -43,7 +43,8 @@
 #define MAX_TYPE_BUTTON         4
 #define MAX_MONOSTABLE_TRIGGER  1
 #define MAX_FUNCTION            1
-#define MAX_DS18B20             10
+
+#define MAX_DS18B20             20
 #define MAX_GPIO                17
 
 enum _key
@@ -70,9 +71,12 @@ enum _key
   KEY_ACTIVE_SENSOR,
   KEY_BOARD,
   KEY_CFG_MODE,
+  KEY_ADDR_DS18B20,
+  KEY_NAME_SENSOR,
+
   KEY_GPIO,
-  KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
-  KEY_DS_NAME = KEY_DS + MAX_DS18B20
+  //KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
+  //KEY_DS_NAME = KEY_DS + MAX_DS18B20
 };
 
 //#define GPIO      "GPIO"
@@ -140,14 +144,15 @@ class ConfigOption {
   uint8_t getKey();
   const char *getValue();
   int getValueInt();
-  uint8_t *getValueBin(size_t size);
   const char *getValueHex(size_t size);
   int getValueElement(int element);
 
   int getLength();
   void setValue(const char *value);
   const String getElement(int index);
+  uint8_t getElement(int index, size_t size);
   const String replaceElement(int index, int value);
+  const String replaceElement(int index, const char *newvalue);
 
  private:
   uint8_t _key;
@@ -170,6 +175,7 @@ class SuplaConfigManager {
   ConfigOption *get(uint8_t key);
   bool set(uint8_t key, const char *value);
   bool setElement(uint8_t key, int index, int newvalue);
+  bool setElement(uint8_t key, int index, const char *newvalue);
 
   bool isDeviceConfigured();
   void setGUIDandAUTHKEY();
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 9f1cf5c1..bcfa68e7 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -27,7 +27,6 @@ Supla::Eeprom eeprom(STORAGE_OFFSET);
 namespace Supla {
 namespace GUI {
 void begin() {
-
 #ifdef DEBUG_MODE
   new Supla::Sensor::EspFreeHeap();
 #endif
@@ -89,9 +88,8 @@ void addRelayButton(int pinRelay, int pinButton, bool highIsOn) {
 void addDS18B20MultiThermometer(int pinNumber) {
   if (ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt() > 1) {
     for (int i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); ++i) {
-      uint8_t ds_key = KEY_DS + i;
-      sensorDS.push_back(new DS18B20(pinNumber, ConfigManager->get(ds_key)->getValueBin(MAX_DS18B20_ADDRESS)));
-      supla_log(LOG_DEBUG, "Index %d - address %s", i, ConfigManager->get(ds_key)->getValue());
+      sensorDS.push_back(new DS18B20(pinNumber, HexToBytes(ConfigManager->get(KEY_ADDR_DS18B20)->getElement(i))));
+      supla_log(LOG_DEBUG, "Index %d - address %s", i, ConfigManager->get(KEY_ADDR_DS18B20)->getElement(i).c_str());
     }
   }
   else {
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 842d200e..66340988 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -3,7 +3,6 @@
 
 #ifdef SUPLA_OLED
 
-uint8_t* framesCountSensor;
 uint8_t* chanelSensor;
 
 String getTempString(double temperature) {
@@ -33,29 +32,22 @@ String getPressureString(double pressure) {
   }
 }
 
-uint8_t getFramesCountSensor(OLEDDisplayUiState* state) {
-  if (state->frameState) {
-    return framesCountSensor[state->currentFrame];
-  }
-  return 0;
-}
-
-int32_t readRssi(void) {
-  int32_t rssi = WiFi.RSSI();
+int getQuality() {
   if (WiFi.status() != WL_CONNECTED)
     return -1;
-  if (rssi <= -100)
+  int dBm = WiFi.RSSI();
+  if (dBm <= -100)
     return 0;
-  if (rssi >= -50)
+  if (dBm >= -50)
     return 100;
-  return (2 * (rssi + 100));
+  return 2 * (dBm + 100);
 }
 
 void displayUiSignal(OLEDDisplay* display) {
   int x = display->getWidth() - 17;
   int y = 0;
-  int value = readRssi();
-  // clear area only
+  int value = getQuality();
+
   display->setColor(BLACK);
   display->fillRect(x, y, x + 46, 16);
   display->setColor(WHITE);
@@ -66,23 +58,15 @@ void displayUiSignal(OLEDDisplay* display) {
   else {
     if (value > 0)
       display->fillRect(x, y + 6, 3, 4);
-    else
-      display->drawRect(x, y + 6, 3, 4);
 
     if (value >= 25)
       display->fillRect(x + 4, y + 4, 3, 6);
-    else
-      display->drawRect(x + 4, y + 4, 3, 6);
 
     if (value >= 50)
       display->fillRect(x + 8, y + 2, 3, 8);
-    else
-      display->drawRect(x + 8, y + 2, 3, 8);
 
     if (value >= 75)
       display->fillRect(x + 12, y, 3, 10);
-    else
-      display->drawRect(x + 12, y, 3, 10);
   }
 }
 
@@ -164,22 +148,23 @@ void displayUiTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16
   }
   else {
     display->drawXbm(x + 0, y + drawHeightIcon, TEMP_WIDTH, TEMP_HEIGHT, temp_bits);
-    display->setFont(ArialMT_Plain_10);
-    if (name != NULL) {
-      display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
-    }
 
     temp_width = TEMP_WIDTH + 10;
     temp_height = TEMP_HEIGHT;
   }
 
+  if (name != NULL) {
+    display->setFont(ArialMT_Plain_10);
+    display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
+  }
+
   display->setFont(ArialMT_Plain_24);
   display->drawString(x + temp_width, y + drawStringIcon, getTempString(temp));
   display->setFont(ArialMT_Plain_16);
   display->drawString(x + temp_width + (getTempString(temp).length() * 12), y + drawStringIcon, "ºC");
 }
 
-void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity) {
+void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity, const String& name) {
   uint8_t humidity_width, humidity_height;
 
   int drawHeightIcon = display->getHeight() / 2 - 10;
@@ -198,13 +183,18 @@ void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x
     humidity_height = HUMIDITY_HEIGHT;
   }
 
+  if (name != NULL) {
+    display->setFont(ArialMT_Plain_10);
+    display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
+  }
+
   display->setFont(ArialMT_Plain_24);
   display->drawString(x + humidity_width, y + drawStringIcon, getHumidityString(humidity));
   display->setFont(ArialMT_Plain_16);
   display->drawString(x + humidity_width + (getHumidityString(humidity).length() * 12), y + drawStringIcon, "%");
 }
 
-void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure) {
+void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure, const String& name) {
   uint8_t pressure_width, pressure_height;
 
   int drawHeightIcon = display->getHeight() / 2 - 10;
@@ -219,13 +209,18 @@ void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t
   }
   else {
     display->drawXbm(x + 0, y + drawHeightIcon, PRESSURE_WIDTH, PRESSURE_HEIGHT, pressure_bits);
-    pressure_width = PRESSURE_WIDTH + 15;
+    pressure_width = PRESSURE_WIDTH + 10;
     pressure_height = PRESSURE_HEIGHT;
   }
 
+  if (name != NULL) {
+    display->setFont(ArialMT_Plain_10);
+    display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
+  }
+
   display->setFont(ArialMT_Plain_24);
   display->drawString(x + pressure_width, y + drawStringIcon, getPressureString(pressure));
-  display->setFont(ArialMT_Plain_10);
+  display->setFont(ArialMT_Plain_16);
   display->drawString(x + pressure_width + (getPressureString(pressure).length() * 14), y + drawStringIcon, "hPa");
 }
 
@@ -235,13 +230,8 @@ void displayTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t
       auto channel = element->getChannel();
       if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
         double lastTemperature = channel->getValueDouble();
-
-        if (ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt() >= state->currentFrame) {
-          displayUiTemperature(display, state, x, y, lastTemperature, ConfigManager->get(KEY_DS_NAME + state->currentFrame)->getValue());
-        }
-        else {
-          displayUiTemperature(display, state, x, y, lastTemperature);
-        }
+        String name = ConfigManager->get(KEY_NAME_SENSOR)->getElement(state->currentFrame);
+        displayUiTemperature(display, state, x, y, lastTemperature, name);
       }
     }
   }
@@ -253,7 +243,8 @@ void displayDoubleTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, i
       auto channel = element->getChannel();
       if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
         double lastTemperature = channel->getValueDoubleFirst();
-        displayUiTemperature(display, state, x, y, lastTemperature);
+        String name = ConfigManager->get(KEY_NAME_SENSOR)->getElement(state->currentFrame);
+        displayUiTemperature(display, state, x, y, lastTemperature, name);
       }
     }
   }
@@ -265,7 +256,8 @@ void displayDoubleHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int1
       auto channel = element->getChannel();
       if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
         double lastHumidit = channel->getValueDoubleSecond();
-        displaUiHumidity(display, state, x, y, lastHumidit);
+        String name = ConfigManager->get(KEY_NAME_SENSOR)->getElement(state->currentFrame);
+        displaUiHumidity(display, state, x, y, lastHumidit, name);
       }
     }
   }
@@ -277,7 +269,8 @@ void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x,
       auto channel = element->getSecondaryChannel();
       if (channel->getChannelNumber() == chanelSensor[state->currentFrame]) {
         double lastPressure = channel->getValueDouble();
-        displayUiPressure(display, state, x, y, lastPressure);
+        String name = ConfigManager->get(KEY_NAME_SENSOR)->getElement(state->currentFrame);
+        displayUiPressure(display, state, x, y, lastPressure, name);
       }
     }
   }
@@ -300,15 +293,17 @@ SuplaOled::SuplaOled() {
     ui = new OLEDDisplayUi(display);
 
     overlays[0] = {msOverlay};
-    int maxFrame = getMaxFrame();
+    int maxFrame = getNumberChannels();
 
-    frames = (FrameCallback*)malloc(sizeof(FrameCallback) * maxFrame);
-    chanelSensor = (uint8_t*)malloc(sizeof(uint8_t) * maxFrame);
+    if (maxFrame == 0)
+      maxFrame = 1;
+
+    frames = new FrameCallback[maxFrame];
+    chanelSensor = new uint8_t[maxFrame];
 
     for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
       if (element->getChannel()) {
         auto channel = element->getChannel();
-        Serial.println(channel->getChannelType());
 
         if (channel->getChannelType() == SUPLA_CHANNELTYPE_THERMOMETER) {
           frames[frameCount] = {displayTemperature};
@@ -397,34 +392,4 @@ void SuplaOled::runAction(int event, int action) {
     oledON = true;
   }
 }
-
-int SuplaOled::getMaxFrame() {
-  int maxFrame = 0;
-  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
-    if (element->getChannel()) {
-      auto channel = element->getChannel();
-      Serial.println(channel->getChannelType());
-
-      if (channel->getChannelType() == SUPLA_CHANNELTYPE_THERMOMETER) {
-        maxFrame += 1;
-      }
-
-      if (channel->getChannelType() == SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR) {
-        maxFrame += 2;
-      }
-    }
-
-    if (element->getSecondaryChannel()) {
-      auto channel = element->getSecondaryChannel();
-      if (channel->getChannelType() == SUPLA_CHANNELTYPE_PRESSURESENSOR) {
-        maxFrame += 1;
-      }
-    }
-  }
-
-  if (maxFrame == 0)
-    maxFrame = 1;
-
-  return maxFrame;
-}
 #endif
\ No newline at end of file
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index 2f9987e6..4d7532e1 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -27,8 +27,7 @@ enum _OLED
 String getTempString(double temperature);
 String getHumidityString(double humidity);
 String getPressureString(double pressure);
-uint8_t getFramesCountSensor(OLEDDisplayUiState* state);
-int32_t readRssi(void);
+int32_t getQuality();
 
 void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state);
 
@@ -38,8 +37,8 @@ void displayUiSuplaStatus(OLEDDisplay* display);
 void displayUiConfigMode(OLEDDisplay* display);
 void displayUiBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
 void displayUiTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double temp, const String& name = "\n");
-void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity);
-void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure);
+void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double humidity, const String& name = "\n");
+void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y, double pressure, const String& name = "\n");
 
 void displayTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
 void displayDoubleTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
@@ -54,7 +53,6 @@ class SuplaOled : public Supla::Triggerable, public Supla::Element {
  private:
   void iterateAlways();
   void runAction(int event, int action);
-  int getMaxFrame();
 
   OLEDDisplay* display;
   OLEDDisplayUi* ui;
@@ -64,8 +62,6 @@ class SuplaOled : public Supla::Triggerable, public Supla::Element {
   OverlayCallback overlays[1];
   int overlaysCount = 1;
 
-  int count = 0;
-
   unsigned long timeLastChangeOled = millis();
   bool oledON = true;
 };
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 3234d52e..43cbfcb6 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -98,18 +98,18 @@ void SuplaWebPageSensor::handleDSSave() {
       return WebServer->httpServer.requestAuthentication();
   }
   for (uint8_t i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); i++) {
-    uint8_t ds_key = KEY_DS + i;
-    uint8_t ds_name_key = KEY_DS_NAME + i;
+    String dsAddr = INPUT_DS18B20_ADDR;
+    String dsName = INPUT_DS18B20_NAME;
+    dsAddr += i;
+    dsName += i;
 
-    String ds = F("dschlid");
-    String ds_name = F("dsnameid");
-    ds += i;
-    ds_name += i;
+    ConfigManager->setElement(KEY_ADDR_DS18B20, i, WebServer->httpServer.arg(dsAddr).c_str());
 
-    ConfigManager->set(ds_key, WebServer->httpServer.arg(ds).c_str());
-    ConfigManager->set(ds_name_key, WebServer->httpServer.arg(ds_name).c_str());
+    if (strcmp(WebServer->httpServer.arg(dsName).c_str(), "") != 0) {
+      ConfigManager->setElement(KEY_NAME_SENSOR, i, WebServer->httpServer.arg(dsName).c_str());
+    }
 
-    Supla::GUI::sensorDS[i]->setDeviceAddress(ConfigManager->get(ds_key)->getValueBin(MAX_DS18B20_ADDRESS));
+    Supla::GUI::sensorDS[i]->setDeviceAddress(HexToBytes(ConfigManager->get(KEY_ADDR_DS18B20)->getElement(i)));
   }
 
   switch (ConfigManager->save()) {
@@ -139,7 +139,7 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
   content += SuplaSaveResult(save);
   content += SuplaJavaScript(PATH_MULTI_DS);
   content += F("<center>");
-  if (ConfigESP->getGpio(FUNCTION_DS18B20) < OFF_GPIO || !Supla::GUI::sensorDS.empty()) {
+  if (ConfigESP->getGpio(FUNCTION_DS18B20) < OFF_GPIO) {
     content += F("<form method='post' action='");
     content += PATH_SAVE_MULTI_DS;
     content += F("'>");
@@ -174,7 +174,8 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
               address[7]);
       supla_log(LOG_DEBUG, "Index %d - address %s", i, strAddr);
 
-      content += F("<i><input name='dschlid");
+      content += F("<i><input name='");
+      content += INPUT_DS18B20_ADDR;
       content += count;
 
       content += F("' value='");
@@ -216,14 +217,12 @@ void SuplaWebPageSensor::showDS18B20(String &content, bool readonly) {
     content += S_TEMPERATURE;
     content += F("</h3>");
     for (uint8_t i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); i++) {
-      uint8_t ds_key = KEY_DS + i;
-      uint8_t ds_name_key = KEY_DS_NAME + i;
-
       double temp = Supla::GUI::sensorDS[i]->getValue();
-      content += F("<i style='border-bottom:none !important;'><input name='dsnameid");
+      content += F("<i style='border-bottom:none !important;'><input name='");
+      content += INPUT_DS18B20_NAME;
       content += i;
       content += F("' value='");
-      content += String(ConfigManager->get(ds_name_key)->getValue());
+      content += String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
       content += F("' maxlength=");
       content += MAX_DS18B20_NAME;
       if (readonly) {
@@ -233,10 +232,11 @@ void SuplaWebPageSensor::showDS18B20(String &content, bool readonly) {
       content += S_NAME;
       content += i + 1;
       content += F("</label></i>");
-      content += F("<i><input name='dschlid");
+      content += F("<i><input name='");
+      content += INPUT_DS18B20_ADDR;
       content += i;
       content += F("' value='");
-      content += String(ConfigManager->get(ds_key)->getValue());
+      content += String(ConfigManager->get(KEY_ADDR_DS18B20)->getElement(i));
       content += F("' maxlength=");
       content += MAX_DS18B20_ADDRESS_HEX;
       if (readonly) {
@@ -453,6 +453,14 @@ void SuplaWebPageSensor::handlei2cSave() {
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
     ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_OLED, WebServer->httpServer.arg(input).toInt());
   }
+
+  for (uint8_t i = 0; i < getNumberChannels(); i++) {
+    input = INPUT_DS18B20_NAME;
+    input += i;
+    if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
+      ConfigManager->setElement(KEY_NAME_SENSOR, i, WebServer->httpServer.arg(input).c_str());
+    }
+  }
 #endif
 
 #ifdef SUPLA_MCP23017
@@ -518,6 +526,18 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
     addFormHeader(page);
     addListBox(page, INPUT_OLED, F("OLED"), OLED_P, 4, selected);
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+      String name, sensorName, input;
+
+      for (uint8_t i = 0; i < getNumberChannels(); i++) {
+        sensorName = String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
+        input = INPUT_DS18B20_NAME;
+        input += i;
+        name = F("Ekran ");
+        name += i + 1;
+        addTextBox(page, input, name, sensorName, 0, MAX_DS18B20_NAME, false);
+      }
+    }
     addFormHeaderEnd(page);
 #endif
 
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 362c6df7..152ccab2 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -81,6 +81,9 @@ class SuplaWebPageSensor {
   void createWebPageSensor();
 
 #ifdef SUPLA_DS18B20
+#define INPUT_DS18B20_ADDR "dsaddr"
+#define INPUT_DS18B20_NAME "dsname"
+
   void handleSearchDS();
   void handleDSSave();
   void showDS18B20(String& content, bool readonly = false);

From 79e22cba7e42f715a07d261ce04e40c98a95639c Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 17 Jan 2021 11:05:50 +0100
Subject: [PATCH 036/165] MCP23017 dla SUPLA_LIMIT_SWITCH

---
 platformio.ini              |   2 -
 src/Markup.cpp              |  25 ++++++--
 src/Markup.h                |   2 +
 src/SuplaCommonPROGMEM.cpp  |  22 -------
 src/SuplaCommonPROGMEM.h    |  12 ++--
 src/SuplaConfigESP.cpp      | 113 ++++++++++++++++++++++++----------
 src/SuplaConfigESP.h        |   6 +-
 src/SuplaWebPageControl.cpp | 117 ++++++++++++++++++++++++++++--------
 src/SuplaWebPageControl.h   |   8 +++
 src/SuplaWebServer.cpp      |  39 +++++++-----
 src/SuplaWebServer.h        |   4 +-
 11 files changed, 239 insertions(+), 111 deletions(-)
 delete mode 100644 src/SuplaCommonPROGMEM.cpp

diff --git a/platformio.ini b/platformio.ini
index ffe3d704..bd7f22d3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -63,7 +63,6 @@ lib_deps =
 	datacute/DoubleResetDetector@^1.0.3
 	closedcube/ClosedCube SHT31D@^1.5.1
 	adafruit/Adafruit Si7021 Library@^1.3.0
-    ;thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays @ ^4.1.0
     xoseperez/HLW8012 @ ^1.1.1
 extra_scripts = tools/copy_files.py       
 
@@ -126,7 +125,6 @@ board = nodemcuv2
 board_build.ldscript = eagle.flash.4m1m.ld
 build_flags =   ${common.build_flags}
                 -D DEBUG_MODE
-build_unflags = -D SUPLA_IMPULSE_COUNTER    
 
 [env:GUI_Generic_blank]
 board = nodemcuv2
diff --git a/src/Markup.cpp b/src/Markup.cpp
index 0ba76b4a..703e2e5d 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -83,7 +83,7 @@ void addTextBox(String& html,
                 bool readonly,
                 bool password) {
   String value = String(ConfigManager->get(value_key)->getValue());
-  return addTextBox(html, input_id, name, value, "", minlength, maxlength, required, readonly, password);
+  return addTextBox(html, input_id, name, value, placeholder, minlength, maxlength, required, readonly, password);
 }
 
 void addTextBox(
@@ -160,10 +160,28 @@ void addListGPIOBox(String& html, const String& input_id, const String& name, ui
   html += F("</i>");
 }
 
+void addListMCP23017GPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr) {
+  if (nr == 1) {
+    uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
+    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 4, address);
+  }
+
+  html += F("<i><label>");
+  if (nr > 0) {
+    html += nr;
+    html += F(".");
+  }
+  html += F(" ");
+  html += name;
+  html += F("</label>");
+  addListMCP23017GPIO(html, input_id, function, nr);
+  html += F("</i>");
+}
+
 void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr) {
   if (nr == 1) {
-    uint8_t address = ConfigESP->getAdressMCP23017(function);
-    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address);
+    uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
+    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 4, address);
   }
 
   html += F("<i>");
@@ -305,7 +323,6 @@ void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function,
   html += F("'>");
 
   uint8_t selected = ConfigESP->getGpioMCP23017(nr, function);
-  uint8_t address = ConfigESP->getAdressMCP23017(function);
 
   for (uint8_t suported = 0; suported < sizeof(GPIO_MCP23017_P) / sizeof(GPIO_MCP23017_P[0]); suported++) {
     if (ConfigESP->checkBusyGpioMCP23017(suported, function) || selected == suported) {
diff --git a/src/Markup.h b/src/Markup.h
index b06c2556..f04c9200 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -47,6 +47,8 @@ void addLinkBox(String& html, const String& name, const String& url);
 
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0);
 
+void addListMCP23017GPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr);
+
 void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr = 0);
 
 void addListGPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr = 0);
diff --git a/src/SuplaCommonPROGMEM.cpp b/src/SuplaCommonPROGMEM.cpp
deleted file mode 100644
index 25415725..00000000
--- a/src/SuplaCommonPROGMEM.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "SuplaCommonPROGMEM.h"
-#include "SuplaTemplateBoard.h"
-
-String StateString(uint8_t adr) {
-  return PGMT(STATE_P[adr]);
-}
-
-String LevelString(uint8_t nr) {
-  return PGMT(LEVEL_P[nr]);
-}
-
-String MemoryString(uint8_t nr) {
-  return PGMT(MEMORY_P[nr]);
-}
-
-String TriggerString(uint8_t nr) {
-  return PGMT(TRIGGER_P[nr]);
-}
-
-String BoardString(uint8_t board) {
-  return PGMT(BOARD_P[board]);
-}
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index ffab8c05..6ce2578e 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -50,7 +50,7 @@ const char HTTP_LOGO[] PROGMEM =
     "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_SUMMARY[] PROGMEM = "<h1>{h}</h1><span>LAST STATE: {s}<br>Firmware: SuplaDevice {v}<br>GUID: {g}<br>MAC: {m}<br>Free Mem: {f}KB</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";
@@ -111,7 +111,9 @@ const char* const SHT3x_P[] PROGMEM = {OFF, ADR44, ADR45, ADR44_ADR45};
 
 const char ADR20[] PROGMEM = "0x20";
 const char ADR21[] PROGMEM = "0x21";
-const char* const MCP23017_P[] PROGMEM = {ADR20, ADR21, OFF};
+const char ADR22[] PROGMEM = "0x22";
+const char ADR23[] PROGMEM = "0x23";
+const char* const MCP23017_P[] PROGMEM = {ADR20, ADR21, ADR22, OFF};
 
 const char* const STATE_P[] PROGMEM = {OFF, ON};
 
@@ -141,10 +143,4 @@ const char SSD1306_WEMOS_SHIELD[] PROGMEM = "SSD1306 - 0,66'' WEMOS OLED shield"
 const char* const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106, SSD1306_WEMOS_SHIELD};
 #endif
 
-String StateString(uint8_t adr);
-String LevelString(uint8_t nr);
-String MemoryString(uint8_t nr);
-String TriggerString(uint8_t nr);
-String BoardString(uint8_t board);
-
 #endif  // SuplaCommonPROGMEM_h
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 143de405..1ceba4e9 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -253,7 +253,7 @@ int SuplaConfigESP::getGpio(int nr, int function) {
     //"Pin 100 - 115"
     // Pin 116 - 131"
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
-      switch (getAdressMCP23017(function)) {
+      switch (getAdressMCP23017(nr, function)) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function &&
               ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
@@ -266,6 +266,12 @@ int SuplaConfigESP::getGpio(int nr, int function) {
             return gpio + 100 + 16;
           }
           break;
+        case 2:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function &&
+              ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+            return gpio + 100 + 16 + 16;
+          }
+          break;
       }
     }
   }
@@ -281,7 +287,7 @@ int SuplaConfigESP::getLevel(int nr, int function) {
       }
     }
 
-    switch (getAdressMCP23017(function)) {
+    switch (getAdressMCP23017(nr, function)) {
       case 0:
         if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
           if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
@@ -298,6 +304,14 @@ int SuplaConfigESP::getLevel(int nr, int function) {
           }
         }
         break;
+      case 2:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(LEVEL).toInt();
+            ;
+          }
+        }
+        break;
     }
   }
   return OFF_GPIO;
@@ -312,7 +326,7 @@ int SuplaConfigESP::getMemory(int nr, int function) {
       }
     }
 
-    switch (getAdressMCP23017(function)) {
+    switch (getAdressMCP23017(nr, function)) {
       case 0:
         if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
           if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
@@ -329,6 +343,14 @@ int SuplaConfigESP::getMemory(int nr, int function) {
           }
         }
         break;
+      case 2:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(MEMORY).toInt();
+            ;
+          }
+        }
+        break;
     }
   }
   return OFF_GPIO;
@@ -344,7 +366,7 @@ int SuplaConfigESP::getAction(int nr, int function) {
       }
     }
 
-    switch (getAdressMCP23017(function)) {
+    switch (getAdressMCP23017(nr, function)) {
       case 0:
         if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
           if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
@@ -361,6 +383,14 @@ int SuplaConfigESP::getAction(int nr, int function) {
           }
         }
         break;
+      case 2:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+            return ConfigManager->get(key)->getElement(ACTION).toInt();
+            ;
+          }
+        }
+        break;
     }
   }
   return OFF_GPIO;
@@ -455,17 +485,10 @@ bool SuplaConfigESP::checkBusyGpioMCP23017(uint8_t gpio, uint8_t function) {
   }
   else {
     uint8_t key = KEY_GPIO + gpio;
-    switch (getAdressMCP23017(function)) {
-      case 0:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() != FUNCTION_OFF) {
-          return false;
-        }
-        break;
-      case 1:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() != FUNCTION_OFF) {
-          return false;
-        }
-        break;
+    uint8_t address = ConfigESP->getAdressMCP23017(1, function);
+
+    if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() != FUNCTION_OFF) {
+      return false;
     }
   }
   return true;
@@ -475,7 +498,7 @@ uint8_t SuplaConfigESP::getGpioMCP23017(uint8_t nr, uint8_t function) {
   for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
     uint8_t key = KEY_GPIO + gpio;
 
-    switch (getAdressMCP23017(function)) {
+    switch (getAdressMCP23017(nr, function)) {
       case 0:
         if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
           if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
@@ -490,33 +513,45 @@ uint8_t SuplaConfigESP::getGpioMCP23017(uint8_t nr, uint8_t function) {
           }
         }
         break;
+      case 2:
+        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+            return gpio;
+          }
+        }
+        break;
     }
   }
   return OFF_GPIO;
 }
 
-uint8_t SuplaConfigESP::getAdressMCP23017(uint8_t function) {
+uint8_t SuplaConfigESP::getAdressMCP23017(uint8_t nr, uint8_t function) {
   for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
     uint8_t key = KEY_GPIO + gpio;
-    if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() != 0) {
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
       if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
         return 0;
       }
     }
-    if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() != 0) {
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
       if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
         return 1;
       }
     }
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+        return 2;
+      }
+    }
   }
-  return 2;
+  return OFF_MCP23017;
 }
 
 void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory) {
   uint8_t key = KEY_GPIO + gpio;
 
   uint8_t _gpio = ConfigESP->getGpioMCP23017(nr, function);
-  ConfigESP->clearGpioMCP23017(_gpio, function);
+  ConfigESP->clearGpioMCP23017(_gpio, nr, function);
 
   if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
     ConfigManager->setElement(key, LEVEL, 0);
@@ -538,15 +573,21 @@ void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, u
       ConfigManager->setElement(key, MCP23017_NR_2, nr);
       ConfigManager->setElement(key, MCP23017_FUNCTION_2, function);
       break;
+    case 2:
+      ConfigManager->setElement(key, MCP23017_NR_3, nr);
+      ConfigManager->setElement(key, MCP23017_FUNCTION_3, function);
+      break;
   }
 }
 
-void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t function) {
+void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function) {
   uint8_t key = KEY_GPIO + gpio;
-  uint8_t adress = getAdressMCP23017(function);
+  uint8_t adress = getAdressMCP23017(nr, function);
 
-  ConfigManager->setElement(key, getNrMCP23017(adress), 0);
-  ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
+  if (adress != OFF_MCP23017) {
+    ConfigManager->setElement(key, getNrMCP23017(adress), 0);
+    ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
+  }
 }
 
 void SuplaConfigESP::clearFunctionGpio(uint8_t function) {
@@ -568,8 +609,11 @@ uint8_t SuplaConfigESP::getFunctionMCP23017(uint8_t adress) {
     case 1:
       return MCP23017_FUNCTION_2;
       break;
+    case 2:
+      return MCP23017_FUNCTION_3;
+      break;
   }
-  return OFF_GPIO;
+  return FUNCTION_OFF;
 }
 
 uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
@@ -580,8 +624,11 @@ uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
     case 1:
       return MCP23017_NR_2;
       break;
+    case 2:
+      return MCP23017_NR_3;
+      break;
   }
-  return OFF_GPIO;
+  return FUNCTION_OFF;
 }
 
 void SuplaConfigESP::factoryReset(bool forceReset) {
@@ -624,12 +671,12 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
       ConfigManager->set(key, "0,0,0,0,0");
     }
 
-   /* for (nr = 0; nr <= MAX_DS18B20; nr++) {
-      key = KEY_DS + nr;
-      ConfigManager->set(key, "");
-      key = KEY_DS_NAME + nr;
-      ConfigManager->set(key, "");
-    }*/
+    /* for (nr = 0; nr <= MAX_DS18B20; nr++) {
+       key = KEY_DS + nr;
+       ConfigManager->set(key, "");
+       key = KEY_DS_NAME + nr;
+       ConfigManager->set(key, "");
+     }*/
 
     ConfigManager->save();
 
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 7a0c9ae9..9a526026 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -37,6 +37,8 @@ enum _ConfigMode
   FACTORYRESET
 };
 
+#define OFF_MCP23017 3
+
 typedef struct {
   int status;
   const char *msg;
@@ -97,9 +99,9 @@ class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
 
   bool checkBusyGpioMCP23017(uint8_t gpio, uint8_t function);
   uint8_t getGpioMCP23017(uint8_t nr, uint8_t function);
-  uint8_t getAdressMCP23017(uint8_t function);
+  uint8_t getAdressMCP23017(uint8_t nr, uint8_t function);
   void setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory);
-  void clearGpioMCP23017(uint8_t gpio, uint8_t function);
+  void clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function);
   void clearFunctionGpio(uint8_t function);
   uint8_t getFunctionMCP23017(uint8_t adress);
   uint8_t getNrMCP23017(uint8_t adress);
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 28411956..18131c29 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -28,6 +28,15 @@ void SuplaWebPageControl::createWebPageControl() {
     WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleButtonSaveSet, this));
   }
 #endif
+
+#ifdef SUPLA_LIMIT_SWITCH
+  path = PATH_START;
+  path += PATH_SWITCH;
+  WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleLimitSwitch, this));
+  path = PATH_START;
+  path += PATH_SAVE_SWITCH;
+  WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleLimitSwitchSave, this));
+#endif
 }
 
 void SuplaWebPageControl::handleControl() {
@@ -69,20 +78,6 @@ void SuplaWebPageControl::handleControlSave() {
   }
 #endif
 
-#ifdef SUPLA_LIMIT_SWITCH
-  last_value = ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt();
-  for (nr = 1; nr <= last_value; nr++) {
-    if (!WebServer->saveGPIO(INPUT_LIMIT_SWITCH_GPIO, FUNCTION_LIMIT_SWITCH, nr, INPUT_MAX_LIMIT_SWITCH)) {
-      supla_webpage_control(6);
-      return;
-    }
-  }
-
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_LIMIT_SWITCH).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_LIMIT_SWITCH, WebServer->httpServer.arg(INPUT_MAX_LIMIT_SWITCH).c_str());
-  }
-#endif
-
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       supla_webpage_control(1);
@@ -123,15 +118,6 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
   addFormHeaderEnd(webContentBuffer);
 #endif
 
-#ifdef SUPLA_LIMIT_SWITCH
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
-  addNumberBox(webContentBuffer, INPUT_MAX_LIMIT_SWITCH, S_QUANTITY, KEY_MAX_LIMIT_SWITCH, ConfigESP->countFreeGpio(FUNCTION_LIMIT_SWITCH));
-  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt(); nr++) {
-    addListGPIOBox(webContentBuffer, INPUT_LIMIT_SWITCH_GPIO, S_LIMIT_SWITCH, FUNCTION_LIMIT_SWITCH, nr);
-  }
-  addFormHeaderEnd(webContentBuffer);
-#endif
-
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
@@ -226,7 +212,90 @@ void SuplaWebPageControl::supla_webpage_button_set(int save) {
   addFormHeaderEnd(webContentBuffer);
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
-  addButton(webContentBuffer, S_RETURN, PATH_RELAY);
+  addButton(webContentBuffer, S_RETURN, PATH_CONTROL);
+
+  WebServer->sendContent();
+}
+#endif
+
+#ifdef SUPLA_LIMIT_SWITCH
+void SuplaWebPageControl::handleLimitSwitch() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  suplaWebpageLimitSwitch(0);
+}
+
+void SuplaWebPageControl::handleLimitSwitchSave() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  uint8_t nr, last_value;
+
+  last_value = ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt();
+  for (nr = 1; nr <= last_value; nr++) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+      if (!WebServer->saveGpioMCP23017(INPUT_LIMIT_SWITCH_GPIO, FUNCTION_LIMIT_SWITCH, nr, INPUT_MAX_LIMIT_SWITCH)) {
+        suplaWebpageLimitSwitch(6);
+        return;
+      }
+    }
+    else {
+      if (!WebServer->saveGPIO(INPUT_LIMIT_SWITCH_GPIO, FUNCTION_LIMIT_SWITCH, nr, INPUT_MAX_LIMIT_SWITCH)) {
+        suplaWebpageLimitSwitch(6);
+        return;
+      }
+    }
+  }
+
+  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_LIMIT_SWITCH).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_LIMIT_SWITCH, WebServer->httpServer.arg(INPUT_MAX_LIMIT_SWITCH).c_str());
+  }
+
+  switch (ConfigManager->save()) {
+    case E_CONFIG_OK:
+      suplaWebpageLimitSwitch(1);
+      break;
+    case E_CONFIG_FILE_OPEN:
+      suplaWebpageLimitSwitch(2);
+      break;
+  }
+}
+
+void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
+    uint8_t nr, countFreeGpio;
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_SWITCH);
+  addForm(webContentBuffer, F("post"), PATH_SAVE_SWITCH);
+  
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
+
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    countFreeGpio = 16;
+  }
+  else {
+    countFreeGpio = ConfigESP->countFreeGpio(FUNCTION_LIMIT_SWITCH);
+  }
+
+  addNumberBox(webContentBuffer, INPUT_MAX_LIMIT_SWITCH, S_QUANTITY, KEY_MAX_LIMIT_SWITCH, countFreeGpio);
+
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt(); nr++) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+      addListMCP23017GPIOBox(webContentBuffer, INPUT_LIMIT_SWITCH_GPIO, S_LIMIT_SWITCH, FUNCTION_LIMIT_SWITCH, nr);
+    }
+    else {
+      addListGPIOBox(webContentBuffer, INPUT_LIMIT_SWITCH_GPIO, S_LIMIT_SWITCH, FUNCTION_LIMIT_SWITCH, nr);
+    }
+  }
+  addFormHeaderEnd(webContentBuffer);
+
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
 
   WebServer->sendContent();
 }
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index c7043de2..c2443a5e 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -5,6 +5,8 @@
 #include "SuplaDeviceGUI.h"
 
 #define PATH_CONTROL            "control"
+#define PATH_SWITCH             "switch"
+#define PATH_SAVE_SWITCH        "saveswitch"
 #define PATH_SAVE_CONTROL       "savecontrol"
 #define PATH_BUTTON_SET         "setbutton"
 #define PATH_SAVE_BUTTON_SET    "savesetbutton"
@@ -29,6 +31,12 @@ class SuplaWebPageControl {
   void handleControl();
   void handleControlSave();
 
+#ifdef SUPLA_LIMIT_SWITCH
+  void handleLimitSwitch();
+  void handleLimitSwitchSave();
+  void suplaWebpageLimitSwitch(int save);
+#endif
+
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_RSUPLA_BUTTONELAY) || defined(SUPLA_ROLLERSHUTTER))
   void handleButtonSet();
   void handleButtonSaveSet();
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 242d0402..38163f35 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -218,6 +218,10 @@ String SuplaWebServer::deviceSettings(int save) {
   addButton(content, S_BUTTONS, PATH_CONTROL);
 #endif
 
+#ifdef SUPLA_LIMIT_SWITCH
+  addButton(content, F("KONTAKTRON"), PATH_SWITCH);
+#endif
+
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
   addButton(content, S_SENSORS_1WIRE, PATH_1WIRE);
 #endif
@@ -317,6 +321,7 @@ void SuplaWebServer::sendContent(const String& content) {
   summary.replace("{v}", Supla::Channel::reg_dev.SoftVer);
   summary.replace("{g}", ConfigManager->get(KEY_SUPLA_GUID)->getValueHex(SUPLA_GUID_SIZE));
   summary.replace("{m}", ConfigESP->getMacAddress(true));
+  summary.replace("{f}", String(ESP.getFreeHeap() / 1024.0));
   httpServer.sendContent(summary);
   httpServer.sendContent_P(HTTP_COPYRIGHT);
 
@@ -371,6 +376,8 @@ void SuplaWebServer::sendContent() {
   summary.replace("{v}", Supla::Channel::reg_dev.SoftVer);
   summary.replace("{g}", ConfigManager->get(KEY_SUPLA_GUID)->getValueHex(SUPLA_GUID_SIZE));
   summary.replace("{m}", ConfigESP->getMacAddress(true));
+  summary.replace("{f}", String(ESP.getFreeHeap() / 1024.0));
+
   httpServer.sendContent(summary);
   httpServer.sendContent_P(HTTP_COPYRIGHT);
 
@@ -457,30 +464,34 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   return true;
 }
 
-bool SuplaWebServer::saveGpioMCP23017(const String& input, uint8_t function, uint8_t nr, const String& input_max) {
+bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
   uint8_t key, address, addressInput, gpio, gpioInput, functionElementInput;
-  String _input = input + nr;
+  String input = _input + nr;
 
-  if (strcmp(WebServer->httpServer.arg(_input).c_str(), "") == 0) {
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") == 0) {
     return true;
   }
 
   addressInput = WebServer->httpServer.arg(INPUT_ADRESS_MCP23017).toInt();
-  functionElementInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
-  gpioInput = WebServer->httpServer.arg(_input).toInt();
 
+  gpioInput = WebServer->httpServer.arg(input).toInt();
   key = KEY_GPIO + gpioInput;
+  functionElementInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
   gpio = ConfigESP->getGpioMCP23017(nr, function);
-  address = ConfigESP->getAdressMCP23017(function);
-
-  if (functionElementInput == FUNCTION_OFF) {
-    ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, 1, 0);
-  }
-  else if (gpio == gpioInput && functionElementInput == function) {
-    ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
+  if (addressInput == OFF_MCP23017) {
+    ConfigESP->clearGpioMCP23017(gpio, nr, function);
   }
-  else {
-    return false;
+
+  if (gpioInput != OFF_GPIO) {
+    if (functionElementInput == FUNCTION_OFF) {
+      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, 1, 0);
+    }
+    else if (gpio == gpioInput && functionElementInput == function) {
+      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
+    }
+    else {
+      return false;
+    }
   }
   return true;
 }
\ No newline at end of file
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 333c7fc4..958b0e2e 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -92,8 +92,8 @@ class SuplaWebServer : public Supla::Element {
   ESP8266HTTPUpdateServer httpUpdater;
 #endif
 
-  bool saveGPIO(const String& input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
-  bool saveGpioMCP23017(const String& input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
+  bool saveGPIO(const String& _input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
+  bool saveGpioMCP23017(const String& _input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
 
  private:
   void iterateAlways();

From a97faf317fb3d552204a17c319b25ef800fbf80a Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 17 Jan 2021 12:48:55 +0100
Subject: [PATCH 037/165] =?UTF-8?q?nowy=20spos=C3=B3b=20wysy=C5=82ania=20s?=
 =?UTF-8?q?endContent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Markup.cpp                |   6 +-
 src/SuplaCommonPROGMEM.h      |   9 +
 src/SuplaHTTPUpdateServer.cpp |  47 ++-
 src/SuplaHTTPUpdateServer.h   |   2 +-
 src/SuplaWebPageConfig.cpp    |  40 +--
 src/SuplaWebPageConfig.h      |   2 +-
 src/SuplaWebPageSensor.cpp    | 636 +++++++++++++++++-----------------
 src/SuplaWebPageSensor.h      |  16 +-
 src/SuplaWebPageTools.cpp     |  19 +-
 src/SuplaWebPageUpload.cpp    |  31 +-
 src/SuplaWebServer.cpp        | 195 ++++-------
 src/SuplaWebServer.h          |   8 +-
 12 files changed, 465 insertions(+), 546 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index 703e2e5d..d58d9739 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -141,7 +141,7 @@ void addLinkBox(String& html, const String& name, const String& url) {
   html += url;
   html += F("'>");
   html += name;
-  html += WebServer->SuplaIconEdit();
+  html += PGMT(ICON_EDIT);
   html += F("</a>");
   html += F("</label>");
   html += F("</i>");
@@ -201,7 +201,7 @@ void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const Stri
   }
   html += name;
   if (ConfigESP->getGpioMCP23017(nr, function) != OFF_GPIO) {
-    html += WebServer->SuplaIconEdit();
+    html += PGMT(ICON_EDIT);
     html += F("</a>");
   }
   html += F("</label>");
@@ -234,7 +234,7 @@ void addListGPIOLinkBox(String& html, const String& input_id, const String& name
   }
   html += name;
   if (ConfigESP->getGpio(_nr, function) != OFF_GPIO) {
-    html += WebServer->SuplaIconEdit();
+    html += PGMT(ICON_EDIT);
     html += F("</a>");
   }
   html += F("</label>");
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 6ce2578e..325f5c40 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -59,6 +59,15 @@ const char HTTP_FAVICON[] PROGMEM = "<link rel='icon' href='data:image/png;base6
 
 const char HTTP_RBT[] PROGMEM = "<form method='post' action='rbt'><button type='submit'>Restart</button></form>";
 
+const char ICON_EDIT[] PROGMEM = 
+      "<img "
+      "src='data:image/"
+      "png;base64,"
+      "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAB3RJTUUH5AYHChEfgNCVHgAAAAlwSFlzAAAuIwAALiMB"
+      "eKU/dgAAAARnQU1BAACxjwv8YQUAAABBSURBVHjaY1BiwA4xhWqU/"
+      "gMxAzZhEGRAF2ZQmoGpA6R6BlSaAV34P0QYIYEmDJPAEIZJQFxSg+"
+      "kPDGFsHiQkAQDjTS5MMLyE4wAAAABJRU5ErkJggg=='>";
+
 const char GPIO0[] PROGMEM = "GPIO0-D3";
 const char GPIO1[] PROGMEM = "GPIO1-TX";
 const char GPIO2[] PROGMEM = "GPIO2-D4";
diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 593fd9cc..501242e5 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -17,7 +17,7 @@ static const char serverIndex[] PROGMEM =
      <html lang='en'>
      <head>
          <meta charset='utf-8'>
-         <meta name='viewport' content='width=device-width,initial-scale=1'/>
+         <meta name='viewport' webContentBuffer='width=device-width,initial-scale=1'/>
      </head>
      <body>
      <div>Flash Size: {f}kB</div>
@@ -29,9 +29,9 @@ static const char serverIndex[] PROGMEM =
      </form>
      </body>
      </html>)";
-static const char successResponse[] PROGMEM = "<META http-equiv='refresh' content='15'>Update Success! Rebooting...";
+static const char successResponse[] PROGMEM = "<META http-equiv='refresh' webContentBuffer='15'>Update Success! Rebooting...";
 static const char twoStepResponse[] PROGMEM =
-    "<META http-equiv='refresh' content='15'><b>WARNING</b> only use 2-step OTA update. Use GUI-GenericUpdater.bin";
+    "<META http-equiv='refresh' webContentBuffer='15'><b>WARNING</b> only use 2-step OTA update. Use GUI-GenericUpdater.bin";
 
 ESP8266HTTPUpdateServer::ESP8266HTTPUpdateServer(bool serial_debug) {
   _serial_output = serial_debug;
@@ -144,30 +144,27 @@ void ESP8266HTTPUpdateServer::handleFirmwareUp() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(suplaWebPageUpddate());
+  suplaWebPageUpddate();
 }
 
-String ESP8266HTTPUpdateServer::suplaWebPageUpddate() {
-  String content = "";
-  content += SuplaJavaScript();
-  content += F("<div class='w'>");
-  content += F("<h3>");
-  content += S_SOFTWARE_UPDATE;
-  content += F("</h3>");
-  content += F("<br>");
-  content += F("<center>");
-  content += F("<iframe src='");
-  content += PATH_UPDATE;
-  content += F("' frameborder='0' height='200'></iframe>");
-  content += F("</center>");
-  content += F("</div>");
-  content += F("<a href='");
-  content += PATH_TOOLS;
-  content += F("'><button>");
-  content += S_RETURN;
-  content += F("</button></a><br><br>");
-
-  return content;
+void ESP8266HTTPUpdateServer::suplaWebPageUpddate() {
+  webContentBuffer += SuplaJavaScript();
+  webContentBuffer += F("<div class='w'>");
+  webContentBuffer += F("<h3>");
+  webContentBuffer += S_SOFTWARE_UPDATE;
+  webContentBuffer += F("</h3>");
+  webContentBuffer += F("<br>");
+  webContentBuffer += F("<center>");
+  webContentBuffer += F("<iframe src='");
+  webContentBuffer += PATH_UPDATE;
+  webContentBuffer += F("' frameborder='0' height='200'></iframe>");
+  webContentBuffer += F("</center>");
+  webContentBuffer += F("</div>");
+  webContentBuffer += F("<a href='");
+  webContentBuffer += PATH_TOOLS;
+  webContentBuffer += F("'><button>");
+  webContentBuffer += S_RETURN;
+  webContentBuffer += F("</button></a><br><br>");
 }
 
 void ESP8266HTTPUpdateServer::_setUpdaterError() {
diff --git a/src/SuplaHTTPUpdateServer.h b/src/SuplaHTTPUpdateServer.h
index 5d76d0ef..0466f93e 100644
--- a/src/SuplaHTTPUpdateServer.h
+++ b/src/SuplaHTTPUpdateServer.h
@@ -46,7 +46,7 @@ class ESP8266HTTPUpdateServer
     String _updaterError;
 
   void handleFirmwareUp();
-  String suplaWebPageUpddate();
+  void suplaWebPageUpddate();
 };
 
 #endif
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index 1a28163b..def78b14 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -25,7 +25,7 @@ void SuplaWebPageConfig::handleConfig() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_config(0));
+  supla_webpage_config(0);
 }
 
 void SuplaWebPageConfig::handleConfigSave() {
@@ -35,7 +35,7 @@ void SuplaWebPageConfig::handleConfigSave() {
   }
 
   if (!WebServer->saveGPIO(INPUT_CFG_LED_GPIO, FUNCTION_CFG_LED)) {
-    WebServer->sendContent(supla_webpage_config(6));
+    supla_webpage_config(6);
     return;
   }
 
@@ -44,7 +44,7 @@ void SuplaWebPageConfig::handleConfigSave() {
   ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
 
   if (!WebServer->saveGPIO(INPUT_CFG_BTN_GPIO, FUNCTION_CFG_BUTTON)) {
-    WebServer->sendContent(supla_webpage_config(6));
+    supla_webpage_config(6);
     return;
   }
 
@@ -55,38 +55,36 @@ void SuplaWebPageConfig::handleConfigSave() {
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       //      Serial.println(F("E_CONFIG_OK: Config save"));
-      WebServer->sendContent(supla_webpage_config(1));
+      supla_webpage_config(1);
       break;
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_config(2));
+      supla_webpage_config(2);
       break;
   }
 }
 
-String SuplaWebPageConfig::supla_webpage_config(int save) {
+void SuplaWebPageConfig::supla_webpage_config(int save) {
   uint8_t selected, suported;
-  String page = "";
 
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_CONFIG);
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_CONFIG);
 
-  addForm(page, F("post"), PATH_SAVE_CONFIG);
-  addFormHeader(page, S_GPIO_SETTINGS_FOR_CONFIG);
-  addListGPIOBox(page, INPUT_CFG_LED_GPIO, F("LED"), FUNCTION_CFG_LED);
+  addForm(webContentBuffer, F("post"), PATH_SAVE_CONFIG);
+  addFormHeader(webContentBuffer, S_GPIO_SETTINGS_FOR_CONFIG);
+  addListGPIOBox(webContentBuffer, INPUT_CFG_LED_GPIO, F("LED"), FUNCTION_CFG_LED);
 
   selected = ConfigESP->getLevel(FUNCTION_CFG_LED);
-  addListBox(page, INPUT_CFG_LED_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
-  addListGPIOBox(page, INPUT_CFG_BTN_GPIO, S_BUTTON, FUNCTION_CFG_BUTTON);
+  addListBox(webContentBuffer, INPUT_CFG_LED_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
+  addListGPIOBox(webContentBuffer, INPUT_CFG_BTN_GPIO, S_BUTTON, FUNCTION_CFG_BUTTON);
 
   selected = ConfigManager->get(KEY_CFG_MODE)->getValueInt();
-  addListBox(page, INPUT_CFG_MODE, S_CFG_MODE, CFG_MODE_P, 2, selected);
+  addListBox(webContentBuffer, INPUT_CFG_MODE, S_CFG_MODE, CFG_MODE_P, 2, selected);
 
-  addFormHeaderEnd(page);
-  addButtonSubmit(page, S_SAVE);
-  addFormEnd(page);
+  addFormHeaderEnd(webContentBuffer);
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
 
-  addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
-
-  return page;
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
+  WebServer->sendContent();
 }
diff --git a/src/SuplaWebPageConfig.h b/src/SuplaWebPageConfig.h
index 7733bb33..c2d55089 100644
--- a/src/SuplaWebPageConfig.h
+++ b/src/SuplaWebPageConfig.h
@@ -19,7 +19,7 @@ class SuplaWebPageConfig {
   void handleConfigSave();
 
  private:
-  String supla_webpage_config(int save);
+  void supla_webpage_config(int save);
 };
 
 extern SuplaWebPageConfig *WebPageConfig;
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 43cbfcb6..112347b0 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -89,7 +89,7 @@ void SuplaWebPageSensor::handleSearchDS() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_search(0));
+  supla_webpage_search(0);
 }
 
 void SuplaWebPageSensor::handleDSSave() {
@@ -115,18 +115,17 @@ void SuplaWebPageSensor::handleDSSave() {
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       // Serial.println(F("E_CONFIG_OK: Config save"));
-      WebServer->sendContent(supla_webpage_search(1));
+      supla_webpage_search(1);
       // WebServer->rebootESP();
       break;
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_search(2));
+      supla_webpage_search(2);
       break;
   }
 }
 
-String SuplaWebPageSensor::supla_webpage_search(int save) {
-  String content = "";
+void SuplaWebPageSensor::supla_webpage_search(int save) {
   uint8_t count = 0;
   uint8_t pin = ConfigESP->getGpio(FUNCTION_DS18B20);
 
@@ -136,26 +135,26 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
   char strAddr[64];
   uint8_t i;
 
-  content += SuplaSaveResult(save);
-  content += SuplaJavaScript(PATH_MULTI_DS);
-  content += F("<center>");
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_MULTI_DS);
+  webContentBuffer += F("<center>");
   if (ConfigESP->getGpio(FUNCTION_DS18B20) < OFF_GPIO) {
-    content += F("<form method='post' action='");
-    content += PATH_SAVE_MULTI_DS;
-    content += F("'>");
-    this->showDS18B20(content);
-    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>");
-  content += S_FOUND;
-  content += F(" DS18b20</h3>");
+    webContentBuffer += F("<form method='post' action='");
+    webContentBuffer += PATH_SAVE_MULTI_DS;
+    webContentBuffer += F("'>");
+    this->showDS18B20();
+    webContentBuffer += F("<button type='submit'>");
+    webContentBuffer += S_SAVE;
+    webContentBuffer += F("</button></form>");
+    webContentBuffer += F("<br>");
+  }
+  webContentBuffer += F("<form method='post' action='");
+  webContentBuffer += PATH_SAVE_MULTI_DS;
+  webContentBuffer += F("'>");
+  webContentBuffer += F("<div class='w'>");
+  webContentBuffer += F("<h3>");
+  webContentBuffer += S_FOUND;
+  webContentBuffer += F(" DS18b20</h3>");
   sensors.setOneWire(&ow);
   sensors.begin();
   if (sensors.isParasitePowerMode()) {
@@ -174,15 +173,15 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
               address[7]);
       supla_log(LOG_DEBUG, "Index %d - address %s", i, strAddr);
 
-      content += F("<i><input name='");
-      content += INPUT_DS18B20_ADDR;
-      content += count;
+      webContentBuffer += F("<i><input name='");
+      webContentBuffer += INPUT_DS18B20_ADDR;
+      webContentBuffer += count;
 
-      content += F("' value='");
-      content += String(strAddr);
-      content += F("' maxlength=");
-      content += MAX_DS18B20_ADDRESS_HEX;
-      content += F(" readonly><label></i>");
+      webContentBuffer += F("' value='");
+      webContentBuffer += String(strAddr);
+      webContentBuffer += F("' maxlength=");
+      webContentBuffer += MAX_DS18B20_ADDRESS_HEX;
+      webContentBuffer += F(" readonly><label></i>");
 
       count++;
     }
@@ -190,70 +189,69 @@ String SuplaWebPageSensor::supla_webpage_search(int save) {
   }
 
   if (count == 0) {
-    content += F("<i><label>");
-    content += S_NO_SENSORS_CONNECTED;
-    content += F("</label></i>");
-  }
-  content += F("</div>");
-  content += F("</center>");
-  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>");
-  content += S_RETURN;
-  content += F("</button></a><br><br>");
-
-  return content;
+    webContentBuffer += F("<i><label>");
+    webContentBuffer += S_NO_SENSORS_CONNECTED;
+    webContentBuffer += F("</label></i>");
+  }
+  webContentBuffer += F("</div>");
+  webContentBuffer += F("</center>");
+  webContentBuffer += F("<button type='submit'>");
+  webContentBuffer += S_SAVE_FOUND;
+  webContentBuffer += F("DS18b20</button></form>");
+  webContentBuffer += F("<br><br>");
+  webContentBuffer += F("<a href='");
+  webContentBuffer += PATH_START;
+  webContentBuffer += PATH_1WIRE;
+  webContentBuffer += F("'><button>");
+  webContentBuffer += S_RETURN;
+  webContentBuffer += F("</button></a><br><br>");
+  WebServer->sendContent();
 }
 
-void SuplaWebPageSensor::showDS18B20(String &content, bool readonly) {
+void SuplaWebPageSensor::showDS18B20(bool readonly) {
   if (ConfigESP->getGpio(FUNCTION_DS18B20) != OFF_GPIO) {
-    content += F("<div class='w'>");
-    content += F("<h3>");
-    content += S_TEMPERATURE;
-    content += F("</h3>");
+    webContentBuffer += F("<div class='w'>");
+    webContentBuffer += F("<h3>");
+    webContentBuffer += S_TEMPERATURE;
+    webContentBuffer += F("</h3>");
     for (uint8_t i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); i++) {
       double temp = Supla::GUI::sensorDS[i]->getValue();
-      content += F("<i style='border-bottom:none !important;'><input name='");
-      content += INPUT_DS18B20_NAME;
-      content += i;
-      content += F("' value='");
-      content += String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
-      content += F("' maxlength=");
-      content += MAX_DS18B20_NAME;
+      webContentBuffer += F("<i style='border-bottom:none !important;'><input name='");
+      webContentBuffer += INPUT_DS18B20_NAME;
+      webContentBuffer += i;
+      webContentBuffer += F("' value='");
+      webContentBuffer += String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
+      webContentBuffer += F("' maxlength=");
+      webContentBuffer += MAX_DS18B20_NAME;
       if (readonly) {
-        content += F(" readonly");
+        webContentBuffer += F(" readonly");
       }
-      content += F("><label>");
-      content += S_NAME;
-      content += i + 1;
-      content += F("</label></i>");
-      content += F("<i><input name='");
-      content += INPUT_DS18B20_ADDR;
-      content += i;
-      content += F("' value='");
-      content += String(ConfigManager->get(KEY_ADDR_DS18B20)->getElement(i));
-      content += F("' maxlength=");
-      content += MAX_DS18B20_ADDRESS_HEX;
+      webContentBuffer += F("><label>");
+      webContentBuffer += S_NAME;
+      webContentBuffer += i + 1;
+      webContentBuffer += F("</label></i>");
+      webContentBuffer += F("<i><input name='");
+      webContentBuffer += INPUT_DS18B20_ADDR;
+      webContentBuffer += i;
+      webContentBuffer += F("' value='");
+      webContentBuffer += String(ConfigManager->get(KEY_ADDR_DS18B20)->getElement(i));
+      webContentBuffer += F("' maxlength=");
+      webContentBuffer += MAX_DS18B20_ADDRESS_HEX;
       if (readonly) {
-        content += F(" readonly");
+        webContentBuffer += F(" readonly");
       }
-      content += F("><label>");
+      webContentBuffer += F("><label>");
       if (temp != -275) {
-        content += temp;
+        webContentBuffer += temp;
       }
       else {
-        content += F("--.--");
+        webContentBuffer += F("--.--");
       }
-      content += F(" <b>&deg;C</b> ");
-      content += F("</label></i>");
+      webContentBuffer += F(" <b>&deg;C</b> ");
+      webContentBuffer += F("</label></i>");
       delay(0);
     }
-    content += F("</div>");
+    webContentBuffer += F("</div>");
   }
 }
 #endif
@@ -264,7 +262,7 @@ void SuplaWebPageSensor::handle1Wire() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_1wire(0));
+  supla_webpage_1wire(0);
 }
 
 void SuplaWebPageSensor::handle1WireSave() {
@@ -279,7 +277,7 @@ void SuplaWebPageSensor::handle1WireSave() {
   last_value = ConfigManager->get(KEY_MAX_DHT11)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
     if (!WebServer->saveGPIO(INPUT_DHT11_GPIO, FUNCTION_DHT11, nr, INPUT_MAX_DHT11)) {
-      WebServer->sendContent(supla_webpage_1wire(6));
+      supla_webpage_1wire(6);
       return;
     }
   }
@@ -293,7 +291,7 @@ void SuplaWebPageSensor::handle1WireSave() {
   last_value = ConfigManager->get(KEY_MAX_DHT22)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
     if (!WebServer->saveGPIO(INPUT_DHT22_GPIO, FUNCTION_DHT22, nr, INPUT_MAX_DHT22)) {
-      WebServer->sendContent(supla_webpage_1wire(6));
+      supla_webpage_1wire(6);
       return;
     }
   }
@@ -305,7 +303,7 @@ void SuplaWebPageSensor::handle1WireSave() {
 
 #ifdef SUPLA_DS18B20
   if (!WebServer->saveGPIO(INPUT_MULTI_DS_GPIO, FUNCTION_DS18B20)) {
-    WebServer->sendContent(supla_webpage_1wire(6));
+    supla_webpage_1wire(6);
     return;
   }
   if (strcmp(WebServer->httpServer.arg(INPUT_MAX_DS18B20).c_str(), "") > 0) {
@@ -315,78 +313,78 @@ void SuplaWebPageSensor::handle1WireSave() {
 
 #ifdef SUPLA_SI7021_SONOFF
   if (!WebServer->saveGPIO(INPUT_SI7021_SONOFF, FUNCTION_SI7021_SONOFF)) {
-    WebServer->sendContent(supla_webpage_1wire(6));
+    supla_webpage_1wire(6);
     return;
   }
 #endif
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      WebServer->sendContent(supla_webpage_1wire(1));
+      supla_webpage_1wire(1);
       break;
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_1wire(2));
+      supla_webpage_1wire(2);
       break;
   }
 }
 
-String SuplaWebPageSensor::supla_webpage_1wire(int save) {
+void SuplaWebPageSensor::supla_webpage_1wire(int save) {
   uint8_t nr, max;
-  String page;
 
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_1WIRE);
-  page += F("<form method='post' action='");
-  page += PATH_SAVE_1WIRE;
-  page += F("'>");
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_1WIRE);
+  webContentBuffer += F("<form method='post' action='");
+  webContentBuffer += PATH_SAVE_1WIRE;
+  webContentBuffer += F("'>");
 #ifdef SUPLA_DHT11
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " DHT11");
-  addNumberBox(page, INPUT_MAX_DHT11, S_QUANTITY, KEY_MAX_DHT11, ConfigESP->countFreeGpio(FUNCTION_DHT11));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " DHT11");
+  addNumberBox(webContentBuffer, INPUT_MAX_DHT11, S_QUANTITY, KEY_MAX_DHT11, ConfigESP->countFreeGpio(FUNCTION_DHT11));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT11)->getValueInt(); nr++) {
-    addListGPIOBox(page, INPUT_DHT11_GPIO, "DHT11", FUNCTION_DHT11, nr);
+    addListGPIOBox(webContentBuffer, INPUT_DHT11_GPIO, "DHT11", FUNCTION_DHT11, nr);
   }
-  addFormHeaderEnd(page);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_DHT22
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " DHT22");
-  addNumberBox(page, INPUT_MAX_DHT22, S_QUANTITY, KEY_MAX_DHT22, ConfigESP->countFreeGpio(FUNCTION_DHT22));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " DHT22");
+  addNumberBox(webContentBuffer, INPUT_MAX_DHT22, S_QUANTITY, KEY_MAX_DHT22, ConfigESP->countFreeGpio(FUNCTION_DHT22));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
-    addListGPIOBox(page, INPUT_DHT22_GPIO, "DHT22", FUNCTION_DHT22, nr);
+    addListGPIOBox(webContentBuffer, INPUT_DHT22_GPIO, "DHT22", FUNCTION_DHT22, nr);
   }
-  addFormHeaderEnd(page);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_SI7021_SONOFF
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " Si7021 Sonoff");
-  addListGPIOBox(page, INPUT_SI7021_SONOFF, "Si7021 Sonoff", FUNCTION_SI7021_SONOFF);
-  addFormHeaderEnd(page);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " Si7021 Sonoff");
+  addListGPIOBox(webContentBuffer, INPUT_SI7021_SONOFF, "Si7021 Sonoff", FUNCTION_SI7021_SONOFF);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_DS18B20
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " Multi DS18B20");
-  addNumberBox(page, INPUT_MAX_DS18B20, S_QUANTITY, KEY_MULTI_MAX_DS18B20, MAX_DS18B20);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " Multi DS18B20");
+  addNumberBox(webContentBuffer, INPUT_MAX_DS18B20, S_QUANTITY, KEY_MULTI_MAX_DS18B20, MAX_DS18B20);
   if (ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt() > 1) {
-    addListGPIOLinkBox(page, INPUT_MULTI_DS_GPIO, "MULTI DS18B20", FUNCTION_DS18B20, PATH_MULTI_DS);
+    addListGPIOLinkBox(webContentBuffer, INPUT_MULTI_DS_GPIO, "MULTI DS18B20", FUNCTION_DS18B20, PATH_MULTI_DS);
   }
   else {
-    addListGPIOBox(page, INPUT_MULTI_DS_GPIO, "MULTI DS18B20", FUNCTION_DS18B20);
-  }
-  addFormHeaderEnd(page);
-#endif
-
-  page += F("<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>");
-  page += S_RETURN;
-  page += F("</button></a><br><br>");
-  return page;
+    addListGPIOBox(webContentBuffer, INPUT_MULTI_DS_GPIO, "MULTI DS18B20", FUNCTION_DS18B20);
+  }
+  addFormHeaderEnd(webContentBuffer);
+#endif
+
+  webContentBuffer += F("<button type='submit'>");
+  webContentBuffer += S_SAVE;
+  webContentBuffer += F("</button></form>");
+  webContentBuffer += F("<br>");
+  webContentBuffer += F("<a href='");
+  webContentBuffer += PATH_START;
+  webContentBuffer += PATH_DEVICE_SETTINGS;
+  webContentBuffer += F("'><button>");
+  webContentBuffer += S_RETURN;
+  webContentBuffer += F("</button></a><br><br>");
+
+  WebServer->sendContent();
 }
 #endif
 
@@ -396,7 +394,7 @@ void SuplaWebPageSensor::handlei2c() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_i2c(0));
+  supla_webpage_i2c(0);
 }
 
 void SuplaWebPageSensor::handlei2cSave() {
@@ -409,11 +407,11 @@ void SuplaWebPageSensor::handlei2cSave() {
   uint8_t key;
 
   if (!WebServer->saveGPIO(INPUT_SDA_GPIO, FUNCTION_SDA)) {
-    WebServer->sendContent(supla_webpage_i2c(6));
+    supla_webpage_i2c(6);
     return;
   }
   if (!WebServer->saveGPIO(INPUT_SCL_GPIO, FUNCTION_SCL)) {
-    WebServer->sendContent(supla_webpage_i2c(6));
+    supla_webpage_i2c(6);
     return;
   }
 
@@ -478,54 +476,54 @@ void SuplaWebPageSensor::handlei2cSave() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      WebServer->sendContent(supla_webpage_i2c(1));
+      supla_webpage_i2c(1);
       break;
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_i2c(2));
+      supla_webpage_i2c(2);
       break;
   }
 }
 
-String SuplaWebPageSensor::supla_webpage_i2c(int save) {
+void SuplaWebPageSensor::supla_webpage_i2c(int save) {
   uint8_t selected;
-  String page = "";
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_I2C);
 
-  addForm(page, F("post"), PATH_SAVE_I2C);
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + F(" i2c"));
-  addListGPIOBox(page, INPUT_SDA_GPIO, F("SDA"), FUNCTION_SDA);
-  addListGPIOBox(page, INPUT_SCL_GPIO, F("SCL"), FUNCTION_SCL);
-  addFormHeaderEnd(page);
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_I2C);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_I2C);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" i2c"));
+  addListGPIOBox(webContentBuffer, INPUT_SDA_GPIO, F("SDA"), FUNCTION_SDA);
+  addListGPIOBox(webContentBuffer, INPUT_SCL_GPIO, F("SCL"), FUNCTION_SCL);
+  addFormHeaderEnd(webContentBuffer);
 
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
 #ifdef SUPLA_BME280
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt();
-    addFormHeader(page);
-    addListBox(page, INPUT_BME280, F("BME280 adres"), BME280_P, 4, selected);
-    addNumberBox(page, INPUT_ALTITUDE_BME280, S_ALTITUDE_ABOVE_SEA_LEVEL, KEY_ALTITUDE_BME280, 1500);
-    addFormHeaderEnd(page);
+    addFormHeader(webContentBuffer);
+    addListBox(webContentBuffer, INPUT_BME280, F("BME280 adres"), BME280_P, 4, selected);
+    addNumberBox(webContentBuffer, INPUT_ALTITUDE_BME280, S_ALTITUDE_ABOVE_SEA_LEVEL, KEY_ALTITUDE_BME280, 1500);
+    addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_SHT3x
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SHT3x).toInt();
-    addFormHeader(page);
-    addListBox(page, INPUT_SHT3x, F("SHT3x"), SHT3x_P, 4, selected);
-    addFormHeaderEnd(page);
+    addFormHeader(webContentBuffer);
+    addListBox(webContentBuffer, INPUT_SHT3x, F("SHT3x"), SHT3x_P, 4, selected);
+    addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_SI7021
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SI7021).toInt();
-    addFormHeader(page);
-    addListBox(page, INPUT_SI7021, F("SI7021"), STATE_P, 2, selected);
-    addFormHeaderEnd(page);
+    addFormHeader(webContentBuffer);
+    addListBox(webContentBuffer, INPUT_SI7021, F("SI7021"), STATE_P, 2, selected);
+    addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_OLED
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
-    addFormHeader(page);
-    addListBox(page, INPUT_OLED, F("OLED"), OLED_P, 4, selected);
+    addFormHeader(webContentBuffer);
+    addListBox(webContentBuffer, INPUT_OLED, F("OLED"), OLED_P, 4, selected);
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
       String name, sensorName, input;
 
@@ -535,26 +533,25 @@ String SuplaWebPageSensor::supla_webpage_i2c(int save) {
         input += i;
         name = F("Ekran ");
         name += i + 1;
-        addTextBox(page, input, name, sensorName, 0, MAX_DS18B20_NAME, false);
+        addTextBox(webContentBuffer, input, name, sensorName, 0, MAX_DS18B20_NAME, false);
       }
     }
-    addFormHeaderEnd(page);
+    addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_MCP23017
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt();
-    addFormHeader(page);
-    addListBox(page, INPUT_MCP23017, F("MCP23017"), STATE_P, 2, selected);
-    addFormHeaderEnd(page);
+    addFormHeader(webContentBuffer);
+    addListBox(webContentBuffer, INPUT_MCP23017, F("MCP23017"), STATE_P, 2, selected);
+    addFormHeaderEnd(webContentBuffer);
 #endif
   }
 
-  addButtonSubmit(page, S_SAVE);
-  addFormEnd(page);
-
-  addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
 
-  return page;
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
+  WebServer->sendContent();
 }
 #endif
 
@@ -564,7 +561,7 @@ void SuplaWebPageSensor::handleSpi() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_spi(0));
+  supla_webpage_spi(0);
 }
 
 void SuplaWebPageSensor::handleSpiSave() {
@@ -578,15 +575,15 @@ void SuplaWebPageSensor::handleSpiSave() {
 
 #if defined(SUPLA_MAX6675)
   if (!WebServer->saveGPIO(INPUT_CLK_GPIO, FUNCTION_CLK)) {
-    WebServer->sendContent(supla_webpage_spi(6));
+    supla_webpage_spi(6);
     return;
   }
   if (!WebServer->saveGPIO(INPUT_CS_GPIO, FUNCTION_CS)) {
-    WebServer->sendContent(supla_webpage_spi(6));
+    supla_webpage_spi(6);
     return;
   }
   if (!WebServer->saveGPIO(INPUT_D0_GPIO, FUNCTION_D0)) {
-    WebServer->sendContent(supla_webpage_spi(6));
+    supla_webpage_spi(6);
     return;
   }
 #endif
@@ -601,47 +598,47 @@ void SuplaWebPageSensor::handleSpiSave() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      WebServer->sendContent(supla_webpage_spi(1));
+      supla_webpage_spi(1);
       break;
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_spi(2));
+      supla_webpage_spi(2);
       break;
   }
 }
 
-String SuplaWebPageSensor::supla_webpage_spi(int save) {
+void SuplaWebPageSensor::supla_webpage_spi(int save) {
   uint8_t nr, suported, selected;
-  String page;
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_SPI);
-  page += F("<form method='post' action='");
-  page += PATH_SAVE_SPI;
-  page += F("'>");
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_SPI);
+  webContentBuffer += F("<form method='post' action='");
+  webContentBuffer += PATH_SAVE_SPI;
+  webContentBuffer += F("'>");
 
 #if defined(SUPLA_MAX6675)
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " SPI");
-  addListGPIOBox(page, INPUT_CLK_GPIO, "CLK", FUNCTION_CLK);
-  addListGPIOBox(page, INPUT_CS_GPIO, "CS", FUNCTION_CS);
-  addListGPIOBox(page, INPUT_D0_GPIO, "D0", FUNCTION_D0);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " SPI");
+  addListGPIOBox(webContentBuffer, INPUT_CLK_GPIO, "CLK", FUNCTION_CLK);
+  addListGPIOBox(webContentBuffer, INPUT_CS_GPIO, "CS", FUNCTION_CS);
+  addListGPIOBox(webContentBuffer, INPUT_D0_GPIO, "D0", FUNCTION_D0);
 
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MAX6675).toInt();
-    addListBox(page, INPUT_MAX6675, "MAX6675", STATE_P, 2, selected);
-  }
-  addFormHeaderEnd(page);
-#endif
-  page += F("<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>");
-  page += S_RETURN;
-  page += F("</button></a><br><br>");
-  return page;
+    addListBox(webContentBuffer, INPUT_MAX6675, "MAX6675", STATE_P, 2, selected);
+  }
+  addFormHeaderEnd(webContentBuffer);
+#endif
+  webContentBuffer += F("<button type='submit'>");
+  webContentBuffer += S_SAVE;
+  webContentBuffer += F("</button></form>");
+  webContentBuffer += F("<br>");
+  webContentBuffer += F("<a href='");
+  webContentBuffer += PATH_START;
+  webContentBuffer += PATH_DEVICE_SETTINGS;
+  webContentBuffer += F("'><button>");
+  webContentBuffer += S_RETURN;
+  webContentBuffer += F("</button></a><br><br>");
+  WebServer->sendContent();
 }
 #endif
 
@@ -651,7 +648,7 @@ void SuplaWebPageSensor::handleOther() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_webpage_other(0));
+  supla_webpage_other(0);
 }
 
 void SuplaWebPageSensor::handleOtherSave() {
@@ -664,11 +661,11 @@ void SuplaWebPageSensor::handleOtherSave() {
 
 #ifdef SUPLA_HC_SR04
   if (!WebServer->saveGPIO(INPUT_TRIG_GPIO, FUNCTION_TRIG)) {
-    WebServer->sendContent(supla_webpage_other(6));
+    supla_webpage_other(6);
     return;
   }
   if (!WebServer->saveGPIO(INPUT_ECHO_GPIO, FUNCTION_ECHO)) {
-    WebServer->sendContent(supla_webpage_other(6));
+    supla_webpage_other(6);
     return;
   }
 #endif
@@ -679,7 +676,7 @@ void SuplaWebPageSensor::handleOtherSave() {
   last_value = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
     if (!WebServer->saveGPIO(INPUT_IMPULSE_COUNTER_GPIO, FUNCTION_IMPULSE_COUNTER, nr, INPUT_MAX_IMPULSE_COUNTER)) {
-      WebServer->sendContent(supla_webpage_other(6));
+      supla_webpage_other(6);
       return;
     }
   }
@@ -691,69 +688,68 @@ void SuplaWebPageSensor::handleOtherSave() {
 
 #ifdef SUPLA_HLW8012
   if (!WebServer->saveGPIO(INPUT_CF, FUNCTION_CF)) {
-    WebServer->sendContent(supla_webpage_other(6));
+    supla_webpage_other(6);
     return;
   }
   if (!WebServer->saveGPIO(INPUT_CF1, FUNCTION_CF1)) {
-    WebServer->sendContent(supla_webpage_other(6));
+    supla_webpage_other(6);
     return;
   }
   if (!WebServer->saveGPIO(INPUT_SEL, FUNCTION_SEL)) {
-    WebServer->sendContent(supla_webpage_other(6));
+    supla_webpage_other(6);
     return;
   }
 #endif
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      WebServer->sendContent(supla_webpage_other(1));
+      supla_webpage_other(1);
       break;
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_other(2));
+      supla_webpage_other(2);
       break;
   }
 }
 
-String SuplaWebPageSensor::supla_webpage_other(int save) {
+void SuplaWebPageSensor::supla_webpage_other(int save) {
   uint8_t nr, suported, selected;
-  String page = "";
 
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_OTHER);
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_OTHER);
 
-  addForm(page, F("post"), PATH_SAVE_OTHER);
+  addForm(webContentBuffer, F("post"), PATH_SAVE_OTHER);
 #ifdef SUPLA_HC_SR04
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
-  addListGPIOBox(page, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
-  addListGPIOBox(page, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
-  addFormHeaderEnd(page);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
+  addListGPIOBox(webContentBuffer, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
+  addListGPIOBox(webContentBuffer, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + " " + S_IMPULSE_COUNTER);
-  addNumberBox(page, INPUT_MAX_IMPULSE_COUNTER, S_QUANTITY, KEY_MAX_IMPULSE_COUNTER, ConfigESP->countFreeGpio(FUNCTION_IMPULSE_COUNTER));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " " + S_IMPULSE_COUNTER);
+  addNumberBox(webContentBuffer, INPUT_MAX_IMPULSE_COUNTER, S_QUANTITY, KEY_MAX_IMPULSE_COUNTER, ConfigESP->countFreeGpio(FUNCTION_IMPULSE_COUNTER));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
-    addListGPIOLinkBox(page, INPUT_IMPULSE_COUNTER_GPIO, F("IC GPIO"), FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
+    addListGPIOLinkBox(webContentBuffer, INPUT_IMPULSE_COUNTER_GPIO, F("IC GPIO"), FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
   }
-  addFormHeaderEnd(page);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_HLW8012
-  addFormHeader(page, String(S_GPIO_SETTINGS_FOR) + F(" HLW8012"));
-  addListGPIOBox(page, INPUT_CF, F("CF"), FUNCTION_CF);
-  addListGPIOBox(page, INPUT_CF1, F("CF1"), FUNCTION_CF1);
-  addListGPIOBox(page, INPUT_SEL, F("SELi"), FUNCTION_SEL);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HLW8012"));
+  addListGPIOBox(webContentBuffer, INPUT_CF, F("CF"), FUNCTION_CF);
+  addListGPIOBox(webContentBuffer, INPUT_CF1, F("CF1"), FUNCTION_CF1);
+  addListGPIOBox(webContentBuffer, INPUT_SEL, F("SELi"), FUNCTION_SEL);
   if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
-    addLinkBox(page, F("Kalibracja"), PATH_HLW8012_CALIBRATE);
+    addLinkBox(webContentBuffer, F("Kalibracja"), PATH_HLW8012_CALIBRATE);
   }
-  addFormHeaderEnd(page);
+  addFormHeaderEnd(webContentBuffer);
 #endif
 
-  addButtonSubmit(page, S_SAVE);
-  addFormEnd(page);
-  addButton(page, S_RETURN, PATH_DEVICE_SETTINGS);
-  return page;
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
+  WebServer->sendContent();
 }
 #endif
 
@@ -763,7 +759,7 @@ void SuplaWebPageSensor::handleImpulseCounterSet() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(supla_impulse_counter_set(0));
+  supla_impulse_counter_set(0);
 }
 
 void SuplaWebPageSensor::handleImpulseCounterSaveSet() {
@@ -797,17 +793,17 @@ void SuplaWebPageSensor::handleImpulseCounterSaveSet() {
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       //      Serial.println(F("E_CONFIG_OK: Dane zapisane"));
-      WebServer->sendContent(supla_webpage_other(1));
+      supla_webpage_other(1);
       break;
 
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      WebServer->sendContent(supla_webpage_other(2));
+      supla_webpage_other(2);
       break;
   }
 }
 
-String SuplaWebPageSensor::supla_impulse_counter_set(int save) {
+void SuplaWebPageSensor::supla_impulse_counter_set(int save) {
   String readUrl, nr;
   uint8_t place, selected, suported;
 
@@ -818,87 +814,86 @@ String SuplaWebPageSensor::supla_impulse_counter_set(int save) {
   place = readUrl.indexOf(path);
   nr = readUrl.substring(place + path.length(), place + path.length() + 3);
 
-  String page = "";
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_OTHER);
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_OTHER);
   uint8_t relays = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
   if (nr.toInt() <= relays && ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
-    page += F("<form method='post' action='");
-    page += PATH_SAVE_IMPULSE_COUNTER_SET;
-    page += nr;
-    page += F("'><div class='w'><h3>");
-    page += S_IMPULSE_COUNTER_SETTINGS_NR;
-    page += F(" ");
-    page += nr;
-    page += F("</h3>");
-    page += F("<i><label>");
-    page += S_IMPULSE_COUNTER_PULL_UP;
-    page += F("</label><select name='");
-    page += INPUT_IMPULSE_COUNTER_PULL_UP;
-    page += nr;
-    page += F("'>");
+    webContentBuffer += F("<form method='post' action='");
+    webContentBuffer += PATH_SAVE_IMPULSE_COUNTER_SET;
+    webContentBuffer += nr;
+    webContentBuffer += F("'><div class='w'><h3>");
+    webContentBuffer += S_IMPULSE_COUNTER_SETTINGS_NR;
+    webContentBuffer += F(" ");
+    webContentBuffer += nr;
+    webContentBuffer += F("</h3>");
+    webContentBuffer += F("<i><label>");
+    webContentBuffer += S_IMPULSE_COUNTER_PULL_UP;
+    webContentBuffer += F("</label><select name='");
+    webContentBuffer += INPUT_IMPULSE_COUNTER_PULL_UP;
+    webContentBuffer += nr;
+    webContentBuffer += F("'>");
     selected = ConfigESP->getMemory(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
     for (suported = 0; suported < 2; suported++) {
-      page += F("<option value='");
-      page += suported;
+      webContentBuffer += F("<option value='");
+      webContentBuffer += suported;
       if (selected == suported) {
-        page += F("' selected>");
+        webContentBuffer += F("' selected>");
       }
       else
-        page += F("'>");
-      page += StateString(suported);
+        webContentBuffer += F("'>");
+      webContentBuffer += PGMT(STATE_P[suported]);
     }
-    page += F("</select></i>");
-    page += F("<i><label>");
-    page += S_IMPULSE_COUNTER_RAISING_EDGE;
-    page += F("</label><select name='");
-    page += INPUT_IMPULSE_COUNTER_RAISING_EDGE;
-    page += nr;
-    page += F("'>");
+    webContentBuffer += F("</select></i>");
+    webContentBuffer += F("<i><label>");
+    webContentBuffer += S_IMPULSE_COUNTER_RAISING_EDGE;
+    webContentBuffer += F("</label><select name='");
+    webContentBuffer += INPUT_IMPULSE_COUNTER_RAISING_EDGE;
+    webContentBuffer += nr;
+    webContentBuffer += F("'>");
     selected = ConfigESP->getLevel(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
     for (suported = 0; suported < 2; suported++) {
-      page += F("<option value='");
-      page += suported;
+      webContentBuffer += F("<option value='");
+      webContentBuffer += suported;
       if (selected == suported) {
-        page += F("' selected>");
+        webContentBuffer += F("' selected>");
       }
       else
-        page += F("'>");
-      page += StateString(suported);
+        webContentBuffer += F("'>");
+      webContentBuffer += PGMT(STATE_P[suported]);
     }
-    page += F("</select></i>");
-    addNumberBox(page, INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, S_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, 99999999);
-    page += F("<i><label>");
-    page += S_IMPULSE_COUNTER_CHANGE_VALUE;
-    page += F("</label><input name='");
-    page += INPUT_IMPULSE_COUNTER_CHANGE_VALUE;
-    page += F("' type='number' placeholder='0' step='1' min='0' max='");
-    page += 100;
-    page += F("' value='");
+    webContentBuffer += F("</select></i>");
+    addNumberBox(webContentBuffer, INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, S_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT,
+                 99999999);
+    webContentBuffer += F("<i><label>");
+    webContentBuffer += S_IMPULSE_COUNTER_CHANGE_VALUE;
+    webContentBuffer += F("</label><input name='");
+    webContentBuffer += INPUT_IMPULSE_COUNTER_CHANGE_VALUE;
+    webContentBuffer += F("' type='number' placeholder='0' step='1' min='0' max='");
+    webContentBuffer += 100;
+    webContentBuffer += F("' value='");
     uint32_t count = Supla::GUI::impulseCounter[nr.toInt() - 1]->getCounter();
-    page += count;
-    page += F("'></i>");
+    webContentBuffer += count;
+    webContentBuffer += F("'></i>");
 
-    page += F("</div><button type='submit'>");
-    page += S_SAVE;
-    page += F("</button></form>");
+    webContentBuffer += F("</div><button type='submit'>");
+    webContentBuffer += S_SAVE;
+    webContentBuffer += F("</button></form>");
   }
   else {
-    page += F("<div class='w'><h3>");
-    page += S_NO_IMPULSE_COUNTER_NR;
-    page += F(" ");
-    page += nr;
-    page += F("</h3>");
-  }
-  page += F("<br>");
-  page += F("<a href='");
-  page += PATH_START;
-  page += PATH_OTHER;
-  page += F("'><button>");
-  page += S_RETURN;
-  page += F("</button></a><br><br>");
-
-  return page;
+    webContentBuffer += F("<div class='w'><h3>");
+    webContentBuffer += S_NO_IMPULSE_COUNTER_NR;
+    webContentBuffer += F(" ");
+    webContentBuffer += nr;
+    webContentBuffer += F("</h3>");
+  }
+  webContentBuffer += F("<br>");
+  webContentBuffer += F("<a href='");
+  webContentBuffer += PATH_START;
+  webContentBuffer += PATH_OTHER;
+  webContentBuffer += F("'><button>");
+  webContentBuffer += S_RETURN;
+  webContentBuffer += F("</button></a><br><br>");
+  WebServer->sendContent();
 }
 #endif
 
@@ -908,7 +903,7 @@ void SuplaWebPageSensor::handleHLW8012Calibrate() {
     if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
       return WebServer->httpServer.requestAuthentication();
   }
-  WebServer->sendContent(suplaWebpageHLW8012Calibrate(0));
+  suplaWebpageHLW8012Calibrate(0);
 }
 
 void SuplaWebPageSensor::handleHLW8012CalibrateSave() {
@@ -930,38 +925,37 @@ void SuplaWebPageSensor::handleHLW8012CalibrateSave() {
 
   if (calibPower && calibVoltage) {
     Supla::GUI::counterHLW8012->calibrate(calibPower, calibVoltage);
-    WebServer->sendContent(suplaWebpageHLW8012Calibrate(1));
+    suplaWebpageHLW8012Calibrate(1);
   }
   else {
-    WebServer->sendContent(suplaWebpageHLW8012Calibrate(6));
+    suplaWebpageHLW8012Calibrate(6);
   }
 }
 
-String SuplaWebPageSensor::suplaWebpageHLW8012Calibrate(uint8_t save) {
-  String page;
-  page += SuplaSaveResult(save);
-  page += SuplaJavaScript(PATH_HLW8012_CALIBRATE);
-
-  addFormHeader(page);
-  page += F("<p style='color:#000;'>Current Multi: ");
-  page += Supla::GUI::counterHLW8012->getCurrentMultiplier();
-  page += F("<br>Voltage Multi: ");
-  page += Supla::GUI::counterHLW8012->getVoltageMultiplier();
-  page += F("<br>Power Multi: ");
-  page += Supla::GUI::counterHLW8012->getPowerMultiplier();
-  page += F("</p>");
-  addFormHeaderEnd(page);
-
-  addForm(page, F("post"), PATH_SAVE_HLW8012_CALIBRATE);
-  addFormHeader(page, "Ustawienia kalibracji");
-  addNumberBox(page, INPUT_CALIB_POWER, "Moc żarówki [W]", "25", true);
-  addNumberBox(page, INPUT_CALIB_VOLTAGE, "Napięcie [V]", "230", true);
-  addFormHeaderEnd(page);
-
-  addButtonSubmit(page, "Kalibracja");
-  addFormEnd(page);
-
-  addButton(page, S_RETURN, PATH_OTHER);
-  return page;
+void SuplaWebPageSensor::suplaWebpageHLW8012Calibrate(uint8_t save) {
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_HLW8012_CALIBRATE);
+
+  addFormHeader(webContentBuffer);
+  webContentBuffer += F("<p style='color:#000;'>Current Multi: ");
+  webContentBuffer += Supla::GUI::counterHLW8012->getCurrentMultiplier();
+  webContentBuffer += F("<br>Voltage Multi: ");
+  webContentBuffer += Supla::GUI::counterHLW8012->getVoltageMultiplier();
+  webContentBuffer += F("<br>Power Multi: ");
+  webContentBuffer += Supla::GUI::counterHLW8012->getPowerMultiplier();
+  webContentBuffer += F("</p>");
+  addFormHeaderEnd(webContentBuffer);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_HLW8012_CALIBRATE);
+  addFormHeader(webContentBuffer, "Ustawienia kalibracji");
+  addNumberBox(webContentBuffer, INPUT_CALIB_POWER, "Moc żarówki [W]", "25", true);
+  addNumberBox(webContentBuffer, INPUT_CALIB_VOLTAGE, "Napięcie [V]", "230", true);
+  addFormHeaderEnd(webContentBuffer);
+
+  addButtonSubmit(webContentBuffer, "Kalibracja");
+  addFormEnd(webContentBuffer);
+
+  addButton(webContentBuffer, S_RETURN, PATH_OTHER);
+  WebServer->sendContent();
 }
 #endif
\ No newline at end of file
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 152ccab2..c0b98eb1 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -86,7 +86,7 @@ class SuplaWebPageSensor {
 
   void handleSearchDS();
   void handleDSSave();
-  void showDS18B20(String& content, bool readonly = false);
+  void showDS18B20(bool readonly = false);
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
@@ -94,7 +94,7 @@ class SuplaWebPageSensor {
   void handle1WireSave();
   void handlei2c();
   void handlei2cSave();
-  String supla_webpage_i2c(int save);
+  void supla_webpage_i2c(int save);
 #endif
 
 #if defined(SUPLA_MAX6675)
@@ -108,23 +108,23 @@ class SuplaWebPageSensor {
 
   void handleImpulseCounterSet();
   void handleImpulseCounterSaveSet();
-  String supla_impulse_counter_set(int save);
+  void supla_impulse_counter_set(int save);
 #endif
 
  private:
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
-  String supla_webpage_1wire(int save);
+  void supla_webpage_1wire(int save);
 #ifdef SUPLA_DS18B20
-  String supla_webpage_search(int save);
+  void supla_webpage_search(int save);
 #endif
 #endif
 
 #if defined(SUPLA_MAX6675)
-  String supla_webpage_spi(int save);
+  void supla_webpage_spi(int save);
 #endif
 
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
-  String supla_webpage_other(int save);
+  void supla_webpage_other(int save);
 #endif
 
 #if defined(SUPLA_HLW8012)
@@ -140,7 +140,7 @@ class SuplaWebPageSensor {
 
   void handleHLW8012Calibrate();
   void handleHLW8012CalibrateSave();
-  String suplaWebpageHLW8012Calibrate(uint8_t save);
+  void suplaWebpageHLW8012Calibrate(uint8_t save);
 #endif
 };
 
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index d8bb1ab2..4cd9173a 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -11,7 +11,7 @@ void createWebTools() {
     }
     WebServer->httpServer.sendHeader("Location", "/");
     WebServer->httpServer.send(303);
-    WebServer->sendContent(WebServer->supla_webpage_start(0));
+    WebServer->supla_webpage_start(0);
     ConfigESP->factoryReset(true);
   });
 }
@@ -22,20 +22,19 @@ void handleTools() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String content = "";
-  addFormHeader(content, "Tools");
+  addFormHeader(webContentBuffer, F("Tools"));
   //#ifdef SUPLA_BUTTON
-  addButton(content, "Save config", PATH_DOWNLOAD);
+  addButton(webContentBuffer, F("Save config"), PATH_DOWNLOAD);
   //#endif
   //#ifdef SUPLA_BUTTON
-  addButton(content, "Load config", PATH_UPLOAD);
+  addButton(webContentBuffer, F("Load config"), PATH_UPLOAD);
   //#endif
 #ifdef SUPLA_OTA
-  addButton(content, S_UPDATE, PATH_UPDATE_HENDLE);
+  addButton(webContentBuffer, S_UPDATE, PATH_UPDATE_HENDLE);
 #endif
-  addButton(content, "Factory reset", PATH_FACTORY_RESET);
-  addFormHeaderEnd(content);
-  addButton(content, S_RETURN, "");
+  addButton(webContentBuffer, F("Factory reset"), PATH_FACTORY_RESET);
+  addFormHeaderEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, "");
 
-  WebServer->sendContent(content);
+  WebServer->sendContent();
 }
\ No newline at end of file
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index c364e500..c05e6f74 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -24,23 +24,22 @@ void handleUpload(int save) {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String content = "";
-  content += SuplaSaveResult(save);
-  content += SuplaJavaScript();
-  content += F("<div class='w'>");
-  content += F("<h3>");
-  content += "Wgraj konfiguracje";
-  content += F("</h3>");
-  content += F("<br>");
-  content += FPSTR(uploadIndex);
-  content += F("</div>");
-  content += F("<a href='");
-  content += getURL(PATH_TOOLS);
-  content += F("'><button>");
-  content += S_RETURN;
-  content += F("</button></a><br><br>");
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript();
+  webContentBuffer += F("<div class='w'>");
+  webContentBuffer += F("<h3>");
+  webContentBuffer += F("Wgraj konfiguracje");
+  webContentBuffer += F("</h3>");
+  webContentBuffer += F("<br>");
+  webContentBuffer += FPSTR(uploadIndex);
+  webContentBuffer += F("</div>");
+  webContentBuffer += F("<a href='");
+  webContentBuffer += getURL(PATH_TOOLS);
+  webContentBuffer += F("'><button>");
+  webContentBuffer += S_RETURN;
+  webContentBuffer += F("</button></a><br><br>");
 
-  WebServer->sendContent(content);
+  WebServer->sendContent();
   // WebServer->httpServer.send(200, PSTR("text/html"), FPSTR(uploadIndex));
 }
 
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 38163f35..72c18bc9 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -24,6 +24,8 @@
 #include "SuplaTemplateBoard.h"
 #include "Markup.h"
 
+String webContentBuffer;
+
 SuplaWebServer::SuplaWebServer() {
 }
 
@@ -81,7 +83,7 @@ void SuplaWebServer::handle() {
     if (!httpServer.authenticate(this->www_username, this->www_password))
       return httpServer.requestAuthentication();
   }
-  this->sendContent(supla_webpage_start(0));
+  supla_webpage_start(0);
 }
 
 void SuplaWebServer::handleSave() {
@@ -114,17 +116,17 @@ void SuplaWebServer::handleSave() {
     case E_CONFIG_OK:
       //      Serial.println(F("E_CONFIG_OK: Dane zapisane"));
       if (ConfigESP->configModeESP == NORMAL_MODE) {
-        this->sendContent(supla_webpage_start(1));
+        supla_webpage_start(1);
         ConfigESP->rebootESP();
       }
       else {
-        this->sendContent(supla_webpage_start(7));
+        supla_webpage_start(7);
       }
       break;
 
     case E_CONFIG_FILE_OPEN:
       //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      this->sendContent(supla_webpage_start(4));
+      supla_webpage_start(4);
       break;
   }
 }
@@ -134,51 +136,50 @@ void SuplaWebServer::handleDeviceSettings() {
     if (!httpServer.authenticate(www_username, www_password))
       return httpServer.requestAuthentication();
   }
-  this->sendContent(deviceSettings(0));
+  deviceSettings(0);
 }
 
-String SuplaWebServer::supla_webpage_start(int save) {
-  String content = F("");
-  content += SuplaSaveResult(save);
-  content += SuplaJavaScript();
+void SuplaWebServer::supla_webpage_start(int save) {
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript();
 
-  addForm(content, F("post"));
-  addFormHeader(content, S_SETTING_WIFI_SSID);
-  addTextBox(content, INPUT_WIFI_SSID, S_WIFI_SSID, KEY_WIFI_SSID, 0, MAX_SSID, true);
-  addTextBoxPassword(content, INPUT_WIFI_PASS, S_WIFI_PASS, KEY_WIFI_PASS, MIN_PASSWORD, MAX_PASSWORD, true);
-  addTextBox(content, INPUT_HOSTNAME, S_HOST_NAME, KEY_HOST_NAME, 0, MAX_HOSTNAME, true);
-  addFormHeaderEnd(content);
+  addForm(webContentBuffer, F("post"));
+  addFormHeader(webContentBuffer, S_SETTING_WIFI_SSID);
+  addTextBox(webContentBuffer, INPUT_WIFI_SSID, S_WIFI_SSID, KEY_WIFI_SSID, 0, MAX_SSID, true);
+  addTextBoxPassword(webContentBuffer, INPUT_WIFI_PASS, S_WIFI_PASS, KEY_WIFI_PASS, MIN_PASSWORD, MAX_PASSWORD, true);
+  addTextBox(webContentBuffer, INPUT_HOSTNAME, S_HOST_NAME, KEY_HOST_NAME, 0, MAX_HOSTNAME, true);
+  addFormHeaderEnd(webContentBuffer);
 
-  addFormHeader(content, S_SETTING_SUPLA);
-  addTextBox(content, INPUT_SERVER, S_SUPLA_SERVER, KEY_SUPLA_SERVER, DEFAULT_SERVER, 0, MAX_SUPLA_SERVER, true);
-  addTextBox(content, INPUT_EMAIL, S_SUPLA_EMAIL, KEY_SUPLA_EMAIL, DEFAULT_EMAIL, 0, MAX_EMAIL, true);
-  addFormHeaderEnd(content);
+  addFormHeader(webContentBuffer, S_SETTING_SUPLA);
+  addTextBox(webContentBuffer, INPUT_SERVER, S_SUPLA_SERVER, KEY_SUPLA_SERVER, DEFAULT_SERVER, 0, MAX_SUPLA_SERVER, true);
+  addTextBox(webContentBuffer, INPUT_EMAIL, S_SUPLA_EMAIL, KEY_SUPLA_EMAIL, DEFAULT_EMAIL, 0, MAX_EMAIL, true);
+  addFormHeaderEnd(webContentBuffer);
 
-  addFormHeader(content, S_SETTING_ADMIN);
-  addTextBox(content, INPUT_MODUL_LOGIN, S_LOGIN, KEY_LOGIN, 0, MAX_MLOGIN, true);
-  addTextBoxPassword(content, INPUT_MODUL_PASS, S_LOGIN_PASS, KEY_LOGIN_PASS, MIN_PASSWORD, MAX_MPASSWORD, true);
-  addFormHeaderEnd(content);
+  addFormHeader(webContentBuffer, S_SETTING_ADMIN);
+  addTextBox(webContentBuffer, INPUT_MODUL_LOGIN, S_LOGIN, KEY_LOGIN, 0, MAX_MLOGIN, true);
+  addTextBoxPassword(webContentBuffer, INPUT_MODUL_PASS, S_LOGIN_PASS, KEY_LOGIN_PASS, MIN_PASSWORD, MAX_MPASSWORD, true);
+  addFormHeaderEnd(webContentBuffer);
 
 #ifdef SUPLA_ROLLERSHUTTER
   uint8_t maxrollershutter = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   if (maxrollershutter >= 2) {
-    addFormHeader(content, S_ROLLERSHUTTERS);
-    addNumberBox(content, INPUT_ROLLERSHUTTER, S_QUANTITY, KEY_MAX_ROLLERSHUTTER, (maxrollershutter / 2));
-    addFormHeaderEnd(content);
+    addFormHeader(webContentBuffer, S_ROLLERSHUTTERS);
+    addNumberBox(webContentBuffer, INPUT_ROLLERSHUTTER, S_QUANTITY, KEY_MAX_ROLLERSHUTTER, (maxrollershutter / 2));
+    addFormHeaderEnd(webContentBuffer);
   }
 #endif
 
 #ifdef SUPLA_DS18B20
-  WebPageSensor->showDS18B20(content, true);
+  WebPageSensor->showDS18B20(true);
 #endif
 
-  addButtonSubmit(content, S_SAVE);
-  addFormEnd(content);
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
 
-  addButton(content, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
-  addButton(content, F("Tools"), PATH_TOOLS);
+  addButton(webContentBuffer, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
+  addButton(webContentBuffer, F("Tools"), PATH_TOOLS);
 
-  return content;
+  WebServer->sendContent();
 }
 
 void SuplaWebServer::supla_webpage_reboot() {
@@ -186,65 +187,63 @@ void SuplaWebServer::supla_webpage_reboot() {
     if (!httpServer.authenticate(www_username, www_password))
       return httpServer.requestAuthentication();
   }
-  this->sendContent(supla_webpage_start(2));
+  supla_webpage_start(2);
   ConfigESP->rebootESP();
 }
 
-String SuplaWebServer::deviceSettings(int save) {
-  String content = "";
+void SuplaWebServer::deviceSettings(int save) {
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_DEVICE_SETTINGS);
 
-  content += SuplaSaveResult(save);
-  content += SuplaJavaScript(PATH_DEVICE_SETTINGS);
+  webContentBuffer += F("<form method='post' action='");
+  webContentBuffer += PATH_SAVE_BOARD;
+  webContentBuffer += F("'>");
 
-  content += F("<form method='post' action='");
-  content += PATH_SAVE_BOARD;
-  content += F("'>");
-
-  addFormHeader(content, S_TEMPLATE_BOARD);
+  addFormHeader(webContentBuffer, S_TEMPLATE_BOARD);
   uint8_t selected = ConfigManager->get(KEY_BOARD)->getValueInt();
-  addListBox(content, INPUT_BOARD, S_TYPE, BOARD_P, MAX_MODULE, selected);
-  addFormHeaderEnd(content);
+  addListBox(webContentBuffer, INPUT_BOARD, S_TYPE, BOARD_P, MAX_MODULE, selected);
+  addFormHeaderEnd(webContentBuffer);
 
-  content += F("<button type='submit'>");
-  content += S_SAVE;
-  content += F("</button></form><br><br>");
+  webContentBuffer += F("<button type='submit'>");
+  webContentBuffer += S_SAVE;
+  webContentBuffer += F("</button></form><br><br>");
 
-  addFormHeader(content, S_DEVICE_SETTINGS);
+  addFormHeader(webContentBuffer, S_DEVICE_SETTINGS);
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
-  addButton(content, S_RELAYS, PATH_RELAY);
+  addButton(webContentBuffer, S_RELAYS, PATH_RELAY);
 #endif
 
 #ifdef SUPLA_BUTTON
-  addButton(content, S_BUTTONS, PATH_CONTROL);
+  addButton(webContentBuffer, S_BUTTONS, PATH_CONTROL);
 #endif
 
 #ifdef SUPLA_LIMIT_SWITCH
-  addButton(content, F("KONTAKTRON"), PATH_SWITCH);
+  addButton(webContentBuffer, F("KONTAKTRON"), PATH_SWITCH);
 #endif
 
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
-  addButton(content, S_SENSORS_1WIRE, PATH_1WIRE);
+  addButton(webContentBuffer, S_SENSORS_1WIRE, PATH_1WIRE);
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
-  addButton(content, S_SENSORS_I2C, PATH_I2C);
+  addButton(webContentBuffer, S_SENSORS_I2C, PATH_I2C);
 #endif
 
 #if defined(SUPLA_MAX6675)
-  addButton(content, S_SENSORS_SPI, PATH_SPI);
+  addButton(webContentBuffer, S_SENSORS_SPI, PATH_SPI);
 #endif
 
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
-  addButton(content, S_SENSORS_OTHER, PATH_OTHER);
+  addButton(webContentBuffer, S_SENSORS_OTHER, PATH_OTHER);
 #endif
 
 #ifdef SUPLA_CONFIG
-  addButton(content, S_LED_BUTTON_CFG, PATH_CONFIG);
+  addButton(webContentBuffer, S_LED_BUTTON_CFG, PATH_CONFIG);
 #endif
-  addFormHeaderEnd(content);
-  addButton(content, S_RETURN, "");
+  addFormHeaderEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, "");
 
-  return content;
+  WebServer->sendContent();
 }
 
 void SuplaWebServer::handleBoardSave() {
@@ -269,88 +268,14 @@ void SuplaWebServer::handleBoardSave() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      WebServer->sendContent(deviceSettings(1));
+      deviceSettings(1);
       break;
     case E_CONFIG_FILE_OPEN:
-      WebServer->sendContent(deviceSettings(2));
+      deviceSettings(2);
       break;
   }
 }
 
-const String& SuplaWebServer::SuplaIconEdit() {
-  return F(
-      "<img "
-      "src='data:image/"
-      "png;base64,"
-      "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAB3RJTUUH5AYHChEfgNCVHgAAAAlwSFlzAAAuIwAALiMB"
-      "eKU/dgAAAARnQU1BAACxjwv8YQUAAABBSURBVHjaY1BiwA4xhWqU/"
-      "gMxAzZhEGRAF2ZQmoGpA6R6BlSaAV34P0QYIYEmDJPAEIZJQFxSg+"
-      "kPDGFsHiQkAQDjTS5MMLyE4wAAAABJRU5ErkJggg=='>");
-}
-
-void SuplaWebServer::sendContent(const String& content) {
-  // httpServer.send(200, "text/html", "");
-  // const int bufferSize = 1000;
-  // String _buffer;
-  //_buffer.reserve(bufferSize);
-  // int bufferCounter = 0;
-
-  int fileSize = content.length();
-
-#ifdef DEBUG_MODE
-  Serial.print(F("Content size: "));
-  Serial.println(fileSize);
-  checkRAM();
-#endif
-
-  httpServer.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
-  httpServer.sendHeader("Pragma", "no-cache");
-  httpServer.sendHeader("Expires", "-1");
-  httpServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
-  httpServer.chunkedResponseModeStart(200, "text/html");
-
-  httpServer.sendContent_P(HTTP_META);
-  httpServer.sendContent_P(HTTP_FAVICON);
-  httpServer.sendContent_P(HTTP_STYLE);
-  httpServer.sendContent_P(HTTP_LOGO);
-
-  String summary = FPSTR(HTTP_SUMMARY);
-
-  summary.replace("{h}", ConfigManager->get(KEY_HOST_NAME)->getValue());
-  summary.replace("{s}", ConfigESP->getLastStatusSupla());
-  summary.replace("{v}", Supla::Channel::reg_dev.SoftVer);
-  summary.replace("{g}", ConfigManager->get(KEY_SUPLA_GUID)->getValueHex(SUPLA_GUID_SIZE));
-  summary.replace("{m}", ConfigESP->getMacAddress(true));
-  summary.replace("{f}", String(ESP.getFreeHeap() / 1024.0));
-  httpServer.sendContent(summary);
-  httpServer.sendContent_P(HTTP_COPYRIGHT);
-
-  // httpServer.send(200, "text/html", "");
-  /*for (int i = 0; i < fileSize; i++) {
-    _buffer += content[i];
-    bufferCounter++;
-
-    if (bufferCounter >= bufferSize) {
-      httpServer.sendContent(_buffer);
-      yield();
-      bufferCounter = 0;
-      _buffer = "";
-    }
-  }
-  if (bufferCounter > 0) {
-    httpServer.sendContent(_buffer);
-    yield();
-    bufferCounter = 0;
-    _buffer = "";
-  }*/
-
-  httpServer.sendContent(content);
-  httpServer.sendContent_P(HTTP_RBT);
-  httpServer.chunkedResponseFinalize();
-}
-
-String webContentBuffer;
-
 void SuplaWebServer::sendContent() {
   // httpServer.send(200, "text/html", "");
   // const int bufferSize = 1000;
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 958b0e2e..9479bf2b 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -80,10 +80,9 @@ class SuplaWebServer : public Supla::Element {
   char www_username[MAX_MLOGIN];
   char www_password[MAX_MPASSWORD];
 
-  const String& SuplaIconEdit();
-  String supla_webpage_start(int save);
+  void supla_webpage_start(int save);
 
-  void sendContent(const String& content);
+  //void sendContent(const String& content);
   void sendContent();
 
   MyWebServer httpServer;
@@ -107,8 +106,7 @@ class SuplaWebServer : public Supla::Element {
   void createWebServer();
 
   void supla_webpage_reboot();
-  String deviceSettings(int save);
-  String loginSettings();
+  void deviceSettings(int save);
 
   void handleNotFound();
 };

From 78e68b963adaadddea923ac436cde120b23b07e1 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 17 Jan 2021 16:36:39 +0100
Subject: [PATCH 038/165] poprawki

---
 platformio.ini                |  2 +-
 src/GUIGenericCommon.cpp      | 18 +++++++++++++++++
 src/Markup.cpp                |  4 ++--
 src/SuplaCommonPROGMEM.h      |  2 +-
 src/SuplaConfigESP.cpp        | 36 +++++++++------------------------
 src/SuplaConfigESP.h          |  2 +-
 src/SuplaConfigManager.cpp    |  4 ++--
 src/SuplaHTTPUpdateServer.cpp |  7 ++++---
 src/SuplaWebPageSensor.cpp    | 38 +++++++++++++++++------------------
 src/SuplaWebServer.cpp        |  3 ++-
 10 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index bd7f22d3..d19e5603 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.10"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.11"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/GUIGenericCommon.cpp b/src/GUIGenericCommon.cpp
index 86e92967..5b8efdb9 100644
--- a/src/GUIGenericCommon.cpp
+++ b/src/GUIGenericCommon.cpp
@@ -35,4 +35,22 @@ int getNumberChannels() {
   }
 
   return maxFrame;
+}
+
+uint32_t lowestRAM = 0;
+uint32_t lowestFreeStack = 0;
+
+void checkRAM() {
+  uint32_t freeRAM = ESP.getFreeHeap();
+  Serial.print(F("freeRAM: "));
+  Serial.println(freeRAM);
+  if (freeRAM <= lowestRAM) {
+    lowestRAM = freeRAM;
+  }
+  uint32_t freeStack = ESP.getFreeContStack();
+  Serial.print(F("freeStack: "));
+  Serial.println(freeStack);
+  if (freeStack <= lowestFreeStack) {
+    lowestFreeStack = freeStack;
+  }
 }
\ No newline at end of file
diff --git a/src/Markup.cpp b/src/Markup.cpp
index d58d9739..a9c864c4 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -163,7 +163,7 @@ void addListGPIOBox(String& html, const String& input_id, const String& name, ui
 void addListMCP23017GPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr) {
   if (nr == 1) {
     uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
-    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 4, address);
+    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address);
   }
 
   html += F("<i><label>");
@@ -181,7 +181,7 @@ void addListMCP23017GPIOBox(String& html, const String& input_id, const String&
 void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr) {
   if (nr == 1) {
     uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
-    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 4, address);
+    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address);
   }
 
   html += F("<i>");
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 325f5c40..18cf7412 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -122,7 +122,7 @@ const char ADR20[] PROGMEM = "0x20";
 const char ADR21[] PROGMEM = "0x21";
 const char ADR22[] PROGMEM = "0x22";
 const char ADR23[] PROGMEM = "0x23";
-const char* const MCP23017_P[] PROGMEM = {ADR20, ADR21, ADR22, OFF};
+const char* const MCP23017_P[] PROGMEM = {ADR20, ADR21, OFF};
 
 const char* const STATE_P[] PROGMEM = {OFF, ON};
 
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 1ceba4e9..e6b07b98 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -487,6 +487,10 @@ bool SuplaConfigESP::checkBusyGpioMCP23017(uint8_t gpio, uint8_t function) {
     uint8_t key = KEY_GPIO + gpio;
     uint8_t address = ConfigESP->getAdressMCP23017(1, function);
 
+    if (address == OFF_MCP23017) {
+      return true;
+    }
+
     if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() != FUNCTION_OFF) {
       return false;
     }
@@ -632,7 +636,7 @@ uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
 }
 
 void SuplaConfigESP::factoryReset(bool forceReset) {
-  delay(1000);
+  delay(2000);
   pinMode(0, INPUT_PULLUP);
   if (digitalRead(0) != HIGH || forceReset) {
     Serial.println(F("FACTORY RESET!!!"));
@@ -661,43 +665,21 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
     ConfigManager->set(KEY_ALTITUDE_BME280, "0");
     ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, "0");
     ConfigManager->set(KEY_MAX_IMPULSE_COUNTER, "0");
-    ConfigManager->set(KEY_ACTIVE_SENSOR, "0,0,0,0,0");
+    ConfigManager->set(KEY_ACTIVE_SENSOR, "");
     ConfigManager->set(KEY_BOARD, "0");
     ConfigManager->set(KEY_CFG_MODE, "0");
 
     uint8_t nr, key;
     for (nr = 0; nr <= 17; nr++) {
       key = KEY_GPIO + nr;
-      ConfigManager->set(key, "0,0,0,0,0");
+      ConfigManager->set(key, "");
     }
 
-    /* for (nr = 0; nr <= MAX_DS18B20; nr++) {
-       key = KEY_DS + nr;
-       ConfigManager->set(key, "");
-       key = KEY_DS_NAME + nr;
-       ConfigManager->set(key, "");
-     }*/
+    ConfigManager->set(KEY_ADDR_DS18B20, "");
+    ConfigManager->set(KEY_NAME_SENSOR, "");
 
     ConfigManager->save();
 
     // rebootESP();
   }
 }
-
-uint32_t lowestRAM = 0;
-uint32_t lowestFreeStack = 0;
-
-void checkRAM() {
-  uint32_t freeRAM = ESP.getFreeHeap();
-  Serial.print(F("freeRAM: "));
-  Serial.println(freeRAM);
-  if (freeRAM <= lowestRAM) {
-    lowestRAM = freeRAM;
-  }
-  uint32_t freeStack = ESP.getFreeContStack();
-  Serial.print(F("freeStack: "));
-  Serial.println(freeStack);
-  if (freeStack <= lowestFreeStack) {
-    lowestFreeStack = freeStack;
-  }
-}
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 9a526026..a7d64978 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -37,7 +37,7 @@ enum _ConfigMode
   FACTORYRESET
 };
 
-#define OFF_MCP23017 3
+#define OFF_MCP23017 2
 
 typedef struct {
   int status;
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 77b3f46a..4f9fc3d3 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -168,10 +168,10 @@ SuplaConfigManager::SuplaConfigManager() {
 
   for (nr = 0; nr <= 17; nr++) {
     key = KEY_GPIO + nr;
-    this->addKey(key, "0,0,0,0,0,0", SETTINGSCOUNT * 2);
+    this->addKey(key, "", SETTINGSCOUNT * 2);
   }
 
-  this->addKey(KEY_ACTIVE_SENSOR, "0,0,0,0,0", 16);
+  this->addKey(KEY_ACTIVE_SENSOR, "", 16);
   this->addKey(KEY_BOARD, "0", 2);
   this->addKey(KEY_CFG_MODE, "0", 2);
   this->addKey(KEY_ADDR_DS18B20, MAX_DS18B20_ADDRESS_HEX * MAX_DS18B20);
diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 501242e5..63923abf 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -17,7 +17,7 @@ static const char serverIndex[] PROGMEM =
      <html lang='en'>
      <head>
          <meta charset='utf-8'>
-         <meta name='viewport' webContentBuffer='width=device-width,initial-scale=1'/>
+         <meta name='viewport' content='width=device-width,initial-scale=1'/>
      </head>
      <body>
      <div>Flash Size: {f}kB</div>
@@ -29,9 +29,9 @@ static const char serverIndex[] PROGMEM =
      </form>
      </body>
      </html>)";
-static const char successResponse[] PROGMEM = "<META http-equiv='refresh' webContentBuffer='15'>Update Success! Rebooting...";
+static const char successResponse[] PROGMEM = "<META http-equiv='refresh' content='10'>Update Success! Rebooting...";
 static const char twoStepResponse[] PROGMEM =
-    "<META http-equiv='refresh' webContentBuffer='15'><b>WARNING</b> only use 2-step OTA update. Use GUI-GenericUpdater.bin";
+    "<META http-equiv='refresh' content='5'><b>WARNING</b> only use 2-step OTA update. Use GUI-GenericUpdater.bin";
 
 ESP8266HTTPUpdateServer::ESP8266HTTPUpdateServer(bool serial_debug) {
   _serial_output = serial_debug;
@@ -165,6 +165,7 @@ void ESP8266HTTPUpdateServer::suplaWebPageUpddate() {
   webContentBuffer += F("'><button>");
   webContentBuffer += S_RETURN;
   webContentBuffer += F("</button></a><br><br>");
+  WebServer->sendContent();
 }
 
 void ESP8266HTTPUpdateServer::_setUpdaterError() {
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 112347b0..de97d5f4 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -338,37 +338,37 @@ void SuplaWebPageSensor::supla_webpage_1wire(int save) {
   webContentBuffer += PATH_SAVE_1WIRE;
   webContentBuffer += F("'>");
 #ifdef SUPLA_DHT11
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " DHT11");
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" DHT11"));
   addNumberBox(webContentBuffer, INPUT_MAX_DHT11, S_QUANTITY, KEY_MAX_DHT11, ConfigESP->countFreeGpio(FUNCTION_DHT11));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT11)->getValueInt(); nr++) {
-    addListGPIOBox(webContentBuffer, INPUT_DHT11_GPIO, "DHT11", FUNCTION_DHT11, nr);
+    addListGPIOBox(webContentBuffer, INPUT_DHT11_GPIO, F("DHT11"), FUNCTION_DHT11, nr);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_DHT22
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " DHT22");
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" DHT22"));
   addNumberBox(webContentBuffer, INPUT_MAX_DHT22, S_QUANTITY, KEY_MAX_DHT22, ConfigESP->countFreeGpio(FUNCTION_DHT22));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
-    addListGPIOBox(webContentBuffer, INPUT_DHT22_GPIO, "DHT22", FUNCTION_DHT22, nr);
+    addListGPIOBox(webContentBuffer, INPUT_DHT22_GPIO, F("DHT22"), FUNCTION_DHT22, nr);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_SI7021_SONOFF
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " Si7021 Sonoff");
-  addListGPIOBox(webContentBuffer, INPUT_SI7021_SONOFF, "Si7021 Sonoff", FUNCTION_SI7021_SONOFF);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" Si7021 Sonoff"));
+  addListGPIOBox(webContentBuffer, INPUT_SI7021_SONOFF, F("Si7021 Sonoff"), FUNCTION_SI7021_SONOFF);
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_DS18B20
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " Multi DS18B20");
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" Multi DS18B20"));
   addNumberBox(webContentBuffer, INPUT_MAX_DS18B20, S_QUANTITY, KEY_MULTI_MAX_DS18B20, MAX_DS18B20);
   if (ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt() > 1) {
-    addListGPIOLinkBox(webContentBuffer, INPUT_MULTI_DS_GPIO, "MULTI DS18B20", FUNCTION_DS18B20, PATH_MULTI_DS);
+    addListGPIOLinkBox(webContentBuffer, INPUT_MULTI_DS_GPIO, F("MULTI DS18B20"), FUNCTION_DS18B20, PATH_MULTI_DS);
   }
   else {
-    addListGPIOBox(webContentBuffer, INPUT_MULTI_DS_GPIO, "MULTI DS18B20", FUNCTION_DS18B20);
+    addListGPIOBox(webContentBuffer, INPUT_MULTI_DS_GPIO, F("MULTI DS18B20"), FUNCTION_DS18B20);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
@@ -617,14 +617,14 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
   webContentBuffer += F("'>");
 
 #if defined(SUPLA_MAX6675)
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " SPI");
-  addListGPIOBox(webContentBuffer, INPUT_CLK_GPIO, "CLK", FUNCTION_CLK);
-  addListGPIOBox(webContentBuffer, INPUT_CS_GPIO, "CS", FUNCTION_CS);
-  addListGPIOBox(webContentBuffer, INPUT_D0_GPIO, "D0", FUNCTION_D0);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" SPI"));
+  addListGPIOBox(webContentBuffer, INPUT_CLK_GPIO, F("CLK"), FUNCTION_CLK);
+  addListGPIOBox(webContentBuffer, INPUT_CS_GPIO, F("CS"), FUNCTION_CS);
+  addListGPIOBox(webContentBuffer, INPUT_D0_GPIO, F("D0"), FUNCTION_D0);
 
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MAX6675).toInt();
-    addListBox(webContentBuffer, INPUT_MAX6675, "MAX6675", STATE_P, 2, selected);
+    addListBox(webContentBuffer, INPUT_MAX6675, F("MAX6675"), STATE_P, 2, selected);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
@@ -671,7 +671,7 @@ void SuplaWebPageSensor::handleOtherSave() {
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
-  // Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+  Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
 
   last_value = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
@@ -947,12 +947,12 @@ void SuplaWebPageSensor::suplaWebpageHLW8012Calibrate(uint8_t save) {
   addFormHeaderEnd(webContentBuffer);
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_HLW8012_CALIBRATE);
-  addFormHeader(webContentBuffer, "Ustawienia kalibracji");
-  addNumberBox(webContentBuffer, INPUT_CALIB_POWER, "Moc żarówki [W]", "25", true);
-  addNumberBox(webContentBuffer, INPUT_CALIB_VOLTAGE, "Napięcie [V]", "230", true);
+  addFormHeader(webContentBuffer, F("Ustawienia kalibracji"));
+  addNumberBox(webContentBuffer, INPUT_CALIB_POWER, F("Moc żarówki [W]"), F("25"), true);
+  addNumberBox(webContentBuffer, INPUT_CALIB_VOLTAGE, F("Napięcie [V]"), F("230"), true);
   addFormHeaderEnd(webContentBuffer);
 
-  addButtonSubmit(webContentBuffer, "Kalibracja");
+  addButtonSubmit(webContentBuffer, F("Kalibracja"));
   addFormEnd(webContentBuffer);
 
   addButton(webContentBuffer, S_RETURN, PATH_OTHER);
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 72c18bc9..7ade7151 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -260,7 +260,7 @@ void SuplaWebServer::handleBoardSave() {
     uint8_t key;
     for (nr = 0; nr <= 17; nr++) {
       key = KEY_GPIO + nr;
-      ConfigManager->set(key, "0,0,0,0,0");
+      ConfigManager->set(key, "");
     }
 
     chooseTemplateBoard(WebServer->httpServer.arg(input).toInt());
@@ -405,6 +405,7 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
   gpio = ConfigESP->getGpioMCP23017(nr, function);
   if (addressInput == OFF_MCP23017) {
     ConfigESP->clearGpioMCP23017(gpio, nr, function);
+    return true;
   }
 
   if (gpioInput != OFF_GPIO) {

From b016ca07b54e9f242cfa971c9530aa088d25f48e Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 17 Jan 2021 19:16:34 +0100
Subject: [PATCH 039/165] =?UTF-8?q?generowanie=20poprawnej=20ilo=C5=9Bci?=
 =?UTF-8?q?=20stron=20dla=20licznika=20impuls=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini             | 2 +-
 src/SuplaWebPageSensor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index d19e5603..fe4608ab 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -41,7 +41,7 @@ build_flags =   -D BUILD_VERSION='"GUI 1.1.11"'
                 -D SUPLA_SI7021
                 -D SUPLA_MAX6675
                 -D SUPLA_HC_SR04
-                ;-D SUPLA_IMPULSE_COUNTER
+                -D SUPLA_IMPULSE_COUNTER
                 -D SUPLA_OLED
                 -D SUPLA_HLW8012
                 -D SUPLA_MCP23017             
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index de97d5f4..da7031e1 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -58,7 +58,7 @@ void SuplaWebPageSensor::createWebPageSensor() {
   WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleOtherSave, this));
 
 #if defined(SUPLA_IMPULSE_COUNTER)
-  for (uint8_t i = 1; i <= MAX_GPIO; i++) {
+  for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); i++) {
     path = PATH_START;
     path += PATH_IMPULSE_COUNTER_SET;
     path += i;

From b6a9f2127a1952f4abfd7ca37ded3c4cd1ef0955 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 17 Jan 2021 19:48:29 +0100
Subject: [PATCH 040/165] Update SuplaWebPageSensor.cpp

---
 src/SuplaWebPageSensor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index da7031e1..c6afb737 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -671,7 +671,7 @@ void SuplaWebPageSensor::handleOtherSave() {
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
-  Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+  //Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
 
   last_value = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {

From 388c043db070c170a53b7560abfe0ebdb317cb87 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 17 Jan 2021 19:48:33 +0100
Subject: [PATCH 041/165] Update SuplaWebPageControl.cpp

---
 src/SuplaWebPageControl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 18131c29..913d0482 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -16,7 +16,7 @@ void SuplaWebPageControl::createWebPageControl() {
   WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleControlSave, this));
 
 #ifdef SUPLA_BUTTON
-  for (uint8_t i = 1; i <= MAX_GPIO; i++) {
+  for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
     path = PATH_START;
     path += PATH_BUTTON_SET;
     path += i;

From cc7e4770591a7c8b162369d735a435c62402f572 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 17 Jan 2021 19:48:35 +0100
Subject: [PATCH 042/165] Update platformio.ini

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index fe4608ab..aa825226 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.11"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.12"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC

From dbf7e62d722641d61577210c2e460adde9572b48 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 20 Jan 2021 18:18:52 +0100
Subject: [PATCH 043/165] MCP23017 poprawki

---
 src/Markup.cpp              |  3 --
 src/SuplaWebPageControl.cpp | 91 ++++++++++++++++++++++++++++++++++---
 src/SuplaWebPageControl.h   |  5 ++
 src/SuplaWebPageRelay.cpp   | 88 +++++++++++++++++++++++++++++++++--
 src/SuplaWebPageRelay.h     |  4 ++
 5 files changed, 176 insertions(+), 15 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index a9c864c4..def7b111 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -190,9 +190,6 @@ void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const Stri
     html += F("<a href='");
     html += PATH_START;
     html += url;
-    if (nr > 0) {
-      html += nr;
-    }
     html += F("'>");
   }
   if (nr > 0) {
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 913d0482..f7fe8878 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -16,16 +16,27 @@ void SuplaWebPageControl::createWebPageControl() {
   WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleControlSave, this));
 
 #ifdef SUPLA_BUTTON
-  for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
     path = PATH_START;
     path += PATH_BUTTON_SET;
-    path += i;
-    WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleButtonSet, this));
+    WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageControl::handleButtonSetMCP23017, this));
 
     path = PATH_START;
     path += PATH_SAVE_BUTTON_SET;
-    path += i;
-    WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleButtonSaveSet, this));
+    WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageControl::handleButtonSaveSetMCP23017, this));
+  }
+  else {
+    for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
+      path = PATH_START;
+      path += PATH_BUTTON_SET;
+      path += i;
+      WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleButtonSet, this));
+
+      path = PATH_START;
+      path += PATH_SAVE_BUTTON_SET;
+      path += i;
+      WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleButtonSaveSet, this));
+    }
   }
 #endif
 
@@ -266,12 +277,12 @@ void SuplaWebPageControl::handleLimitSwitchSave() {
 }
 
 void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
-    uint8_t nr, countFreeGpio;
+  uint8_t nr, countFreeGpio;
 
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_SWITCH);
   addForm(webContentBuffer, F("post"), PATH_SAVE_SWITCH);
-  
+
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
@@ -300,3 +311,69 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
   WebServer->sendContent();
 }
 #endif
+
+void SuplaWebPageControl::handleButtonSetMCP23017() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  supla_webpage_button_set_MCP23017(0);
+}
+
+void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
+  uint8_t selected;
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_CONTROL);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET);
+  addFormHeader(webContentBuffer, F("Ustawienia dla przycisków"));
+
+  selected = ConfigESP->getLevel(1, FUNCTION_BUTTON);
+  addListBox(webContentBuffer, INPUT_BUTTON_LEVEL, S_REACTION_TO, TRIGGER_P, 3, selected);
+
+  selected = ConfigESP->getAction(1, FUNCTION_BUTTON);
+  addListBox(webContentBuffer, INPUT_BUTTON_ACTION, S_ACTION, ACTION_P, 3, selected);
+
+  addFormHeaderEnd(webContentBuffer);
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_CONTROL);
+
+  WebServer->sendContent();
+}
+
+void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  String input;
+  uint8_t key, gpio, level, action;
+
+  input.reserve(10);
+
+  input = INPUT_BUTTON_LEVEL;
+  level = WebServer->httpServer.arg(input).toInt();
+
+  input = INPUT_BUTTON_ACTION;
+  action = WebServer->httpServer.arg(input).toInt();
+
+  for (uint8_t i = 1; i <= OFF_GPIO; i++) {
+    gpio = ConfigESP->getGpioMCP23017(i, FUNCTION_BUTTON);
+    if (gpio != OFF_GPIO) {
+      key = KEY_GPIO + gpio;
+      ConfigManager->setElement(key, LEVEL, level);
+      ConfigManager->setElement(key, ACTION, action);
+    }
+  }
+  switch (ConfigManager->save()) {
+    case E_CONFIG_OK:
+      supla_webpage_control(1);
+      break;
+    case E_CONFIG_FILE_OPEN:
+      supla_webpage_control(2);
+      break;
+  }
+}
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index c2443a5e..400989a3 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -48,6 +48,11 @@ class SuplaWebPageControl {
 #ifdef SUPLA_BUTTON
   void supla_webpage_button_set(int save);
 #endif
+
+void handleButtonSetMCP23017();
+void handleButtonSaveSetMCP23017();
+void supla_webpage_button_set_MCP23017(int save);
+
 };
 
 extern SuplaWebPageControl* WebPageControl;
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 9d3115d7..f1d8760c 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -23,16 +23,27 @@ void SuplaWebPageRelay::createWebPageRelay() {
   path += PATH_SAVE_RELAY;
   WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySave, this));
 
-  for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
     path = PATH_START;
     path += PATH_RELAY_SET;
-    path += i;
-    WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySet, this));
+    WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySetMCP23017, this));
 
     path = PATH_START;
     path += PATH_SAVE_RELAY_SET;
-    path += i;
-    WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSet, this));
+    WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSetMCP23017, this));
+  }
+  else {
+    for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
+      path = PATH_START;
+      path += PATH_RELAY_SET;
+      path += i;
+      WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySet, this));
+
+      path = PATH_START;
+      path += PATH_SAVE_RELAY_SET;
+      path += i;
+      WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSet, this));
+    }
   }
 }
 
@@ -206,4 +217,71 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save) {
 
   WebServer->sendContent();
 }
+
+void SuplaWebPageRelay::handleRelaySetMCP23017() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  supla_webpage_relay_set_MCP23017(0);
+}
+
+void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
+  uint8_t selected;
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_RELAY);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_RELAY_SET);
+  addFormHeader(webContentBuffer, F("Ustawienia dla przekaźników"));
+
+  selected = ConfigESP->getLevel(1, FUNCTION_RELAY);
+  addListBox(webContentBuffer, INPUT_RELAY_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
+
+  selected = ConfigESP->getMemory(1, FUNCTION_RELAY);
+  addListBox(webContentBuffer, INPUT_RELAY_MEMORY, S_REACTION_AFTER_RESET, MEMORY_P, 3, selected);
+
+  addFormHeaderEnd(webContentBuffer);
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_RELAY);
+
+  WebServer->sendContent();
+}
+
+void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  String input;
+  uint8_t key, gpio, memory, level;
+
+  input.reserve(9);
+
+  input = INPUT_RELAY_MEMORY;
+  memory = WebServer->httpServer.arg(input).toInt();
+
+  input = INPUT_RELAY_LEVEL;
+  level = WebServer->httpServer.arg(input).toInt();
+
+  for (uint8_t i = 1; i <= OFF_GPIO; i++) {
+    gpio = ConfigESP->getGpioMCP23017(i, FUNCTION_RELAY);
+    if (gpio != OFF_GPIO) {
+      key = KEY_GPIO + gpio;
+      ConfigManager->setElement(key, MEMORY, memory);
+      ConfigManager->setElement(key, LEVEL, level);
+    }
+  }
+
+  switch (ConfigManager->save()) {
+    case E_CONFIG_OK:
+      supla_webpage_relay(1);
+      break;
+    case E_CONFIG_FILE_OPEN:
+      supla_webpage_relay(2);
+      break;
+  }
+}
 #endif
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index 50b65fc1..19a12401 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -33,10 +33,14 @@ class SuplaWebPageRelay {
   void handleRelaySave();
   void handleRelaySet();
   void handleRelaySaveSet();
+  void handleRelaySaveSetMCP23017();
+  void handleRelaySetMCP23017();
+
 
  private:
   void supla_webpage_relay_set(int save);
   void supla_webpage_relay(int save);
+  void supla_webpage_relay_set_MCP23017(int save);
 };
 
 extern SuplaWebPageRelay* WebPageRelay;

From 20bcdb5807ecee06fb79cf253b90ceda9c1b0da7 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 21 Jan 2021 06:41:17 +0100
Subject: [PATCH 044/165] aktualizacja SuplaDevice

---
 lib/SuplaDevice/.drone.yml                    |  17 +
 lib/SuplaDevice/.gitignore                    |   1 +
 lib/SuplaDevice/.travis.yml                   |  18 +
 lib/SuplaDevice/LICENSE                       | 339 +++++++++++++++++
 lib/SuplaDevice/_clang-format                 |  91 +++++
 lib/SuplaDevice/_config.yml                   |   1 +
 .../HC_SR04_Distance_sensor_extended.ino      |  85 +++++
 .../ImpulseCounter/ImpulseCounter.ino         |  17 +-
 .../examples/RollerShutter/RollerShutter.ino  |   7 +
 lib/SuplaDevice/extras/test/CMakeLists.txt    |   6 +
 .../channel_element_tests.cpp                 |  54 +++
 .../test/ChannelTests/channel_tests.cpp       | 224 ++++++++++-
 .../test/ElementTests/element_tests.cpp       | 180 +++++++++
 .../internal_pin_output_tests.cpp             | 353 ++++++++++++++++++
 .../extras/test/IoTests/io_tests.cpp          | 126 ++++++-
 .../LocalActionTests/local_action_tests.cpp   | 177 +++++++++
 .../pin_status_led_tests.cpp                  | 103 +++++
 .../test/SensorTests/thermometer_tests.cpp    |  24 ++
 lib/SuplaDevice/extras/test/doubles/Arduino.h |   6 +
 .../extras/test/doubles/arduino_mock.cpp      |  41 +-
 .../extras/test/doubles/arduino_mock.h        |  57 +++
 .../extras/test/doubles/srpc_mock.cpp         |  42 +++
 .../extras/test/doubles/srpc_mock.h           |  39 ++
 lib/SuplaDevice/library.properties            |  11 +-
 lib/SuplaDevice/readme.md                     | 248 ++++++++++++
 lib/SuplaDevice/src/CMakeLists.txt            |   5 +
 lib/SuplaDevice/src/supla/action_handler.h    |  28 ++
 lib/SuplaDevice/src/supla/actions.h           |   4 +-
 lib/SuplaDevice/src/supla/channel.cpp         |  13 +
 lib/SuplaDevice/src/supla/channel.h           |   5 +-
 lib/SuplaDevice/src/supla/channel_element.cpp |  31 ++
 lib/SuplaDevice/src/supla/channel_element.h   |  43 +++
 .../src/supla/control/internal_pin_output.cpp | 124 ++++++
 .../src/supla/control/internal_pin_output.h   |  67 ++++
 .../src/supla/control/pin_status_led.cpp      |  48 +++
 .../src/supla/control/pin_status_led.h        |  43 +++
 lib/SuplaDevice/src/supla/control/relay.cpp   |  10 +-
 lib/SuplaDevice/src/supla/control/relay.h     |  14 +-
 .../src/supla/control/rgbw_base.cpp           |   6 +-
 lib/SuplaDevice/src/supla/control/rgbw_base.h |  12 +-
 .../src/supla/control/roller_shutter.cpp      |   6 +-
 .../src/supla/control/roller_shutter.h        |  13 +-
 .../src/supla/control/virtual_relay.cpp       |  57 +++
 .../src/supla/control/virtual_relay.h         |  43 +--
 lib/SuplaDevice/src/supla/crc16.h             |  14 +
 lib/SuplaDevice/src/supla/element.cpp         |  14 +
 lib/SuplaDevice/src/supla/element.h           |   1 +
 lib/SuplaDevice/src/supla/events.h            |   4 +-
 lib/SuplaDevice/src/supla/io.cpp              |   4 +
 lib/SuplaDevice/src/supla/io.h                |   1 +
 lib/SuplaDevice/src/supla/local_action.cpp    |  81 +++-
 lib/SuplaDevice/src/supla/local_action.h      |  21 +-
 lib/SuplaDevice/src/supla/sensor/HC_SR04.h    |  37 +-
 lib/SuplaDevice/src/supla/sensor/binary.cpp   |   4 -
 lib/SuplaDevice/src/supla/sensor/binary.h     |   8 +-
 lib/SuplaDevice/src/supla/sensor/distance.h   |  10 +-
 .../sensor/general_purpose_measurement_base.h |  10 +-
 .../src/supla/sensor/impulse_counter.cpp      |   7 +-
 .../src/supla/sensor/impulse_counter.h        |  14 +-
 lib/SuplaDevice/src/supla/sensor/pressure.h   |  10 +-
 lib/SuplaDevice/src/supla/sensor/rain.h       |  10 +-
 .../src/supla/sensor/thermometer.cpp          |   5 +-
 .../src/supla/sensor/thermometer.h            |   8 +-
 .../src/supla/sensor/virtual_binary.cpp       |   6 +-
 .../src/supla/sensor/virtual_binary.h         |  11 +-
 lib/SuplaDevice/src/supla/sensor/weight.h     |   9 +-
 lib/SuplaDevice/src/supla/sensor/wind.h       |  10 +-
 src/SuplaConfigESP.cpp                        |   2 +-
 src/SuplaConfigESP.h                          |   5 +-
 src/SuplaOled.cpp                             |   2 +-
 src/SuplaOled.h                               |   4 +-
 71 files changed, 2899 insertions(+), 252 deletions(-)
 create mode 100644 lib/SuplaDevice/.drone.yml
 create mode 100644 lib/SuplaDevice/.gitignore
 create mode 100644 lib/SuplaDevice/.travis.yml
 create mode 100644 lib/SuplaDevice/LICENSE
 create mode 100644 lib/SuplaDevice/_clang-format
 create mode 100644 lib/SuplaDevice/_config.yml
 create mode 100644 lib/SuplaDevice/examples/HC_SR04_Distance_sensor_extended/HC_SR04_Distance_sensor_extended.ino
 create mode 100644 lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ElementTests/element_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/InternalPinOutputTests/internal_pin_output_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/LocalActionTests/local_action_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/PinStatusLedTests/pin_status_led_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/SensorTests/thermometer_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/doubles/arduino_mock.h
 create mode 100644 lib/SuplaDevice/extras/test/doubles/srpc_mock.cpp
 create mode 100644 lib/SuplaDevice/extras/test/doubles/srpc_mock.h
 create mode 100644 lib/SuplaDevice/readme.md
 create mode 100644 lib/SuplaDevice/src/supla/action_handler.h
 create mode 100644 lib/SuplaDevice/src/supla/channel_element.cpp
 create mode 100644 lib/SuplaDevice/src/supla/channel_element.h
 create mode 100644 lib/SuplaDevice/src/supla/control/internal_pin_output.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/internal_pin_output.h
 create mode 100644 lib/SuplaDevice/src/supla/control/pin_status_led.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/pin_status_led.h
 create mode 100644 lib/SuplaDevice/src/supla/control/virtual_relay.cpp
 create mode 100644 lib/SuplaDevice/src/supla/crc16.h

diff --git a/lib/SuplaDevice/.drone.yml b/lib/SuplaDevice/.drone.yml
new file mode 100644
index 00000000..688641c7
--- /dev/null
+++ b/lib/SuplaDevice/.drone.yml
@@ -0,0 +1,17 @@
+kind: pipeline
+name: default
+
+steps:
+- name: compilation
+  image: rikorose/gcc-cmake
+  commands:
+  - mkdir extras/test/build
+  - cd extras/test/build
+  - cmake ..
+  - make
+
+- name: test
+  image: rikorose/gcc-cmake
+  commands:
+  - cd extras/test/build
+  - ./supladevicetests
diff --git a/lib/SuplaDevice/.gitignore b/lib/SuplaDevice/.gitignore
new file mode 100644
index 00000000..dcd241ea
--- /dev/null
+++ b/lib/SuplaDevice/.gitignore
@@ -0,0 +1 @@
+extras/test/build/
diff --git a/lib/SuplaDevice/.travis.yml b/lib/SuplaDevice/.travis.yml
new file mode 100644
index 00000000..bd33cea0
--- /dev/null
+++ b/lib/SuplaDevice/.travis.yml
@@ -0,0 +1,18 @@
+os: linux
+dist: xenial
+sudo: false
+language: cpp
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-6 
+
+script:
+  - mkdir extras/test/build
+  - cd extras/test/build
+  - CXX=/usr/bin/g++-6 CC=/usr/bin/gcc-6 cmake ..
+  - make
+  - ./supladevicetests
diff --git a/lib/SuplaDevice/LICENSE b/lib/SuplaDevice/LICENSE
new file mode 100644
index 00000000..23cb7903
--- /dev/null
+++ b/lib/SuplaDevice/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/lib/SuplaDevice/_clang-format b/lib/SuplaDevice/_clang-format
new file mode 100644
index 00000000..5915a3e9
--- /dev/null
+++ b/lib/SuplaDevice/_clang-format
@@ -0,0 +1,91 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: true
+AlignEscapedNewlinesLeft: true
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories: 
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IndentCaseLabels: true
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+TabWidth:        8
+UseTab:          Never
+...
+
diff --git a/lib/SuplaDevice/_config.yml b/lib/SuplaDevice/_config.yml
new file mode 100644
index 00000000..c4192631
--- /dev/null
+++ b/lib/SuplaDevice/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
\ No newline at end of file
diff --git a/lib/SuplaDevice/examples/HC_SR04_Distance_sensor_extended/HC_SR04_Distance_sensor_extended.ino b/lib/SuplaDevice/examples/HC_SR04_Distance_sensor_extended/HC_SR04_Distance_sensor_extended.ino
new file mode 100644
index 00000000..eb0d8503
--- /dev/null
+++ b/lib/SuplaDevice/examples/HC_SR04_Distance_sensor_extended/HC_SR04_Distance_sensor_extended.ino
@@ -0,0 +1,85 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <SuplaDevice.h>
+
+// Add include to HC_SR04 sensor
+#include <supla/sensor/HC_SR04.h>
+
+// Choose proper network interface for your card:
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
+
+int8_t trigPin = 13;
+int8_t echoPin = 12;
+int16_t minSensorRead =  5; //minimum sensor reading distance in centimeters
+int16_t maxSensorRead = 55; //maximum sensor reading distance in centimeters
+int16_t minAppReading = 50; //minimum distance shown by the App in centimeters when sensor read <= min_sensor_read
+int16_t maxAppReading =  0; //maximum distance shown by the App in centimeters when sensor read >= max_sensor_read
+
+void setup() {
+
+  Serial.begin(115200);
+
+  // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
+  char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+  // Replace the following AUTHKEY with value that you can retrieve from: https://www.supla.org/arduino/get-authkey
+  char AUTHKEY[SUPLA_AUTHKEY_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+  /*
+   * Having your device already registered at cloud.supla.org,
+   * you want to change CHANNEL sequence or remove any of them,
+   * then you must also remove the device itself from cloud.supla.org.
+   * Otherwise you will get "Channel conflict!" error.
+   */
+
+  new Supla::Sensor::HC_SR04(trigPin,echoPin, minSensorRead, maxSensorRead, minAppReading, maxAppReading); 
+ 
+  // Supla::Sensor::HC_SR04(trigPin, echoPin) // sends sensor reading to cloud unchanged
+
+
+  /*
+   * SuplaDevice Initialization.
+   * Server address is available at https://cloud.supla.org 
+   * If you do not have an account, you can create it at https://cloud.supla.org/account/create
+   * SUPLA and SUPLA CLOUD are free of charge
+   * 
+   */
+
+  SuplaDevice.begin(GUID,              // Global Unique Identifier 
+                    "svrX.supla.org",  // SUPLA server address
+                    "email@address",   // Email address used to login to Supla Cloud
+                    AUTHKEY);          // Authorization key
+    
+}
+
+void loop() {
+  SuplaDevice.iterate(); 
+}
diff --git a/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino b/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino
index fe626866..e2949220 100644
--- a/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino
+++ b/lib/SuplaDevice/examples/ImpulseCounter/ImpulseCounter.ino
@@ -16,6 +16,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <SuplaDevice.h>
 #include <supla/sensor/impulse_counter.h>
+// Remove below line if you don't want to have internal LED blinking on each impulse
+#include <supla/control/internal_pin_output.h>
+#include <supla/events.h>
 
 // Choose where Supla should store counter data in persistant memory
 // We recommend to use external FRAM memory 
@@ -60,11 +63,21 @@ void setup() {
    */
     
   // CHANNEL0 - Impulse Counter on pin 34, counting raising edge (from LOW to HIGH), no pullup on pin, and 10 ms debounce timeout
-  new Supla::Sensor::ImpulseCounter(34, true, false, 10);
+  auto ic1 = new Supla::Sensor::ImpulseCounter(34, true, false, 10);
   
   // CHANNEL1 - Impulse Counter on pin 35, counting falling edge (from HIGH to LOW), with pullup on pin, and 50 ms debounce timeout
-  new Supla::Sensor::ImpulseCounter(35, false, true, 50);
+  auto ic2 = new Supla::Sensor::ImpulseCounter(35, false, true, 50);
   
+  // Configuring internal LED to notify each change of impulse counter
+  auto led1 = new Supla::Control::InternalPinOutput(24); // LED on pin 24
+  auto led2 = new Supla::Control::InternalPinOutput(25); // LED on pin 25
+  
+  // LED1 will blink (100 ms) on each change of ic1
+  led1->setDurationMs(100);
+  ic1->addAction(Supla::TURN_ON, led1, Supla::ON_CHANGE);
+
+  // LED2 will toggle it's state on each change of ic2
+  ic2->addAction(Supla::TOGGLE, led2, Supla::ON_CHANGE);
 
   /*
    * Server address is available at https://cloud.supla.org 
diff --git a/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino b/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino
index 7cb0231d..777b47bd 100644
--- a/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino
+++ b/lib/SuplaDevice/examples/RollerShutter/RollerShutter.ino
@@ -17,6 +17,7 @@
 #include <SuplaDevice.h>
 #include <supla/control/roller_shutter.h>
 #include <supla/control/button.h>
+#include <supla/control/pin_status_led.h>
 
 // Choose where Supla should store roller shutter data in persistant memory
 // We recommend to use external FRAM memory 
@@ -64,6 +65,12 @@ void setup() {
   Supla::Control::Button *buttonOpen = new Supla::Control::Button(28, true, true);
   Supla::Control::Button *buttonClose = new Supla::Control::Button(29, true, true);
 
+  // Add two LEDs to inform about roller shutter relay status
+  // If inverted value is required, please add third parameter with true value
+  new Supla::Control::PinStatusLed(30, 24); // pin 30 status to be informed on pin 24
+  new Supla::Control::PinStatusLed(31, 25); // pin 31 status to be informed on pin 25
+  
+
   buttonOpen->addAction(Supla::OPEN_OR_STOP, *rs, Supla::ON_PRESS);
   buttonClose->addAction(Supla::CLOSE_OR_STOP, *rs, Supla::ON_PRESS);
  
diff --git a/lib/SuplaDevice/extras/test/CMakeLists.txt b/lib/SuplaDevice/extras/test/CMakeLists.txt
index a96d1608..381d42d8 100644
--- a/lib/SuplaDevice/extras/test/CMakeLists.txt
+++ b/lib/SuplaDevice/extras/test/CMakeLists.txt
@@ -36,6 +36,12 @@ file(GLOB TEST_SRC
   UptimeTests/*.cpp
   ChannelTests/*cpp
   IoTests/*.cpp
+  ElementTests/*.cpp
+  LocalActionTests/*.cpp
+  SensorTests/*.cpp
+  ChannelElementTests/*.cpp
+  InternalPinOutputTests/*.cpp
+  PinStatusLedTests/*.cpp
   )
 
 file(GLOB DOUBLE_SRC doubles/*.cpp)
diff --git a/lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp b/lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp
new file mode 100644
index 00000000..4cb78137
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp
@@ -0,0 +1,54 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <supla/channel_element.h>
+#include <supla/events.h>
+#include <supla/actions.h>
+#include <supla/action_handler.h>
+
+
+class ActionHandlerMock : public Supla::ActionHandler {
+ public:
+  MOCK_METHOD(void, handleAction, (int, int), (override));
+};
+
+
+TEST(ChannelElementTests, ActionDelegationToChannel) {
+  Supla::ChannelElement element;
+
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+
+  int action1 = 11;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_TURN_ON, action1)).Times(2);
+  EXPECT_CALL(mock2, handleAction(Supla::ON_TURN_OFF, action1)).Times(2);
+
+  element.addAction(action1, mock1, Supla::ON_TURN_ON);
+  element.addAction(action1, &mock2, Supla::ON_TURN_OFF);
+
+  element.getChannel()->setNewValue(false);
+  element.getChannel()->setNewValue(true);
+  element.getChannel()->setNewValue(true);
+
+  element.getChannel()->setNewValue(false);
+  element.getChannel()->setNewValue(true);
+  element.getChannel()->setNewValue(false);
+  element.getChannel()->setNewValue(false);
+}
+
diff --git a/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp b/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
index 4fc872f4..136316dd 100644
--- a/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
+++ b/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
@@ -18,6 +18,22 @@
 
 #include <supla/channel.h>
 #include <supla/channel_extended.h>
+#include <gmock/gmock.h>
+#include <srpc_mock.h>
+#include <supla/events.h>
+#include <supla/actions.h>
+
+
+class ActionHandlerMock : public Supla::ActionHandler {
+ public:
+  MOCK_METHOD(void, handleAction, (int, int), (override));
+};
+
+
+using ::testing::_;
+using ::testing::ElementsAreArray;
+using ::testing::Args;
+using ::testing::ElementsAre;
 
 TEST(ChannelTests, ChannelMethods) {
   Supla::Channel first;
@@ -265,6 +281,212 @@ TEST(ChannelTests, ChannelValueGetters) {
   EXPECT_EQ(channel.getValueBlue(), blue);
   EXPECT_EQ(channel.getValueColorBrightness(), colorBright);
   EXPECT_EQ(channel.getValueBrightness(), bright);
-  
+}
+
+TEST(ChannelTests, SendUpdateTest) {
+  Supla::Channel channel;
+  ::testing::InSequence seq;
+  SrpcMock srpc;
+
+  const char emptyArray[SUPLA_CHANNELVALUE_SIZE] = {};
+  char array[SUPLA_CHANNELVALUE_SIZE] = {};
+  array[0] = 1;
+
+  EXPECT_CALL(srpc, valueChanged(nullptr, 0, ElementsAreArray(emptyArray)));
+  EXPECT_CALL(srpc, valueChanged(nullptr, 0, ElementsAreArray(array)));
+
+  EXPECT_FALSE(channel.isUpdateReady());
+  channel.sendUpdate(nullptr);
+  channel.setNewValue(true);
+  EXPECT_TRUE(channel.isUpdateReady());
+  channel.sendUpdate(nullptr);
+  EXPECT_FALSE(channel.isUpdateReady());
+}
+
+TEST(ChannelTests, BoolChannelWithLocalActions) {
+  Supla::Channel ch1;
+
+  ::testing::InSequence seq;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  SrpcMock srpc;
+
+  int action1 = 11;
+  int action2 = 12;
+  int action3 = 13;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_TURN_ON, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_TURN_OFF, action2));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_TURN_ON, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action3));
+  EXPECT_CALL(mock2, handleAction).Times(0);
+
+
+  ch1.addAction(action1, mock1, Supla::ON_TURN_ON);
+  ch1.addAction(action2, mock1, Supla::ON_TURN_OFF);
+
+  ch1.setNewValue(true);
+  ch1.setNewValue(false);
+  ch1.setNewValue(false); // nothing should be called on mocks
+  ch1.setNewValue(false); // nothing should be called on mocks
+
+  ch1.addAction(action3, mock1, Supla::ON_CHANGE);
+  ch1.setNewValue(true);
+  ch1.setNewValue(true); // nothing should be called on mocks
+  ch1.setNewValue(true); // nothing should be called on mocks
+
+}
+
+TEST(ChannelTests, Int32ChannelWithLocalActions) {
+  Supla::Channel ch1;
+
+  ::testing::InSequence seq;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  SrpcMock srpc;
+
+  int action1 = 11;
+  int action2 = 12;
+  int action3 = 13;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock2, handleAction).Times(0);
+
+  ch1.addAction(action1, mock1, Supla::ON_CHANGE);
+
+  _supla_int_t value = 15;
+
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+
+  value++;
+  ch1.setNewValue(value);
+
+  value++;
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+}
+
+TEST(ChannelTests, Int64ChannelWithLocalActions) {
+  Supla::Channel ch1;
+
+  ::testing::InSequence seq;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  SrpcMock srpc;
+
+  int action1 = 11;
+  int action2 = 12;
+  int action3 = 13;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock2, handleAction).Times(0);
+
+  ch1.addAction(action1, mock1, Supla::ON_CHANGE);
+
+  _supla_int64_t value = 15;
+
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+
+  value++;
+  ch1.setNewValue(value);
+
+  value++;
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+}
+
+TEST(ChannelTests, DoubleChannelWithLocalActions) {
+  Supla::Channel ch1;
+
+  ::testing::InSequence seq;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  SrpcMock srpc;
+
+  int action1 = 11;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock2, handleAction).Times(0);
+
+  ch1.addAction(action1, mock1, Supla::ON_CHANGE);
+
+  double value = 3.1415;
+
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+
+  value += 1.2;
+  ch1.setNewValue(value);
+
+  value += 1.2;
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+  ch1.setNewValue(value);
+}
+
+TEST(ChannelTests, DoubleFloatChannelWithLocalActions) {
+  Supla::Channel ch1;
+
+  ::testing::InSequence seq;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  SrpcMock srpc;
+
+  int action1 = 11;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock2, handleAction).Times(0);
+
+  ch1.addAction(action1, mock1, Supla::ON_CHANGE);
+
+  float value1 = 3.1415;
+  float value2 = 2.5;
+
+  ch1.setNewValue(value1, value2);
+  ch1.setNewValue(value1, value2);
+
+  value1 += 1.2;
+  ch1.setNewValue(value1, value2);
+
+  value2 += 1.2;
+  ch1.setNewValue(value1, value2);
+  ch1.setNewValue(value1, value2);
+  ch1.setNewValue(value1, value2);
+}
+
+TEST(ChannelTests, RgbwChannelWithLocalActions) {
+  Supla::Channel ch1;
+
+  ::testing::InSequence seq;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  SrpcMock srpc;
+
+  int action1 = 11;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(mock2, handleAction).Times(0);
+
+  ch1.addAction(action1, mock1, Supla::ON_CHANGE);
+
+  ch1.setNewValue(10, 20, 30, 90, 80);
+  ch1.setNewValue(10, 20, 30, 90, 80);
 
+  ch1.setNewValue(10, 21, 30, 90, 80);
+  ch1.setNewValue(10, 20, 30, 90, 81);
+  ch1.setNewValue(10, 20, 30, 90, 81);
 }
diff --git a/lib/SuplaDevice/extras/test/ElementTests/element_tests.cpp b/lib/SuplaDevice/extras/test/ElementTests/element_tests.cpp
new file mode 100644
index 00000000..8526dc0a
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ElementTests/element_tests.cpp
@@ -0,0 +1,180 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/element.h>
+#include <supla/channel.h>
+#include <arduino_mock.h>
+#include <srpc_mock.h>
+
+using ::testing::Return;
+using ::testing::ElementsAreArray;
+
+class ElementWithChannel : public Supla::Element {
+  public:
+    Supla::Channel *getChannel() {
+      return &channel;
+    }
+    Supla::Channel channel;
+};
+
+TEST(ElementTests, ElementEmptyListTests) {
+  EXPECT_EQ(Supla::Element::begin(), nullptr);
+  EXPECT_EQ(Supla::Element::last(), nullptr);
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(0), nullptr);
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(-1), nullptr);
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(10), nullptr);
+}
+
+TEST(ElementTests, ElementListAdding) {
+  auto el1 = new Supla::Element;
+
+  EXPECT_EQ(Supla::Element::begin(), el1);
+  EXPECT_EQ(Supla::Element::last(), el1);
+
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(0), nullptr);
+  // Element without channel number acts as channel with -1 number
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(-1), el1);
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(10), nullptr);
+  
+  auto el2 = new Supla::Element;
+  EXPECT_EQ(Supla::Element::begin(), el1);
+  EXPECT_EQ(Supla::Element::last(), el2);
+
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(0), nullptr);
+  // Element without channel number acts as channel with -1 number
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(-1), el1);
+  EXPECT_EQ(Supla::Element::getElementByChannelNumber(10), nullptr);
+
+  auto el3 = new Supla::Element;
+  EXPECT_EQ(Supla::Element::begin(), el1);
+  EXPECT_EQ(Supla::Element::last(), el3);
+
+  delete el2;
+
+  EXPECT_EQ(Supla::Element::begin(), el1);
+  EXPECT_EQ(Supla::Element::last(), el3);
+
+  el2 = new Supla::Element;
+  EXPECT_EQ(Supla::Element::begin(), el1);
+  EXPECT_EQ(Supla::Element::last(), el2);
+
+  delete el1;
+  EXPECT_EQ(Supla::Element::begin(), el3);
+  EXPECT_EQ(Supla::Element::last(), el2);
+
+  el1 = new Supla::Element;
+  EXPECT_EQ(Supla::Element::begin(), el3);
+  EXPECT_EQ(Supla::Element::last(), el1);
+
+  delete el1;
+  EXPECT_EQ(Supla::Element::begin(), el3);
+  EXPECT_EQ(Supla::Element::last(), el2);
+
+  delete el2;
+  delete el3;
+
+  EXPECT_EQ(Supla::Element::begin(), nullptr);
+  EXPECT_EQ(Supla::Element::last(), nullptr);
+
+}
+
+TEST(ElementTests, NoChannelElementMethods) {
+  Supla::Element el1;
+
+  // those methods are empty, so just call to make sure that they do nothing and don't crash
+  el1.onInit();
+  el1.onLoadState();
+  el1.onSaveState();
+  el1.iterateAlways();
+  el1.onTimer();
+  el1.onFastTimer();
+
+  TDSC_ChannelState channelState;
+  el1.handleGetChannelState(channelState);
+
+  EXPECT_EQ(el1.getChannelNumber(), -1);
+  EXPECT_EQ(el1.getChannel(), nullptr);
+  EXPECT_EQ(el1.getSecondaryChannel(), nullptr);
+  EXPECT_EQ(&(el1.disableChannelState()), &el1);
+  EXPECT_EQ(el1.next(), nullptr);
+
+  EXPECT_EQ(el1.iterateConnected(nullptr), true);
+  EXPECT_EQ(el1.iterateConnected(&el1), true);
+  EXPECT_EQ(el1.handleNewValueFromServer(nullptr), -1);
+  EXPECT_EQ(el1.handleCalcfgFromServer(nullptr), SUPLA_CALCFG_RESULT_NOT_SUPPORTED);
+}
+
+TEST(ElementTests, ChannelElementMethods) {
+  ElementWithChannel el1;
+  TimeInterfaceMock time;
+  SrpcMock srpc;
+
+  // those methods are empty, so just call to make sure that they do nothing and don't crash
+  el1.onInit();
+  el1.onLoadState();
+  el1.onSaveState();
+  el1.iterateAlways();
+  el1.onTimer();
+  el1.onFastTimer();
+
+  TDSC_ChannelState channelState;
+  el1.handleGetChannelState(channelState);
+
+  EXPECT_EQ(el1.getChannelNumber(), 0);
+  EXPECT_EQ(el1.getChannel(), &(el1.channel));
+  EXPECT_EQ(el1.getSecondaryChannel(), nullptr);
+  EXPECT_EQ(&(el1.disableChannelState()), &el1);
+  EXPECT_EQ(el1.next(), nullptr);
+
+  EXPECT_FALSE(el1.channel.isUpdateReady());
+  EXPECT_EQ(el1.iterateConnected(nullptr), true);
+  EXPECT_EQ(el1.iterateConnected(&el1), true);
+  EXPECT_EQ(el1.handleNewValueFromServer(nullptr), -1);
+  EXPECT_EQ(el1.handleCalcfgFromServer(nullptr), SUPLA_CALCFG_RESULT_NOT_SUPPORTED);
+
+  EXPECT_FALSE(el1.channel.isUpdateReady());
+  el1.channel.setNewValue(true);
+  EXPECT_TRUE(el1.channel.isUpdateReady());
+
+  EXPECT_CALL(time, millis)
+    .WillOnce(Return(0))   // #1 first call after value changed to true
+    .WillOnce(Return(200)) // #2 two calls after value changed to true and 100 ms passed
+    .WillOnce(Return(200)) // #2
+    .WillOnce(Return(250)) // #3 value changed, however not enough time passed
+    .WillOnce(Return(250)) // #4 value changed, however not enough time passed
+    .WillOnce(Return(400)) // #5 two calls after value changed and another >100 ms passed
+    .WillOnce(Return(400));
+
+  char array0[SUPLA_CHANNELVALUE_SIZE] = {};
+  char array1[SUPLA_CHANNELVALUE_SIZE] = {};
+  array1[0] = 1;
+  EXPECT_CALL(srpc, valueChanged(nullptr, 0, ElementsAreArray(array1))); // value at #2
+  EXPECT_CALL(srpc, valueChanged(nullptr, 0, ElementsAreArray(array0))); // value at #5
+
+
+  EXPECT_EQ(el1.iterateConnected(nullptr), true);  // #1
+  EXPECT_EQ(el1.iterateConnected(nullptr), false); // #2
+
+  el1.channel.setNewValue(false);
+  EXPECT_EQ(el1.iterateConnected(nullptr), true);  // #3
+  EXPECT_EQ(el1.iterateConnected(nullptr), true);  // #4
+  EXPECT_EQ(el1.iterateConnected(nullptr), false); // #5
+}
+
+
+
diff --git a/lib/SuplaDevice/extras/test/InternalPinOutputTests/internal_pin_output_tests.cpp b/lib/SuplaDevice/extras/test/InternalPinOutputTests/internal_pin_output_tests.cpp
new file mode 100644
index 00000000..fe661d4d
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/InternalPinOutputTests/internal_pin_output_tests.cpp
@@ -0,0 +1,353 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <supla/control/internal_pin_output.h>
+#include <arduino_mock.h>
+#include <supla/events.h>
+#include <supla/actions.h>
+
+using ::testing::Return;
+
+class ActionHandlerMock : public Supla::ActionHandler {
+ public:
+  MOCK_METHOD(void, handleAction, (int, int), (override));
+};
+
+TEST(InternalPinOutputTests, BasicMethodsTests) {
+  const int pin = 5;
+  const int pin2 = 6;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+  EXPECT_CALL(timeMock, millis).WillRepeatedly(Return(0));
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalWrite(pin2, HIGH)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin2, OUTPUT)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalRead(pin)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalRead(pin2)).WillOnce(Return(HIGH));
+
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalWrite(pin2, LOW)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalRead(pin)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+  Supla::Control::InternalPinOutput ipo(pin);
+  Supla::Control::InternalPinOutput ipo2(pin2, false);
+
+
+  EXPECT_EQ(ipo.pinOnValue(), HIGH);
+  EXPECT_EQ(ipo.pinOffValue(), LOW);
+
+  EXPECT_EQ(ipo2.pinOnValue(), LOW);
+  EXPECT_EQ(ipo2.pinOffValue(), HIGH);
+
+  ipo.onInit();
+  ipo2.onInit();
+
+  EXPECT_EQ(ipo.isOn(), false);
+  EXPECT_EQ(ipo2.isOn(), false);
+
+  ipo.turnOn();
+  ipo2.turnOn();
+
+  ipo.turnOff();
+
+  ipo.toggle();
+}
+
+TEST(InternalPinOutputTests, DefaultInitialState) {
+  const int pin = 5;
+  const int pin2 = 6;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+  EXPECT_CALL(timeMock, millis).WillRepeatedly(Return(0));
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalWrite(pin2, HIGH)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin2, OUTPUT)).Times(1);
+
+  Supla::Control::InternalPinOutput ipo(pin);
+  Supla::Control::InternalPinOutput ipo2(pin2, false);
+
+  ipo.setDefaultStateOn();
+  ipo2.setDefaultStateOff();
+
+  ipo.onInit();
+  ipo2.onInit();
+
+}
+
+TEST(InternalPinOutputTests, TurnOnWithIterations) {
+  const int pin = 5;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+
+  Supla::Control::InternalPinOutput ipo(pin);
+
+  ipo.onInit();
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+
+  ipo.turnOn();
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+}
+
+TEST(InternalPinOutputTests, TurnOnWithDuration) {
+  const int pin = 5;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(100));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(200));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(201));
+
+  EXPECT_CALL(ioMock, digitalRead(pin)).WillOnce(Return(HIGH));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(201));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+
+
+  Supla::Control::InternalPinOutput ipo(pin);
+
+  ipo.onInit();
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+
+  ipo.turnOn(200);
+  ipo.iterateAlways(); // time 0
+  ipo.iterateAlways(); // time 100
+  ipo.iterateAlways(); // time 200
+  ipo.iterateAlways(); // time 201
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+}
+
+TEST(InternalPinOutputTests, TurnOffWithDuration) {
+  const int pin = 5;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(100));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(200));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(201));
+
+  EXPECT_CALL(ioMock, digitalRead(pin)).WillOnce(Return(LOW));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(201));
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+  Supla::Control::InternalPinOutput ipo(pin);
+
+  ipo.onInit();
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+
+  ipo.turnOff(200);
+  ipo.iterateAlways(); // time 0
+  ipo.iterateAlways(); // time 100
+  ipo.iterateAlways(); // time 200
+  ipo.iterateAlways(); // time 201
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+}
+
+
+TEST(InternalPinOutputTests, TurnOnWithStoredDuration) {
+  const int pin = 5;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(100));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(200));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(201));
+
+  EXPECT_CALL(ioMock, digitalRead(pin)).WillOnce(Return(HIGH));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(201));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(300));
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(400));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(600));
+  EXPECT_CALL(ioMock, digitalRead(pin)).WillOnce(Return(HIGH));
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(600));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+
+  Supla::Control::InternalPinOutput ipo(pin);
+
+  ipo.onInit();
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+
+  ipo.setDurationMs(200);
+
+  ipo.turnOn();
+  ipo.iterateAlways(); // time 0
+  ipo.iterateAlways(); // time 100
+  ipo.iterateAlways(); // time 200
+  ipo.iterateAlways(); // time 201
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+
+  ipo.turnOn();
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+}
+
+TEST(InternalPinOutputTests, HandleActionTests) {
+  const int pin = 5;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+  EXPECT_CALL(timeMock, millis).WillRepeatedly(Return(0));
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1); // onInit
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1); // Turn on
+
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1); // Turn off
+
+  EXPECT_CALL(ioMock, digitalRead(pin)).WillOnce(Return(LOW)); // Toggle
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+  Supla::Control::InternalPinOutput ipo(pin);
+
+  ipo.onInit();
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+
+  ipo.handleAction(0, Supla::TURN_ON);
+
+  ipo.iterateAlways();
+  ipo.handleAction(0, Supla::TURN_OFF);
+
+  ipo.iterateAlways();
+  ipo.handleAction(0, Supla::TOGGLE);
+  ipo.iterateAlways();
+}
+
+TEST(InternalPinOutputTests, TurnOnWithAction) {
+  const int pin = 5;
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+  ActionHandlerMock ahMock;
+
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_TURN_OFF, Supla::TURN_OFF));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, 33));
+  EXPECT_CALL(ioMock, digitalWrite(pin, LOW)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(pin, OUTPUT)).Times(1);
+
+  EXPECT_CALL(timeMock, millis).WillOnce(Return(0));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_TURN_ON, Supla::TURN_ON));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, 33));
+  EXPECT_CALL(ioMock, digitalWrite(pin, HIGH)).Times(1);
+
+
+  Supla::Control::InternalPinOutput ipo(pin);
+  ipo.addAction(Supla::TURN_ON, ahMock, Supla::ON_TURN_ON);
+  ipo.addAction(Supla::TURN_OFF, ahMock, Supla::ON_TURN_OFF);
+  ipo.addAction(33, ahMock, Supla::ON_CHANGE);
+
+  ipo.onInit();
+
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+
+  ipo.turnOn();
+  ipo.iterateAlways();
+  ipo.iterateAlways();
+}
+
diff --git a/lib/SuplaDevice/extras/test/IoTests/io_tests.cpp b/lib/SuplaDevice/extras/test/IoTests/io_tests.cpp
index b0cd081d..0c9fc938 100644
--- a/lib/SuplaDevice/extras/test/IoTests/io_tests.cpp
+++ b/lib/SuplaDevice/extras/test/IoTests/io_tests.cpp
@@ -14,13 +14,133 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include <arduino_mock.h>
 #include <gtest/gtest.h>
-
 #include <supla/io.h>
 
+using ::testing::Return;
+
+class CustomIoMock : public Supla::Io {
+ public:
+  MOCK_METHOD(
+      void, customPinMode, (int channelNumber, uint8_t pin, uint8_t mode));
+  MOCK_METHOD(int, customDigitalRead, (int channelNumber, uint8_t pin));
+  MOCK_METHOD(
+      void, customDigitalWrite, (int channelNumber, uint8_t pin, uint8_t val));
+};
+
+TEST(IoTests, PinMode) {
+  DigitalInterfaceMock ioMock;
+  ::testing::InSequence seq;
 
-TEST(IoTests, DefaultBehavior) {
-  EXPECT_TRUE(true);
+  EXPECT_CALL(ioMock, pinMode(3, INPUT));
+  EXPECT_CALL(ioMock, pinMode(0, OUTPUT));
+  EXPECT_CALL(ioMock, pinMode(3, INPUT_PULLUP));
 
+  Supla::Io::pinMode(3, INPUT);
+  Supla::Io::pinMode(0, OUTPUT);
+  Supla::Io::pinMode(3, INPUT_PULLUP);
 }
 
+TEST(IoTests, PinModeWithChannelNumber) {
+  DigitalInterfaceMock ioMock;
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, pinMode(3, INPUT));
+  EXPECT_CALL(ioMock, pinMode(0, OUTPUT));
+  EXPECT_CALL(ioMock, pinMode(3, INPUT_PULLUP));
+
+  Supla::Io::pinMode(10, 3, INPUT);
+  Supla::Io::pinMode(11, 0, OUTPUT);
+  Supla::Io::pinMode(12, 3, INPUT_PULLUP);
+}
+
+TEST(IoTests, DigitalWrite) {
+  DigitalInterfaceMock ioMock;
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, digitalWrite(3, HIGH));
+  EXPECT_CALL(ioMock, digitalWrite(3, LOW));
+  EXPECT_CALL(ioMock, digitalWrite(99, LOW));
+
+  Supla::Io::digitalWrite(3, HIGH);
+  Supla::Io::digitalWrite(3, LOW);
+  Supla::Io::digitalWrite(99, LOW);
+}
+
+TEST(IoTests, DigitalWriteWithChannel) {
+  DigitalInterfaceMock ioMock;
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, digitalWrite(3, HIGH));
+  EXPECT_CALL(ioMock, digitalWrite(3, LOW));
+  EXPECT_CALL(ioMock, digitalWrite(99, LOW));
+
+  Supla::Io::digitalWrite(3, HIGH);
+  Supla::Io::digitalWrite(3, LOW);
+  Supla::Io::digitalWrite(99, LOW);
+}
+
+TEST(IoTests, DigitalRead) {
+  DigitalInterfaceMock ioMock;
+
+  EXPECT_CALL(ioMock, digitalRead(3))
+      .WillOnce(Return(LOW))
+      .WillOnce(Return(HIGH))
+      .WillOnce(Return(LOW));
+
+  EXPECT_EQ(Supla::Io::digitalRead(3), LOW);
+  EXPECT_EQ(Supla::Io::digitalRead(3), HIGH);
+  EXPECT_EQ(Supla::Io::digitalRead(3), LOW);
+}
+
+TEST(IoTests, DigitalReadWithChannel) {
+  DigitalInterfaceMock ioMock;
+
+  EXPECT_CALL(ioMock, digitalRead(3))
+      .WillOnce(Return(LOW))
+      .WillOnce(Return(HIGH))
+      .WillOnce(Return(LOW));
+
+  EXPECT_EQ(Supla::Io::digitalRead(100, 3), LOW);
+  EXPECT_EQ(Supla::Io::digitalRead(100, 3), HIGH);
+  EXPECT_EQ(Supla::Io::digitalRead(-1, 3), LOW);
+}
+
+TEST(IoTest, OperationsWithCustomIoInteface) {
+  DigitalInterfaceMock hwInterfaceMock;
+  CustomIoMock ioMock;
+
+  EXPECT_CALL(hwInterfaceMock, pinMode).Times(0);
+  EXPECT_CALL(hwInterfaceMock, digitalWrite).Times(0);
+  EXPECT_CALL(hwInterfaceMock, digitalRead).Times(0);
+
+  EXPECT_CALL(ioMock, customPinMode(-1, 12, INPUT));
+  EXPECT_CALL(ioMock, customDigitalRead(-1, 11))
+    .WillOnce(Return(HIGH));
+  EXPECT_CALL(ioMock, customDigitalWrite(-1, 13, HIGH));
+
+  Supla::Io::pinMode(12, INPUT);
+  EXPECT_EQ(Supla::Io::digitalRead(11), HIGH);
+  Supla::Io::digitalWrite(13, HIGH);
+
+}
+TEST(IoTest, OperationsWithCustomIoIntefaceWithChannel) {
+  DigitalInterfaceMock hwInterfaceMock;
+  CustomIoMock ioMock;
+
+  // Custom io interface should not call arduino's methods 
+  EXPECT_CALL(hwInterfaceMock, pinMode).Times(0);
+  EXPECT_CALL(hwInterfaceMock, digitalWrite).Times(0);
+  EXPECT_CALL(hwInterfaceMock, digitalRead).Times(0);
+
+  EXPECT_CALL(ioMock, customPinMode(6, 12, INPUT));
+  EXPECT_CALL(ioMock, customDigitalRead(6, 11))
+    .WillOnce(Return(HIGH));
+  EXPECT_CALL(ioMock, customDigitalWrite(6, 13, HIGH));
+
+  Supla::Io::pinMode(6, 12, INPUT);
+  EXPECT_EQ(Supla::Io::digitalRead(6, 11), HIGH);
+  Supla::Io::digitalWrite(6, 13, HIGH);
+
+}
diff --git a/lib/SuplaDevice/extras/test/LocalActionTests/local_action_tests.cpp b/lib/SuplaDevice/extras/test/LocalActionTests/local_action_tests.cpp
new file mode 100644
index 00000000..bbd03614
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/LocalActionTests/local_action_tests.cpp
@@ -0,0 +1,177 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <supla/local_action.h>
+
+class ActionHandlerMock : public Supla::ActionHandler {
+ public:
+  MOCK_METHOD(void, handleAction, (int, int), (override));
+};
+
+TEST(LocalActionTests, TwoItemsTests) {
+  auto b1 = new Supla::LocalAction;
+  auto b2 = new Supla::LocalAction;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+
+  int action1 = 1;
+  int action2 = 2;
+  int action3 = 3;
+  int action4 = 4;
+  int action5 = 5;
+  int event1 = 11;
+  int event2 = 12;
+  int event3 = 13;
+
+  EXPECT_CALL(mock1, handleAction(event1, action1));
+  EXPECT_CALL(mock1, handleAction(event1, action3));
+  EXPECT_CALL(mock2, handleAction(event3, action1));
+  EXPECT_CALL(mock1, handleAction(event2, action2));
+  EXPECT_CALL(mock1, handleAction(event2, action4));
+  EXPECT_CALL(mock1, handleAction(event2, action5));
+  EXPECT_CALL(mock2, handleAction(event1, action1));
+  EXPECT_CALL(mock2, handleAction(event2, action2));
+
+  b1->addAction(action1, mock1, event1);
+  b1->addAction(action2, mock1, event2);
+  b1->addAction(action3, mock1, event1);
+  b1->addAction(action4, mock1, event2);
+  b1->addAction(action5, mock1, event2);
+  b1->addAction(action1, mock2, event3);
+  b2->addAction(action1, mock2, event1);
+  b2->addAction(action2, mock2, event2);
+  b1->runAction(event1);
+  b1->runAction(event3);
+  b1->runAction(event2);
+
+  b2->runAction(event1);
+
+  delete b1;
+
+  b2->runAction(event2);
+
+  delete b2;
+}
+
+TEST(LocalActionTests, FourItemsTestsNoCalls) {
+  auto b1 = new Supla::LocalAction;
+  auto b2 = new Supla::LocalAction;
+  auto b3 = new Supla::LocalAction;
+  auto b4 = new Supla::LocalAction;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  ActionHandlerMock mock3;
+  ActionHandlerMock mock4;
+
+  EXPECT_CALL(mock1, handleAction).Times(0);
+  EXPECT_CALL(mock2, handleAction).Times(0);
+  EXPECT_CALL(mock3, handleAction).Times(0);
+  EXPECT_CALL(mock4, handleAction).Times(0);
+
+  int action1 = 1;
+  int action2 = 2;
+  int action3 = 3;
+  int action4 = 4;
+  int action5 = 5;
+  int event1 = 11;
+  int event2 = 12;
+  int event3 = 13;
+  int event4 = 14;
+
+  b4->addAction(action4, mock4, event4);
+  b3->addAction(action3, mock3, event3);
+  b1->addAction(action1, mock1, event1);
+  b2->addAction(action2, mock2, event2);
+
+  b1->runAction(event2);
+  b1->runAction(event3);
+  b1->runAction(event4);
+
+  b2->runAction(event1);
+  b2->runAction(event3);
+  b2->runAction(event4);
+
+  b3->runAction(event1);
+  b3->runAction(event2);
+  b3->runAction(event4);
+
+  b4->runAction(event1);
+  b4->runAction(event2);
+  b4->runAction(event3);
+
+  delete b1;
+  delete b2;
+  delete b3;
+  delete b4;
+}
+
+TEST(LocalActionTests, FourItemsTestsWithCalls) {
+  auto b1 = new Supla::LocalAction;
+  auto b2 = new Supla::LocalAction;
+  auto b3 = new Supla::LocalAction;
+  auto b4 = new Supla::LocalAction;
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+  ActionHandlerMock mock3;
+  ActionHandlerMock mock4;
+
+  int action1 = 1;
+  int action2 = 2;
+  int action3 = 3;
+  int action4 = 4;
+  int action5 = 5;
+  int event1 = 11;
+  int event2 = 12;
+  int event3 = 13;
+  int event4 = 14;
+
+  EXPECT_CALL(mock1, handleAction(event1, action1));
+  EXPECT_CALL(mock2, handleAction(event2, action2));
+  EXPECT_CALL(mock3, handleAction(event3, action3));
+  EXPECT_CALL(mock4, handleAction(event4, action4));
+
+  b4->addAction(action4, mock4, event4);
+  b3->addAction(action3, mock3, event3);
+  b1->addAction(action1, mock1, event1);
+  b2->addAction(action2, mock2, event2);
+
+  b1->runAction(event1);
+  b1->runAction(event2);
+  b1->runAction(event3);
+  b1->runAction(event4);
+
+  b2->runAction(event1);
+  b2->runAction(event2);
+  b2->runAction(event3);
+  b2->runAction(event4);
+
+  b3->runAction(event3);
+  b3->runAction(event1);
+  b3->runAction(event2);
+  b3->runAction(event4);
+
+  b4->runAction(event1);
+  b4->runAction(event2);
+  b4->runAction(event3);
+  b4->runAction(event4);
+
+  delete b1;
+  delete b2;
+  delete b3;
+  delete b4;
+}
diff --git a/lib/SuplaDevice/extras/test/PinStatusLedTests/pin_status_led_tests.cpp b/lib/SuplaDevice/extras/test/PinStatusLedTests/pin_status_led_tests.cpp
new file mode 100644
index 00000000..c9118731
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/PinStatusLedTests/pin_status_led_tests.cpp
@@ -0,0 +1,103 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <supla/control/pin_status_led.h>
+#include <arduino_mock.h>
+
+
+using ::testing::Return;
+
+TEST(PinStatusLedTest, ReplicationTest) {
+  EXPECT_EQ(DigitalInterface::instance, nullptr);
+
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(LOW));
+//  EXPECT_CALL(ioMock, digitalWrite(2, LOW)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(2, OUTPUT)).Times(1);
+  
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(LOW));
+//  EXPECT_CALL(ioMock, digitalWrite(2, LOW)).Times(1);
+  
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(HIGH));
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalWrite(2, HIGH)).Times(1);
+  
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(HIGH));
+  EXPECT_CALL(ioMock, digitalWrite(2, LOW)).Times(1);
+  
+  Supla::Control::PinStatusLed led(1, 2);
+  led.onInit();
+  led.iterateAlways(); // LOW->LOW
+  led.iterateAlways(); // HIGH->HIGH
+  led.iterateAlways(); // LOW->LOW
+
+}
+
+TEST(PinStatusLedTest, ReplicationTestWithInvertedLogic) {
+  EXPECT_EQ(DigitalInterface::instance, nullptr);
+
+  DigitalInterfaceMock ioMock;
+  TimeInterfaceMock timeMock;
+
+
+  ::testing::InSequence seq;
+
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW)); // onInit
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalWrite(2, HIGH)).Times(1);
+  EXPECT_CALL(ioMock, pinMode(2, OUTPUT)).Times(1);
+  
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW)); // iterateAlways
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(HIGH));
+//  EXPECT_CALL(ioMock, digitalWrite(2, HIGH)).Times(1);
+  
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(HIGH));
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(HIGH));
+  EXPECT_CALL(ioMock, digitalWrite(2, LOW)).Times(1);
+  
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalWrite(2, HIGH)).Times(1);
+  
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW)); // disable inverted logic
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(HIGH));
+  EXPECT_CALL(ioMock, digitalWrite(2, LOW)).Times(1);
+
+  EXPECT_CALL(ioMock, digitalRead(1)).WillOnce(Return(LOW));
+  EXPECT_CALL(ioMock, digitalRead(2)).WillOnce(Return(LOW));
+//  EXPECT_CALL(ioMock, digitalWrite(2, HIGH)).Times(1);
+  
+  Supla::Control::PinStatusLed led(1, 2, true);
+  led.onInit();
+  led.iterateAlways(); // LOW->HIGH
+  led.iterateAlways(); // HIGH->LOW
+  led.iterateAlways(); // LOW->HIGH
+
+  led.setInvertedLogic(false); // LOW->LOW
+  led.iterateAlways(); // HIGH->HIGH
+
+}
diff --git a/lib/SuplaDevice/extras/test/SensorTests/thermometer_tests.cpp b/lib/SuplaDevice/extras/test/SensorTests/thermometer_tests.cpp
new file mode 100644
index 00000000..cea47588
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/SensorTests/thermometer_tests.cpp
@@ -0,0 +1,24 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <supla/sensor/thermometer.h>
+
+TEST(ThermometerTests, BasicTest) {
+  EXPECT_TRUE(true);
+}
+
diff --git a/lib/SuplaDevice/extras/test/doubles/Arduino.h b/lib/SuplaDevice/extras/test/doubles/Arduino.h
index 66d39925..518485d2 100644
--- a/lib/SuplaDevice/extras/test/doubles/Arduino.h
+++ b/lib/SuplaDevice/extras/test/doubles/Arduino.h
@@ -8,10 +8,16 @@
 typedef std::string String;
 
 #define LSBFIRST 0
+#define INPUT 0
+#define INPUT_PULLUP 2
+#define OUTPUT 1
+#define HIGH 1
+#define LOW 0
 
 void digitalWrite(uint8_t pin, uint8_t val);
 int digitalRead(uint8_t pin);
 void pinMode(uint8_t pin, uint8_t mode);
+unsigned long millis();
 
 
 class SerialStub {
diff --git a/lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp b/lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp
index 442b1c71..f64576a2 100644
--- a/lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp
+++ b/lib/SuplaDevice/extras/test/doubles/arduino_mock.cpp
@@ -17,33 +17,29 @@
 
 #include "Arduino.h"
 #include <gmock/gmock.h>
+#include "arduino_mock.h"
 
 SerialStub Serial;
 
-class DigitalInterface {
-  public:
-    DigitalInterface() {
-      instance = this;
-    }
-    virtual ~DigitalInterface() {
-      instance = nullptr;
-    }
-
-    virtual void digitalWrite(uint8_t, uint8_t) = 0;
-    virtual int digitalRead(uint8_t) = 0;
-    virtual void pinMode(uint8_t, uint8_t) = 0;
-    
-    static DigitalInterface *instance;
-};
+DigitalInterface::DigitalInterface() {
+  instance = this;
+}
+
+DigitalInterface::~DigitalInterface() {
+  instance = nullptr;
+}
 
 DigitalInterface *DigitalInterface::instance = nullptr;
 
-class DigitalInterfaceMock : public DigitalInterface {
-  MOCK_METHOD(void, digitalWrite, (uint8_t, uint8_t), (override));
-//  MOCK_METHOD(int, digitalRead, (uint8_t), (override));
- // MOCK_METHOD(void, pinMode, (uint8_t, uint8_t), (override));
+TimeInterface::TimeInterface() {
+  instance = this;
+}
 
-};
+TimeInterface::~TimeInterface() {
+  instance = nullptr;
+}
+
+TimeInterface *TimeInterface::instance = nullptr;
 
 void digitalWrite(uint8_t pin, uint8_t val) {
   DigitalInterface::instance->digitalWrite(pin, val);
@@ -57,3 +53,8 @@ void pinMode(uint8_t pin, uint8_t mode) {
   DigitalInterface::instance->pinMode(pin, mode);
 }
 
+unsigned long millis() {
+  return TimeInterface::instance->millis();
+}
+
+
diff --git a/lib/SuplaDevice/extras/test/doubles/arduino_mock.h b/lib/SuplaDevice/extras/test/doubles/arduino_mock.h
new file mode 100644
index 00000000..8daf5a1e
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/doubles/arduino_mock.h
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _arduino_mock_h
+#define _arduino_mock_h
+
+#include "Arduino.h"
+#include <gmock/gmock.h>
+
+class DigitalInterface {
+  public:
+    DigitalInterface();
+    virtual ~DigitalInterface();
+    virtual void digitalWrite(uint8_t, uint8_t) = 0;
+    virtual int digitalRead(uint8_t) = 0;
+    virtual void pinMode(uint8_t, uint8_t) = 0;
+    
+    static DigitalInterface *instance;
+};
+
+class TimeInterface {
+  public:
+    TimeInterface();
+    virtual ~TimeInterface();
+    virtual unsigned long millis() = 0;
+    
+    static TimeInterface *instance;
+};
+
+
+class DigitalInterfaceMock : public DigitalInterface {
+  public:
+  MOCK_METHOD(void, digitalWrite, (uint8_t, uint8_t), (override));
+  MOCK_METHOD(int, digitalRead, (uint8_t), (override));
+  MOCK_METHOD(void, pinMode, (uint8_t, uint8_t), (override));
+
+};
+
+class TimeInterfaceMock : public TimeInterface {
+  public:
+    MOCK_METHOD(unsigned long, millis, (), (override));
+};
+
+#endif
diff --git a/lib/SuplaDevice/extras/test/doubles/srpc_mock.cpp b/lib/SuplaDevice/extras/test/doubles/srpc_mock.cpp
new file mode 100644
index 00000000..46d5e16c
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/doubles/srpc_mock.cpp
@@ -0,0 +1,42 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <supla-common/srpc.h>
+#include "srpc_mock.h"
+
+_supla_int_t SRPC_ICACHE_FLASH srpc_ds_async_channel_extendedvalue_changed(
+    void *_srpc, unsigned char channel_number,
+    TSuplaChannelExtendedValue *value) {
+  return 0;
+}
+         
+_supla_int_t SRPC_ICACHE_FLASH srpc_ds_async_channel_value_changed(
+    void *_srpc, unsigned char channel_number, char *value) {
+  std::vector<char> vec(value, value + 8);
+  return SrpcInterface::instance->valueChanged(_srpc, channel_number, vec);
+}
+
+SrpcInterface::SrpcInterface() {
+  instance = this;
+}
+
+SrpcInterface::~SrpcInterface() {
+  instance = nullptr;
+}
+
+SrpcInterface *SrpcInterface::instance = nullptr;
+
+
diff --git a/lib/SuplaDevice/extras/test/doubles/srpc_mock.h b/lib/SuplaDevice/extras/test/doubles/srpc_mock.h
new file mode 100644
index 00000000..1c7d677c
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/doubles/srpc_mock.h
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _srpc_mock_h
+#define _srpc_mock_h
+
+#include <gmock/gmock.h>
+#include <supla-common/proto.h>
+#include <vector>
+
+class SrpcInterface {
+  public:
+    SrpcInterface();
+    virtual ~SrpcInterface();
+
+    virtual _supla_int_t valueChanged(void *srpc, unsigned char channelNumber, std::vector<char> value) = 0;
+    
+    static SrpcInterface *instance;
+};
+
+class SrpcMock : public SrpcInterface {
+  public:
+    MOCK_METHOD(_supla_int_t, valueChanged, (void *, unsigned char, std::vector<char>), (override));
+};
+
+#endif
diff --git a/lib/SuplaDevice/library.properties b/lib/SuplaDevice/library.properties
index a1277c9e..87d96835 100644
--- a/lib/SuplaDevice/library.properties
+++ b/lib/SuplaDevice/library.properties
@@ -1,12 +1,11 @@
 name=SuplaDevice
-author=Przemyslaw Zygmunt
-email=Przemyslaw Zygmunt <przemek@supla.org>
+author=AC SOFTWARE SP. Z O.O.
 maintainer=Krzysztof Lewandowski <krz.lewandowski@gmail.com>
-sentence=Library enables you to connect the device to SUPLA system.
-paragraph=The Library supports Ethernet modules based on ENC28J60 and the popular Ethernet Shield based on W5100. Regarding the ENC28J60 chip, additional UIPEthernet library must be installed. WiFi interface on ESP8266 based devices is also supported.
-url=https://www.supla.org
+sentence=Library enables you to connect the device to the SUPLA automation system.
+paragraph=It provides easy interface for adding various sensors, relays, buttons, roller shutters, etc. that can be controlled via SUPLA Cloud and application on mobile device. 
+url=https://github.com/SUPLA/arduino
 architectures=avr,esp32,esp8266
-version=2.3
+version=2.3.2
 dependencies=
 core-dependencies=arduino (>=1.5.0)
 category=Communication
diff --git a/lib/SuplaDevice/readme.md b/lib/SuplaDevice/readme.md
new file mode 100644
index 00000000..a80f3eca
--- /dev/null
+++ b/lib/SuplaDevice/readme.md
@@ -0,0 +1,248 @@
+# SUPLA project
+
+[SUPLA](https://www.supla.org) is an open source project for home automation. 
+
+# SuplaDevice library for Arduino IDE
+
+SuplaDevice is a library for [Arduino IDE](https://www.arduino.cc/en/main/software) that allows to implement devices working with [Supla](https://www.supla.org).
+
+## Library installation
+
+There are few options how to install library in Arduino IDE. Here is one example:
+1. Download SuplaDevice repository as a zip file (click green "Code" button on github repository)
+2. Extract downloaded zip file
+3. Copy whole SuplaDevice subfolder to a location where Arduino keeps libraries (in Arduino IDE open File->Preferences and there is a sketch location folder - libraries are kept in "libraries" subfolder)
+4. You should be able to open SuplaDevice exmaples in Arduino IDE
+
+## Hardware requirements
+
+### Arduino Mega
+SuplaDevice works with Arduino Mega boards. Currently Arduino Uno is not supported because of RAM limitations. It should work on other Arduino boards with at least 8 kB of RAM.
+Following network interfaces are supported:
+* Ethernet Shield with W5100 chipset
+* ENC28J60 (not recommended - see Supported hardware section)
+
+Warning: WiFi shields are currently not supported
+
+### ESP8266
+ESP8266 boards are supported. Network connection is done via internal WiFi. Tested with ESP8266 boards 2.6.3.
+Most probably it will work with other ESP8266 compatible boards. 
+
+### ESP32
+Experimental support for ESP32 boards is provided. Some issues seen with reconnection to WiFi router which requires further analysis.
+
+## Installation
+
+Before you start, you will need to:
+1. install Arduino IDE,
+2. install support for your board
+3. install driver for your USB to serial converter device (it can be external device, or build in on your board)
+4. make sure that communication over serial interface with your board is working (i.e. check some example Arduino application)
+5. download and install this librarary by copying SuplaDevice folder into your Arduino library folder
+
+Steps 1-4 are standard Arudino IDE setup procedures not related to SuplaDevice library. You can find many tutorials on Internet with detailed instructions. Tutorials doesn't have to be related in any way with Supla. 
+
+After step 5 you should see Supla example applications in Arduino IDE examples. Select one and have fun! Example file requires adjustments before you compile them and upload to your board. Please read all comments in example and make proper adjustments. 
+
+## Usage
+
+### Network interfaces
+Supported network interfaces for Arduino Mega:
+* Ethernet Shield - with W5100 chipset. Include `<supla/network/ethernet_shield.h>` and add `Supla::EthernetShield ethernet;` as a global variable.
+* ENC28J60 - it requires additional UIPEthenet library (https://github.com/ntruchsess/arduino_uip). Include `<supla/network/ENC28J60.h>` and 
+add `Supla::ENC28J60 ethernet;` as a global variable. Warning: network initialization on this library is blocking. In case of missing ENC28J60 board
+or some other problem with network, program will stuck on initialization and will not work until connection is properly esablished.
+Second warning: UIPEthernet library is consuming few hundred of bytes of RAM memory more, compared to standard Ethernet library. 
+
+Supported network interface for ESP8266:
+* There is a native WiFi controller. Include `<supla/network/esp_wifi.h>` and add `Supla::ESPWifi wifi(ssid, password);` as a global variable and provide SSID and password in constructor.
+Warning: by default connection with Supla server is encrypted. Default settings of SSL consumes big amount of RAM. 
+To disable SSL connection, use:
+  `wifi.enableSSL(false);`
+
+
+
+SSL certificate verification.
+If you specify Supla's server certificate thumbprint there will be additional verification proceeded. Please use this method to configure fingerprint for validation:
+  `wifi.setServersCertFingerprint("9ba818295ec60652f8221500e15288d7a611177");'
+
+
+
+Supported network interface for ESP32:
+* There is a native WiFi controller. Include `<supla/network/esp32_wifi.h>` and add `Supla::ESP32Wifi wifi(ssid, password);` as a global variable and provide SSID and password in constructor.
+
+### Exmaples
+
+Each example can run on Arduino Mega, ESP8266, or ESP32 board - unless mentioned otherwise in comments. Please read comments in example files and uncomment proper library for your network interface.
+
+SuplaSomfy - this example is not updated yet.
+
+### Folder structure
+
+* `supla-common` - Supla protocol definitions and structures. There are also methods to handle low level communication with Supla server, like message coding, decoding, sending and receiving. Those files are common with `supla-core` and the same code is run on multiple Supla platforms and services
+* `supla/network` - implementation of network interfaces for supported boards
+* `supla/sensor` - implementation of Supla sensor channels (thermometers, open/close sensors, etc.)
+* `supla/control` - implementation of Supla control channels (various combinations of relays, buttons, action triggers)
+* `supla/clock` - time services used in library (i.e. RTC)
+* `supla` - all common classes are defined in main `supla` folder. You can find there classes that create framework on which all other components work. 
+
+Some functions from above folders have dependencies to external libraries. Please check documentation included in header files.
+
+### How does it work?
+
+Everything that is visible in Supla (in Cloud, on API, mobile application) is called "channel". Supla channels are used to control relays, read temperature, check if garage door is open. 
+
+SuplaDevice implements support for channels in `Channel` and `ChannelExtended` classes. Instances of those classes are part of objects called `Element` which are building blocks for any SuplaDevice application.
+
+All sensors, relays, buttons objects inherits from `Element` class. Each instance of such object will automatically register in SuplaDevice and proper virtual methods will be called by SuplaDevice in a specified way.
+
+All elements have to be constructed before `SuplaDevice.begin()` method is called.
+
+Supla channel number is assigned to each elemement with channel in an order of creation of objects. First channel will get number 0, second 1, etc. Supla server will not accept registration of device when order of channels is changed, or some channel is removed. In such case, you should remove device from Supla Cloud and register it again from scratch.
+
+`Element` class defines follwoing virtual methods that are called by SuplaDevice:
+1. `onInit` - called first within `SuplaDevice.begin()` method. It should initialize your element.
+2. `onLoadState` - called second within `SuplaDevice.begin()` method. It reads configuration data from persistent memory storage.
+3. `onSaveState` - called in `SuplaDevice.iterate()` - it saves state data to persistant storage. It is not called on each iteration. `Storage` class makes sure that storing to memory does not happen to often and time delay between saves depends on implementation. 
+3. `iterateAlways` - called on each iteration of `SuplaDevice.iterate()` method, regardless of network/connection status. Be careful - some other methods called in `SuplaDevice.iterate()` method may block program execution for some time (even few seconds) - i.e. trying to establish connection with Supla server is blocking - in case server is not accessible, it will iterfere with `iterateAlways` method. So time critical functions should not be put here.
+4. `iterateConnected` - called on each iterateion of `SuplaDevice.iterate()` method when device is connected and properly registered in Supla server. This method usually checks if there is some new data to be send to server (i.e. new temperature reading) and sends it. 
+5. `onTimer` - called every 10 ms after enabling in `SuplaDevice.begin()`
+6. `onFastTimer` - called every 1 ms (0.5 ms in case of Arudino Mega) after enabling in `SuplaDevice.begin()`
+
+## How to migrate programs written in SuplaDevice libraray versions 1.6 and older
+
+For Arduino Mega applications include proper network interface header:
+```
+// Choose proper network interface for your card:
+// Arduino Mega with EthernetShield W5100:
+#include <supla/network/ethernet_shield.h>
+// Ethernet MAC address
+uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+Supla::EthernetShield ethernet(mac);
+//
+// Arduino Mega with ENC28J60:
+// #include <supla/network/ENC28J60.h>
+// Supla::ENC28J60 ethernet(mac);
+
+```
+
+For ESP8266 based applications include wifi header and provide WIFI SSID and password:
+```
+// ESP8266 based board:
+#include <supla/network/esp_wifi.h>
+Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+```
+
+In case of ESP8266 remove all methods that defined network interface. They were usually added on the bottom of ino file, after end of loop() method, i.e.:
+```
+// Supla.org ethernet layer
+    int supla_arduino_tcp_read(void *buf, int count) {
+...
+SuplaDeviceCallbacks supla_arduino_get_callbacks(void) {
+...
+```
+
+Remove also those lines:
+```
+#define SUPLADEVICE_CPP
+WiFiClient client;
+```
+You may also remove all WIFI related includes from ino file.
+
+Common instruction for all boards:
+
+If you use local IP address, please provide it in constructor of your network inteface class, i.e.:
+```
+Supla::EthernetShield ethernet(mac, localIp);
+```
+
+After that go to SuplaDevice.begin() method. Old code looked like this
+```
+SuplaDevice.begin(GUID,              // Global Unique Identifier 
+                  mac,               // Ethernet MAC address
+                  "svr1.supla.org",  // SUPLA server address
+                  locationId,                 // Location ID 
+                  locationPassword);          // Location Password
+```
+This method requires now different set of parameters:
+```
+  SuplaDevice.begin(GUID,              // Global Unique Identifier 
+                    "svr1.supla.org",  // SUPLA server address
+                    "mail@address.pl",     // Email address
+                    AUTHKEY);          // Authentication key
+```
+What is different? Well, GUID and Supla server address it the same as previously. MAC address, location ID, location password are removed.
+MAC address was moved to network interface class. Location ID and password were replaced with new authentication method - via email address
+and authentication key. You can generate your authentication key in the same way as GUID (it is actually in exactly the same format):
+```
+// Generate AUTHKEY from https://www.supla.org/arduino/get-authkey
+char AUTHKEY[SUPLA_AUTHKEY_SIZE] =  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+```
+
+Next change is for custom digitalWrite and digitalRead methods. Those can be used to create virtual digital pins. Instead of adding custom
+callback method that overrides digitalWrite/Read method, you should create a new class which inhertis from Supla::Io base class and define
+your own customDigitalRead/Write methods. Here is short example (you can put this code in ino file, before setup()):
+```
+#include <supla/io.h>
+
+class MyDigitalRead : public Supla::Io {
+  public:
+    int customDigitalRead(int channelNumber, uint8_t pin) {
+      if (channelNumber == MY_EXTRA_VIRTUAL_CHANNEL) {
+        return someCustomSourceOfData.getValue();
+      } else {
+        return ::digitalRead(pin);
+      }
+    }
+}
+
+MyDigitalRead instanceMyDigitalRead;
+```
+
+All channels from old version of library should be removed and created again in a new format. Please check instructions below how to add each type of channel.
+
+## Supported channels
+### Sensors
+Sensor category is for all elements/channels that reads something and provides data to Supla serwer.
+
+
+### Control 
+Control category is for all elements/channels that are used to control something, i.e. relays, buttons, RGBW.
+
+## Supported persistant memory storage 
+Storage class is used as an abstraction for different persistant memory devices. Some elements/channels will not work properly without storage and some will have limitted functionalities. I.e. `ImpulseCounter` requires storage to save counter value, so it could be restored after reset, or `RollerShutter` requires storage to keep openin/closing times and current shutter possition. Currently two variants of storage classes are supported.
+### EEPROM/Flash memory
+EEPROM (in case of Arduino Mega) and Flash (in case of ESP) are build into most of boards. Usually writing should be safe for 100 000 write operations (on each bit). So in order to limit those operations, this kind of Storage will save data in longer time periods (every few minutes). Supla will not write data if there is no change.
+```
+#include <supla/storage/eeprom.h>
+Supla::Eeprom eeprom(SUPLA_STORAGE_OFFSET);
+```
+Offset parameter is optional - use it if you already use saving to EEPROM in your application and you want SuplaDevice to use some other area of memory.
+
+### Adafruit FRAM SPI
+FRAM is recommended for storage in Supla. It allows almost limitless writing cycles and it is very fast memory.
+Currently only Adafruit FRAM SPI is supported.
+```
+#include <supla/storage/fram_spi.h>
+// Hardware SPI
+Supla::FramSpi fram(FRAM_CS, SUPLA_STORAGE_OFFSET);
+```
+or with SW SPI:
+```
+// Software SPI
+Supla::FramSpi fram(SCK_PIN, MISO_PIN, MOSI_PIN, FRAM_CS, SUPLA_STORAGE_OFFSET);
+```
+
+## History
+
+Version 2.3.0
+
+
+## Credits
+
+
+## License
+
+
+Please check it [here](https://github.com/SUPLA/supla-cloud/blob/master/LICENSE).
+
diff --git a/lib/SuplaDevice/src/CMakeLists.txt b/lib/SuplaDevice/src/CMakeLists.txt
index a4a988b7..0a9d65ff 100644
--- a/lib/SuplaDevice/src/CMakeLists.txt
+++ b/lib/SuplaDevice/src/CMakeLists.txt
@@ -4,6 +4,11 @@ set(SRCS
   supla/channel_extended.cpp
   supla/io.cpp
   supla/tools.cpp
+  supla/element.cpp
+  supla/local_action.cpp
+  supla/channel_element.cpp
+  supla/control/internal_pin_output.cpp
+  supla/control/pin_status_led.cpp
 )
 
 add_library(supladevicelib SHARED ${SRCS})
diff --git a/lib/SuplaDevice/src/supla/action_handler.h b/lib/SuplaDevice/src/supla/action_handler.h
new file mode 100644
index 00000000..b0e38d63
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/action_handler.h
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _action_handler_h
+#define _action_handler_h
+
+namespace Supla {
+class ActionHandler {
+ public:
+  virtual void handleAction(int event, int action) = 0;
+};
+
+};
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/actions.h b/lib/SuplaDevice/src/supla/actions.h
index e44a2647..eac71d00 100644
--- a/lib/SuplaDevice/src/supla/actions.h
+++ b/lib/SuplaDevice/src/supla/actions.h
@@ -17,9 +17,9 @@
 #ifndef _actions_h
 #define _actions_h
 
-// Actions are used in triggerable elements. They are grouped by most common
+// Actions are used in ActionHandler elements. They are grouped by most common
 // usage, but you should not rely on it. Please check exact supported actions
-// in triggerable element documentation
+// in ActionHandler's element documentation
 
 namespace Supla {
 enum Action {
diff --git a/lib/SuplaDevice/src/supla/channel.cpp b/lib/SuplaDevice/src/supla/channel.cpp
index c0c231b0..005d8dfa 100644
--- a/lib/SuplaDevice/src/supla/channel.cpp
+++ b/lib/SuplaDevice/src/supla/channel.cpp
@@ -20,6 +20,7 @@
 #include "supla-common/log.h"
 #include "supla-common/srpc.h"
 #include "tools.h"
+#include "events.h"
 
 namespace Supla {
 
@@ -55,6 +56,7 @@ void Channel::setNewValue(double dbl) {
     float2DoublePacked(dbl, (uint8_t *)(newValue));
   }
   if (setNewValue(newValue)) {
+    runAction(ON_CHANGE);
     supla_log(LOG_DEBUG, "Channel(%d) value changed to %f", channelNumber, dbl);
   }
 }
@@ -68,6 +70,7 @@ void Channel::setNewValue(double temp, double humi) {
   memcpy(&(newValue[4]), &h, 4);
 
   if (setNewValue(newValue)) {
+    runAction(ON_CHANGE);
     supla_log(LOG_DEBUG,
               "Channel(%d) value changed to temp(%f), humi(%f)",
               channelNumber,
@@ -83,6 +86,7 @@ void Channel::setNewValue(_supla_int64_t value) {
 
   memcpy(newValue, &value, sizeof(_supla_int64_t));
   if (setNewValue(newValue)) {
+    runAction(ON_CHANGE);
     supla_log(
         LOG_DEBUG, "Channel(%d) value changed to %d", channelNumber, static_cast<int>(value));
   }
@@ -95,6 +99,7 @@ void Channel::setNewValue(_supla_int_t value) {
 
   memcpy(newValue, &value, sizeof(value));
   if (setNewValue(newValue)) {
+    runAction(ON_CHANGE);
     supla_log(
         LOG_DEBUG, "Channel(%d) value changed to %d", channelNumber, value);
   }
@@ -107,6 +112,13 @@ void Channel::setNewValue(bool value) {
 
   newValue[0] = value;
   if (setNewValue(newValue)) {
+    if (value) {
+      runAction(Supla::ON_TURN_ON);
+    } else {
+      runAction(Supla::ON_TURN_OFF);
+    }
+    runAction(Supla::ON_CHANGE);
+
     supla_log(
         LOG_DEBUG, "Channel(%d) value changed to %d", channelNumber, value);
   }
@@ -237,6 +249,7 @@ void Channel::setNewValue(uint8_t red,
   newValue[3] = green;
   newValue[4] = red;
   if (setNewValue(newValue)) {
+    runAction(ON_CHANGE);
     supla_log(LOG_DEBUG, "Channel(%d) value changed to RGB(%d, %d, %d), colBr(%d), bright(%d)", channelNumber, red, green, blue, colorBrightness, brightness);
   }
 }
diff --git a/lib/SuplaDevice/src/supla/channel.h b/lib/SuplaDevice/src/supla/channel.h
index a91d347f..453d6f88 100644
--- a/lib/SuplaDevice/src/supla/channel.h
+++ b/lib/SuplaDevice/src/supla/channel.h
@@ -19,11 +19,12 @@
 
 #include <stdint.h>
 
-#include "../supla-common/proto.h"
+#include "supla-common/proto.h"
+#include "local_action.h"
 
 namespace Supla {
 
-class Channel {
+class Channel : public LocalAction {
  public:
   Channel();
   ~Channel();
diff --git a/lib/SuplaDevice/src/supla/channel_element.cpp b/lib/SuplaDevice/src/supla/channel_element.cpp
new file mode 100644
index 00000000..2a5da7b8
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/channel_element.cpp
@@ -0,0 +1,31 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "channel_element.h"
+
+Supla::Channel *Supla::ChannelElement::getChannel() {
+  return &channel;
+}
+
+void Supla::ChannelElement::addAction(int action, ActionHandler &client, int event) {
+  channel.addAction(action, client, event);
+}
+
+void Supla::ChannelElement::addAction(int action, ActionHandler *client, int event) {
+  addAction(action, *client, event);
+}
+
+
diff --git a/lib/SuplaDevice/src/supla/channel_element.h b/lib/SuplaDevice/src/supla/channel_element.h
new file mode 100644
index 00000000..372a72f0
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/channel_element.h
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _channel_element_h
+#define _channel_element_h
+
+#include "element.h"
+#include "channel.h"
+#include "local_action.h"
+#include "action_handler.h"
+
+namespace Supla {
+
+class ChannelElement : public Element, public LocalAction {
+  public:
+  
+  Channel *getChannel();
+
+  // Override local action methods in order to delegate execution to Channel
+  void addAction(int action, ActionHandler &client, int event);
+  void addAction(int action, ActionHandler *client, int event);
+
+  protected:
+    Channel channel;
+};
+
+};
+
+#endif
+
diff --git a/lib/SuplaDevice/src/supla/control/internal_pin_output.cpp b/lib/SuplaDevice/src/supla/control/internal_pin_output.cpp
new file mode 100644
index 00000000..c889cb40
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/internal_pin_output.cpp
@@ -0,0 +1,124 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <Arduino.h>
+
+#include "internal_pin_output.h"
+#include "../events.h"
+
+Supla::Control::InternalPinOutput::InternalPinOutput(int pin, bool highIsOn)
+    : pin(pin),
+      highIsOn(highIsOn),
+      stateOnInit(STATE_ON_INIT_OFF),
+      storedTurnOnDurationMs(0),
+      durationTimestamp(0),
+      durationMs(0) {
+}
+
+Supla::Control::InternalPinOutput &
+Supla::Control::InternalPinOutput::setDefaultStateOn() {
+  stateOnInit = STATE_ON_INIT_ON;
+  return *this;
+}
+Supla::Control::InternalPinOutput &
+Supla::Control::InternalPinOutput::setDefaultStateOff() {
+  stateOnInit = STATE_ON_INIT_OFF;
+  return *this;
+}
+
+uint8_t Supla::Control::InternalPinOutput::pinOnValue() {
+  return highIsOn ? HIGH : LOW;
+}
+
+uint8_t Supla::Control::InternalPinOutput::pinOffValue() {
+  return highIsOn ? LOW : HIGH;
+}
+
+void Supla::Control::InternalPinOutput::turnOn(_supla_int_t duration) {
+  durationMs = duration;
+  durationTimestamp = millis();
+  if (storedTurnOnDurationMs) {
+    durationMs = storedTurnOnDurationMs;
+  }
+
+  runAction(Supla::ON_TURN_ON); 
+  runAction(Supla::ON_CHANGE); 
+
+  Supla::Io::digitalWrite(pin, pinOnValue());
+}
+
+void Supla::Control::InternalPinOutput::turnOff(_supla_int_t duration) {
+  durationMs = duration;
+  durationTimestamp = millis();
+
+  runAction(Supla::ON_TURN_OFF); 
+  runAction(Supla::ON_CHANGE); 
+
+  Supla::Io::digitalWrite(pin, pinOffValue());
+}
+
+bool Supla::Control::InternalPinOutput::isOn() {
+  return Supla::Io::digitalRead(pin) == pinOnValue();
+}
+
+void Supla::Control::InternalPinOutput::toggle(_supla_int_t duration) {
+  if (isOn()) {
+    turnOff(duration);
+  } else {
+    turnOn(duration);
+  }
+}
+
+void Supla::Control::InternalPinOutput::handleAction(int event, int action) {
+  (void)(event);
+  switch (action) {
+    case TURN_ON: {
+      turnOn();
+      break;
+    }
+    case TURN_OFF: {
+      turnOff();
+      break;
+    }
+    case TOGGLE: {
+      toggle();
+      break;
+    }
+  }
+}
+
+void Supla::Control::InternalPinOutput::onInit() {
+  if (stateOnInit == STATE_ON_INIT_ON) {
+    turnOn();
+  } else {
+    turnOff();
+  }
+
+  Supla::Io::pinMode(
+      pin, OUTPUT);  // pin mode is set after setting pin value in order to
+                     // avoid problems with LOW trigger relays
+}
+void Supla::Control::InternalPinOutput::iterateAlways() {
+  if (durationMs && millis() - durationTimestamp > durationMs) {
+    toggle();
+  }
+}
+
+Supla::Control::InternalPinOutput &
+Supla::Control::InternalPinOutput::setDurationMs(_supla_int_t duration) {
+  storedTurnOnDurationMs = duration;
+  return *this;
+}
diff --git a/lib/SuplaDevice/src/supla/control/internal_pin_output.h b/lib/SuplaDevice/src/supla/control/internal_pin_output.h
new file mode 100644
index 00000000..e1efe8bd
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/internal_pin_output.h
@@ -0,0 +1,67 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _internal_pin_output_h
+#define _internal_pin_output_h
+
+#include "../action_handler.h"
+#include "../actions.h"
+#include "../element.h"
+#include "../io.h"
+#include "../local_action.h"
+
+#define STATE_ON_INIT_OFF 0
+#define STATE_ON_INIT_ON  1
+
+namespace Supla {
+namespace Control {
+class InternalPinOutput : public Element,
+                          public ActionHandler,
+                          public LocalAction {
+ public:
+  InternalPinOutput(int pin, bool highIsOn = true);
+
+  virtual InternalPinOutput &setDefaultStateOn();
+  virtual InternalPinOutput &setDefaultStateOff();
+  virtual InternalPinOutput &setDurationMs(_supla_int_t duration);
+
+  virtual uint8_t pinOnValue();
+  virtual uint8_t pinOffValue();
+  virtual void turnOn(_supla_int_t duration = 0);
+  virtual void turnOff(_supla_int_t duration = 0);
+  virtual bool isOn();
+  virtual void toggle(_supla_int_t duration = 0);
+
+  void handleAction(int event, int action);
+
+  void onInit();
+  void iterateAlways();
+
+ protected:
+  int pin;
+  bool highIsOn;
+
+  int8_t stateOnInit;
+
+  unsigned _supla_int_t durationMs;
+  unsigned _supla_int_t storedTurnOnDurationMs;
+  unsigned long durationTimestamp;
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/pin_status_led.cpp b/lib/SuplaDevice/src/supla/control/pin_status_led.cpp
new file mode 100644
index 00000000..dd4d89e3
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/pin_status_led.cpp
@@ -0,0 +1,48 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <Arduino.h>
+
+#include "../io.h"
+#include "pin_status_led.h"
+
+Supla::Control::PinStatusLed::PinStatusLed(uint8_t srcPin,
+                                           uint8_t outPin,
+                                           bool invert)
+    : srcPin(srcPin), outPin(outPin), invert(invert) {
+}
+
+void Supla::Control::PinStatusLed::onInit() {
+  updatePin();
+  Supla::Io::pinMode(outPin, OUTPUT);
+}
+
+void Supla::Control::PinStatusLed::iterateAlways() {
+  updatePin();
+}
+
+void Supla::Control::PinStatusLed::setInvertedLogic(bool invertedLogic) {
+  invert = invertedLogic;
+  updatePin();
+}
+
+void Supla::Control::PinStatusLed::updatePin() {
+  int value = Supla::Io::digitalRead(srcPin);
+  value = invert ? !value : value;
+  if (value != Supla::Io::digitalRead(outPin)) {
+    Supla::Io::digitalWrite(outPin, value);
+  }
+}
diff --git a/lib/SuplaDevice/src/supla/control/pin_status_led.h b/lib/SuplaDevice/src/supla/control/pin_status_led.h
new file mode 100644
index 00000000..39d2fc0a
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/pin_status_led.h
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _pin_status_led_h
+#define _pin_status_led_h
+
+#include "../element.h"
+
+namespace Supla {
+namespace Control {
+class PinStatusLed : public Element {
+ public:
+  PinStatusLed(uint8_t srcPin, uint8_t outPin, bool invert = false);
+
+  void onInit();
+  void iterateAlways();
+  void setInvertedLogic(bool invertedLogic);
+
+ protected:
+  void updatePin();
+
+  uint8_t srcPin;
+  uint8_t outPin;
+  bool invert;
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/relay.cpp b/lib/SuplaDevice/src/supla/control/relay.cpp
index d47fd9a2..488e9b3c 100644
--- a/lib/SuplaDevice/src/supla/control/relay.cpp
+++ b/lib/SuplaDevice/src/supla/control/relay.cpp
@@ -123,7 +123,7 @@ void Relay::toggle(_supla_int_t duration) {
   }
 }
 
-void Relay::runAction(int event, int action) {
+void Relay::handleAction(int event, int action) {
   (void)(event);
   switch (action) {
     case TURN_ON: {
@@ -141,10 +141,6 @@ void Relay::runAction(int event, int action) {
   }
 }
 
-Channel *Relay::getChannel() {
-  return &channel;
-}
-
 void Relay::onSaveState() {
   Supla::Storage::WriteState((unsigned char *)&storedTurnOnDurationMs,
                              sizeof(storedTurnOnDurationMs));
@@ -202,3 +198,7 @@ Relay &Relay::keepTurnOnDuration(bool keep) {
   keepTurnOnDurationMs = keep;
   return *this;
 }
+
+unsigned _supla_int_t Relay::getStoredTurnOnDurationMs() {
+  return storedTurnOnDurationMs;
+}
diff --git a/lib/SuplaDevice/src/supla/control/relay.h b/lib/SuplaDevice/src/supla/control/relay.h
index ce9effb9..dcbf6f6e 100644
--- a/lib/SuplaDevice/src/supla/control/relay.h
+++ b/lib/SuplaDevice/src/supla/control/relay.h
@@ -25,11 +25,11 @@
 #include <Arduino.h>
 
 #include "../actions.h"
-#include "../channel.h"
-#include "../element.h"
+#include "../channel_element.h"
 #include "../io.h"
 #include "../storage/storage.h"
-#include "../triggerable.h"
+#include "../action_handler.h"
+#include "../local_action.h"
 
 #define STATE_ON_INIT_RESTORED_OFF -3
 #define STATE_ON_INIT_RESTORED_ON -2
@@ -39,7 +39,7 @@
 
 namespace Supla {
 namespace Control {
-class Relay : public Element, public Triggerable {
+class Relay : public ChannelElement, public ActionHandler {
  public:
   Relay(int pin,
         bool highIsOn = true,
@@ -58,18 +58,16 @@ class Relay : public Element, public Triggerable {
   virtual bool isOn();
   virtual void toggle(_supla_int_t duration = 0);
 
-  void runAction(int event, int action);
+  void handleAction(int event, int action);
 
   void onInit();
   void onLoadState();
   void onSaveState();
   void iterateAlways();
   int handleNewValueFromServer(TSD_SuplaChannelNewValue *newValue);
-
-  Channel *getChannel();
+  unsigned _supla_int_t getStoredTurnOnDurationMs();
 
  protected:
-  Channel channel;
   int pin;
   bool highIsOn;
 
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
index 461b69b8..e43cb80a 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
@@ -121,7 +121,7 @@ uint8_t RGBWBase::addWithLimit(int value, int addition, int limit) {
   return value + addition;
 }
 
-void RGBWBase::runAction(int event, int action) {
+void RGBWBase::handleAction(int event, int action) {
   (void)(event);
   switch (action) {
     case TURN_ON: {
@@ -308,10 +308,6 @@ void RGBWBase::iterateDimmerRGBW(int rgbStep, int wStep) {
       addWithLimit(curBrightness, wStep, 100));
 }
 
-Channel *RGBWBase::getChannel() {
-  return &channel;
-}
-
 void RGBWBase::setStep(int step) {
   buttonStep = step;
 }
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.h b/lib/SuplaDevice/src/supla/control/rgbw_base.h
index 17f733d8..58b9d487 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.h
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.h
@@ -21,13 +21,12 @@
 #include <stdint.h>
 
 #include "../actions.h"
-#include "../channel.h"
-#include "../element.h"
-#include "../triggerable.h"
+#include "../channel_element.h"
+#include "../action_handler.h"
 
 namespace Supla {
 namespace Control {
-class RGBWBase : public Element, public Triggerable {
+class RGBWBase : public ChannelElement, public ActionHandler {
  public:
   RGBWBase();
 
@@ -44,7 +43,7 @@ class RGBWBase : public Element, public Triggerable {
   virtual void turnOn();
   virtual void turnOff();
   virtual void toggle();
-  void runAction(int event, int action);
+  void handleAction(int event, int action);
   void setStep(int step);
   void setDefaultDimmedBrightness(int dimmedBrightness);
   void setFadeEffectTime(int timeMs);
@@ -56,13 +55,10 @@ class RGBWBase : public Element, public Triggerable {
         curRed, curGreen, curBlue, curColorBrightness, curBrightness);
   }
 
-  Channel *getChannel();
-
  protected:
   uint8_t addWithLimit(int value, int addition, int limit = 255);
   void iterateDimmerRGBW(int rgbStep, int wStep);
 
-  Channel channel;
   uint8_t buttonStep;               // 10
   uint8_t curRed;                   // 0 - 255
   uint8_t curGreen;                 // 0 - 255
diff --git a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
index 56102b77..237b54aa 100644
--- a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
+++ b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
@@ -127,7 +127,7 @@ void RollerShutter::setOpenCloseTime(uint32_t newClosingTimeMs,
   }
 }
 
-void RollerShutter::runAction(int event, int action) {
+void RollerShutter::handleAction(int event, int action) {
   (void)(event);
   switch (action) {
     case CLOSE_OR_STOP: {
@@ -468,10 +468,6 @@ void RollerShutter::onTimer() {
                           // }
 }
 
-Channel *RollerShutter::getChannel() {
-  return &channel;
-}
-
 void RollerShutter::configComfortUpValue(uint8_t position) {
   comfortUpValue = position;
   if (comfortUpValue > 100) {
diff --git a/lib/SuplaDevice/src/supla/control/roller_shutter.h b/lib/SuplaDevice/src/supla/control/roller_shutter.h
index 716a121e..d9a55233 100644
--- a/lib/SuplaDevice/src/supla/control/roller_shutter.h
+++ b/lib/SuplaDevice/src/supla/control/roller_shutter.h
@@ -20,9 +20,8 @@
 #include <Arduino.h>
 
 #include "../io.h"
-#include "../channel.h"
-#include "../element.h"
-#include "../triggerable.h"
+#include "../channel_element.h"
+#include "../action_handler.h"
 #include "../actions.h"
 
 #define UNKNOWN_POSITION    -1
@@ -35,12 +34,12 @@ namespace Control {
 
 enum Directions { STOP_DIR, DOWN_DIR, UP_DIR };
 
-class RollerShutter : public Element, public Triggerable {
+class RollerShutter : public ChannelElement, public ActionHandler {
  public:
   RollerShutter(int pinUp, int pinDown, bool highIsOn = true);
 
   int handleNewValueFromServer(TSD_SuplaChannelNewValue *newValue);
-  void runAction(int event, int action);
+  void handleAction(int event, int action);
 
   void close(); // Sets target position to 100%
   void open();  // Sets target position to 0%
@@ -59,8 +58,6 @@ class RollerShutter : public Element, public Triggerable {
   void onLoadState();
   void onSaveState();
 
-  Channel *getChannel();
-
  protected:
   virtual void stopMovement();
   virtual void relayDownOn();
@@ -76,8 +73,6 @@ class RollerShutter : public Element, public Triggerable {
   bool lastDirectionWasClose();
   bool inMove();
 
-  Channel channel;
-
   uint32_t closingTimeMs;
   uint32_t openingTimeMs;
   bool calibrate; // set to true when new closing/opening time is given - calibration is done to sync roller shutter position
diff --git a/lib/SuplaDevice/src/supla/control/virtual_relay.cpp b/lib/SuplaDevice/src/supla/control/virtual_relay.cpp
new file mode 100644
index 00000000..9cfc3ea8
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/virtual_relay.cpp
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "virtual_relay.h"
+
+Supla::Control::VirtualRelay::VirtualRelay(_supla_int_t functions)
+    : Relay(-1, true, functions), state(false) {
+}
+
+void Supla::Control::VirtualRelay::onInit() {
+  if (stateOnInit == STATE_ON_INIT_ON ||
+      stateOnInit == STATE_ON_INIT_RESTORED_ON) {
+    turnOn();
+  } else {
+    turnOff();
+  }
+}
+
+void Supla::Control::VirtualRelay::turnOn(_supla_int_t duration) {
+  durationMs = duration;
+  durationTimestamp = millis();
+  if (keepTurnOnDurationMs) {
+    durationMs = storedTurnOnDurationMs;
+  }
+  state = true;
+
+  channel.setNewValue(state);
+  // Schedule save in 5 s after state change
+  Supla::Storage::ScheduleSave(5000);
+}
+
+void Supla::Control::VirtualRelay::turnOff(_supla_int_t duration) {
+  durationMs = duration;
+  durationTimestamp = millis();
+  state = false;
+
+  channel.setNewValue(state);
+  // Schedule save in 5 s after state change
+  Supla::Storage::ScheduleSave(5000);
+}
+
+bool Supla::Control::VirtualRelay::isOn() {
+  return state;
+}
diff --git a/lib/SuplaDevice/src/supla/control/virtual_relay.h b/lib/SuplaDevice/src/supla/control/virtual_relay.h
index 15ed52a4..ee51affd 100644
--- a/lib/SuplaDevice/src/supla/control/virtual_relay.h
+++ b/lib/SuplaDevice/src/supla/control/virtual_relay.h
@@ -24,45 +24,12 @@ namespace Control {
 class VirtualRelay : public Relay {
  public:
   VirtualRelay(_supla_int_t functions =
-                   (0xFF ^ SUPLA_BIT_FUNC_CONTROLLINGTHEROLLERSHUTTER))
-      : Relay(-1, true, functions), state(false) {
-  }
+                   (0xFF ^ SUPLA_BIT_FUNC_CONTROLLINGTHEROLLERSHUTTER));
 
-  void onInit() {
-    if (stateOnInit == STATE_ON_INIT_ON ||
-        stateOnInit == STATE_ON_INIT_RESTORED_ON) {
-      turnOn();
-    } else {
-      turnOff();
-    }
-  }
-
-  void turnOn(_supla_int_t duration = 0) {
-    durationMs = duration;
-    durationTimestamp = millis();
-    if (keepTurnOnDurationMs) {
-      durationMs = storedTurnOnDurationMs;
-    }
-    state = true;
-
-    channel.setNewValue(state);
-    // Schedule save in 5 s after state change
-    Supla::Storage::ScheduleSave(5000);
-  }
-
-  virtual void turnOff(_supla_int_t duration = 0) {
-    durationMs = duration;
-    durationTimestamp = millis();
-    state = false;
-
-    channel.setNewValue(state);
-    // Schedule save in 5 s after state change
-    Supla::Storage::ScheduleSave(5000);
-  }
-
-  virtual bool isOn() {
-    return state;
-  }
+  void onInit(); 
+  void turnOn(_supla_int_t duration = 0);
+  void turnOff(_supla_int_t duration = 0);
+  bool isOn();
 
  protected:
   bool state;
diff --git a/lib/SuplaDevice/src/supla/crc16.h b/lib/SuplaDevice/src/supla/crc16.h
new file mode 100644
index 00000000..5713f7bd
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/crc16.h
@@ -0,0 +1,14 @@
+
+uint16_t crc16_update(uint16_t crc, uint8_t a) {
+  int i;
+
+  crc ^= a;
+  for (i = 0; i < 8; ++i) {
+    if (crc & 1)
+      crc = (crc >> 1) ^ 0xA001;
+    else
+      crc = (crc >> 1);
+  }
+
+  return crc;
+}
diff --git a/lib/SuplaDevice/src/supla/element.cpp b/lib/SuplaDevice/src/supla/element.cpp
index ac879eb5..70fc8a11 100644
--- a/lib/SuplaDevice/src/supla/element.cpp
+++ b/lib/SuplaDevice/src/supla/element.cpp
@@ -29,6 +29,20 @@ Element::Element() : nextPtr(nullptr) {
   }
 }
 
+Element::~Element() {
+  if (begin() == this) {
+    firstPtr = next();
+    return;
+  }
+
+  auto ptr = begin();
+  while (ptr->next() != this) {
+    ptr = ptr->next();
+  }
+
+  ptr->nextPtr = ptr->next()->next();
+}
+
 Element *Element::begin() {
   return firstPtr;
 }
diff --git a/lib/SuplaDevice/src/supla/element.h b/lib/SuplaDevice/src/supla/element.h
index 82f76341..34e48cc5 100644
--- a/lib/SuplaDevice/src/supla/element.h
+++ b/lib/SuplaDevice/src/supla/element.h
@@ -27,6 +27,7 @@ namespace Supla {
 class Element {
  public:
   Element();
+  virtual ~Element();
   static Element *begin();
   static Element *last();
   static Element *getElementByChannelNumber(int channelNumber);
diff --git a/lib/SuplaDevice/src/supla/events.h b/lib/SuplaDevice/src/supla/events.h
index cadbb616..7bda4e79 100644
--- a/lib/SuplaDevice/src/supla/events.h
+++ b/lib/SuplaDevice/src/supla/events.h
@@ -37,7 +37,9 @@ enum Event {
   ON_CLICK_10,
   ON_CRAZY_CLICKER,  // triggered on >= 10 clicks 
   ON_SEQUENCE_MATCH,        // triggered by SequenceButton 
-  ON_SEQUENCE_DOESNT_MATCH  // triggered by SequenceButton
+  ON_SEQUENCE_DOESNT_MATCH,  // triggered by SequenceButton
+  ON_TURN_ON,
+  ON_TURN_OFF
 };
 
 };
diff --git a/lib/SuplaDevice/src/supla/io.cpp b/lib/SuplaDevice/src/supla/io.cpp
index 84c8684d..6132709c 100644
--- a/lib/SuplaDevice/src/supla/io.cpp
+++ b/lib/SuplaDevice/src/supla/io.cpp
@@ -66,6 +66,10 @@ Io::Io() {
   ioInstance = this;
 }
 
+Io::~Io() {
+  ioInstance = nullptr;
+}
+
 int Io::customDigitalRead(int channelNumber, uint8_t pin) {
   (void)(channelNumber);
   return ::digitalRead(pin);
diff --git a/lib/SuplaDevice/src/supla/io.h b/lib/SuplaDevice/src/supla/io.h
index 722d6685..918ceb0b 100644
--- a/lib/SuplaDevice/src/supla/io.h
+++ b/lib/SuplaDevice/src/supla/io.h
@@ -40,6 +40,7 @@ class Io {
   static Io *ioInstance;
 
   Io();
+  virtual ~Io();
   virtual void customPinMode(int channelNumber, uint8_t pin, uint8_t mode);
   virtual int customDigitalRead(int channelNumber, uint8_t pin);
   virtual void customDigitalWrite(int channelNumber, uint8_t pin, uint8_t val);
diff --git a/lib/SuplaDevice/src/supla/local_action.cpp b/lib/SuplaDevice/src/supla/local_action.cpp
index cc4c08eb..c7c70076 100644
--- a/lib/SuplaDevice/src/supla/local_action.cpp
+++ b/lib/SuplaDevice/src/supla/local_action.cpp
@@ -18,29 +18,84 @@
 
 namespace Supla {
 
-LocalAction::LocalAction() : registeredClientsCount(0) {
-}
+class ActionHandlerClient;
+
+class ActionHandlerClient {
+ public:
+  ActionHandlerClient()
+      : trigger(nullptr),
+        client(nullptr),
+        next(nullptr),
+        onEvent(0),
+        action(0) {
+    if (begin == nullptr) {
+      begin = this;
+    } else {
+      auto ptr = begin;
+      while (ptr->next) {
+        ptr = ptr->next;
+      }
+      ptr->next = this;
+    }
+  }
+
+  ~ActionHandlerClient() {
+    if (begin == this) {
+      begin = next;
+      return;
+    }
+
+    auto ptr = begin;
+    while (ptr->next != this) {
+      ptr = ptr->next;
+    }
 
-void LocalAction::addAction(int action, Triggerable &client, int event) {
-  if (registeredClientsCount < MAX_TRIGGERABLE_CLIENTS) {
-    clients[registeredClientsCount].client = &client;
-    clients[registeredClientsCount].onEvent = event;
-    clients[registeredClientsCount].action = action;
-    registeredClientsCount++;
+    ptr->next = ptr->next->next;
   }
+
+  LocalAction *trigger;
+  ActionHandler *client;
+  ActionHandlerClient *next;
+  uint8_t onEvent;
+  uint8_t action;
+  static ActionHandlerClient *begin;
+};
+
+ActionHandlerClient *ActionHandlerClient::begin = nullptr;
+
+LocalAction::~LocalAction() {
+  auto ptr = ActionHandlerClient::begin;
+  while (ptr) {
+    if (ptr->trigger == this) {
+      auto tbdptr = ptr;
+      ptr = ptr->next;
+      delete tbdptr;
+    } else {
+      ptr = ptr->next;
+    }
+  }
+}
+
+void LocalAction::addAction(int action, ActionHandler &client, int event) {
+  auto ptr = new ActionHandlerClient;
+  ptr->trigger = this;
+  ptr->client = &client;
+  ptr->onEvent = event;
+  ptr->action = action;
 }
 
-void LocalAction::addAction(int action, Triggerable *client, int event) {
+void LocalAction::addAction(int action, ActionHandler *client, int event) {
   addAction(action, *client, event);
 }
 
 void LocalAction::runAction(int event) {
-  for (int i = 0; i < registeredClientsCount; i++) {
-    if (clients[i].onEvent == event) {
-      clients[i].client->runAction(event, clients[i].action);
+  auto ptr = ActionHandlerClient::begin;
+  while (ptr) {
+    if (ptr->trigger == this && ptr->onEvent == event) {
+      ptr->client->handleAction(event, ptr->action);
     }
+    ptr = ptr->next;
   }
 }
 
 };  // namespace Supla
-
diff --git a/lib/SuplaDevice/src/supla/local_action.h b/lib/SuplaDevice/src/supla/local_action.h
index 4ec39711..1d5ff129 100644
--- a/lib/SuplaDevice/src/supla/local_action.h
+++ b/lib/SuplaDevice/src/supla/local_action.h
@@ -18,31 +18,18 @@
 #define _local_action_h
 
 #include <stdint.h>
-#include "triggerable.h"
-
-#define MAX_TRIGGERABLE_CLIENTS 10
+#include "action_handler.h"
 
 namespace Supla {
 
-class TriggerableClient {
- public:
-  Triggerable *client;
-  uint8_t onEvent;
-  uint8_t action;
-};
-
 class LocalAction {
  public:
-  LocalAction();
-
-  virtual void addAction(int action, Triggerable &client, int event);
-  virtual void addAction(int action, Triggerable *client, int event);
+  virtual ~LocalAction();
+  virtual void addAction(int action, ActionHandler &client, int event);
+  virtual void addAction(int action, ActionHandler *client, int event);
 
   virtual void runAction(int event);
 
- protected:
-  TriggerableClient clients[MAX_TRIGGERABLE_CLIENTS];
-  uint8_t registeredClientsCount;
 };
 
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/sensor/HC_SR04.h b/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
index 6750ba73..780aad11 100644
--- a/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
+++ b/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
@@ -26,9 +26,15 @@ namespace Supla {
 namespace Sensor {
 class HC_SR04 : public Distance {
  public:
-  HC_SR04(int8_t trigPin, int8_t echoPin) : failCount(0), lastDuration(0) {
+  HC_SR04(int8_t trigPin, int8_t echoPin, int16_t minIn = 0,
+          int16_t maxIn = 500, int16_t minOut = 0, int16_t maxOut = 500)
+      : failCount(0), lastDuration(0) {
     _trigPin = trigPin;
     _echoPin = echoPin;
+    _minIn = minIn;
+    _maxIn = maxIn;
+    _minOut = minOut;
+    _maxOut = maxOut;
   }
   void onInit() {
     pinMode(_trigPin, OUTPUT);
@@ -53,18 +59,39 @@ class HC_SR04 : public Distance {
       failCount++;
     }
 
-    return failCount <= 3 ? duration * 0.034 / 2 / 100 : DISTANCE_NOT_AVAILABLE;
+    long distance = (duration / 2) / 29.1;
+    long value = map(distance, _minIn, _maxIn, _minOut, _maxOut);
+    if (_minOut < _maxOut) {
+      value = constrain(value, _minOut, _maxOut);
+    } else {
+      value = constrain(value, _maxOut, _minOut);
+    }
+    return failCount <= 3 ? (float)value / 100 : DISTANCE_NOT_AVAILABLE;
+  }
+
+  void setMinMaxIn(int16_t minIn, int16_t maxIn) {
+    _minIn = minIn;
+    _maxIn = maxIn;
+  }
+
+  void setMinMaxOut(int16_t minOut, int16_t maxOut) {
+    _minOut = minOut;
+    _maxOut = maxOut;
   }
 
- protected:
+protected:
   int8_t _trigPin;
   int8_t _echoPin;
+  int16_t _minIn;
+  int16_t _maxIn;
+  int16_t _minOut;
+  int16_t _maxOut;
   char failCount;
   bool ready;
   unsigned long lastDuration;
 };
 
-};  // namespace Sensor
-};  // namespace Supla
+}; // namespace Sensor
+}; // namespace Supla
 
 #endif
diff --git a/lib/SuplaDevice/src/supla/sensor/binary.cpp b/lib/SuplaDevice/src/supla/sensor/binary.cpp
index b305457d..162b9d0c 100644
--- a/lib/SuplaDevice/src/supla/sensor/binary.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/binary.cpp
@@ -39,7 +39,3 @@ void Supla::Sensor::Binary::onInit() {
       channel.getChannelNumber(), pin, pullUp ? INPUT_PULLUP : INPUT);
   channel.setNewValue(getValue());
 }
-
-Supla::Channel *Supla::Sensor::Binary::getChannel() {
-  return &channel;
-}
diff --git a/lib/SuplaDevice/src/supla/sensor/binary.h b/lib/SuplaDevice/src/supla/sensor/binary.h
index 4e5e41b9..994ca7ae 100644
--- a/lib/SuplaDevice/src/supla/sensor/binary.h
+++ b/lib/SuplaDevice/src/supla/sensor/binary.h
@@ -19,22 +19,18 @@
 
 #include <Arduino.h>
 
-#include "../channel.h"
-#include "../element.h"
+#include "../channel_element.h"
 
 namespace Supla {
 namespace Sensor {
-class Binary : public Element {
+class Binary : public ChannelElement {
  public:
   Binary(int pin, bool pullUp);
   bool getValue();
   void iterateAlways();
   void onInit();
-  Channel *getChannel();
 
  protected:
-
-  Channel channel;
   int pin;
   bool pullUp;
   unsigned long lastReadTime;
diff --git a/lib/SuplaDevice/src/supla/sensor/distance.h b/lib/SuplaDevice/src/supla/sensor/distance.h
index a24a8c74..29488800 100644
--- a/lib/SuplaDevice/src/supla/sensor/distance.h
+++ b/lib/SuplaDevice/src/supla/sensor/distance.h
@@ -17,14 +17,13 @@
 #ifndef _distance_h
 #define _distance_h
 
-#include "supla/channel.h"
-#include "supla/element.h"
+#include "supla/channel_element.h"
 
 #define DISTANCE_NOT_AVAILABLE -1.0
 
 namespace Supla {
 namespace Sensor {
-class Distance : public Element {
+class Distance : public ChannelElement {
  public:
   Distance() : lastReadTime(0) {
     channel.setType(SUPLA_CHANNELTYPE_DISTANCESENSOR);
@@ -43,12 +42,7 @@ class Distance : public Element {
     }
   }
 
-  Channel *getChannel() {
-    return &channel;
-  }
-
  protected:
-  Channel channel;
   unsigned long lastReadTime;
 };
 
diff --git a/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h b/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h
index ec5e5661..96afc2ec 100644
--- a/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h
+++ b/lib/SuplaDevice/src/supla/sensor/general_purpose_measurement_base.h
@@ -17,12 +17,11 @@
 #ifndef _general_purpose_measurement_h
 #define _general_purpose_measurement_h
 
-#include "supla/element.h"
-#include "supla/channel.h"
+#include "supla/channel_element.h"
 
 namespace Supla {
 namespace Sensor {
-class GeneralPurposeMeasurementBase : public Element {
+class GeneralPurposeMeasurementBase : public ChannelElement {
  public:
    GeneralPurposeMeasurementBase() : lastReadTime(0) {
      channel.setType(SUPLA_CHANNELTYPE_GENERAL_PURPOSE_MEASUREMENT);
@@ -37,12 +36,7 @@ class GeneralPurposeMeasurementBase : public Element {
     }
   }
 
-  Channel *getChannel() {
-    return &channel;
-  }
-
  protected:
-  Channel channel;
   unsigned long lastReadTime;
 };
 
diff --git a/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp b/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp
index 4589a9fd..9e641c4a 100644
--- a/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/impulse_counter.cpp
@@ -15,7 +15,6 @@
 */
 
 #include <Arduino.h>
-#include <crc16.h>
 #include <supla-common/log.h>
 #include <supla/storage/storage.h>
 #include <supla/actions.h>
@@ -101,11 +100,7 @@ void ImpulseCounter::onFastTimer() {
   prevState = currentState;
 }
 
-Supla::Channel *ImpulseCounter::getChannel() {
-  return &channel;
-}
-
-void ImpulseCounter::runAction(int event, int action) {
+void ImpulseCounter::handleAction(int event, int action) {
   (void)(event);
   switch (action) {
     case RESET: {
diff --git a/lib/SuplaDevice/src/supla/sensor/impulse_counter.h b/lib/SuplaDevice/src/supla/sensor/impulse_counter.h
index eed631c3..ef99708c 100644
--- a/lib/SuplaDevice/src/supla/sensor/impulse_counter.h
+++ b/lib/SuplaDevice/src/supla/sensor/impulse_counter.h
@@ -18,13 +18,12 @@
 #define _supla_impulse_counter_h_
 
 #include <supla-common/proto.h>
-#include <supla/channel.h>
-#include <supla/element.h>
-#include <supla/triggerable.h>
+#include <supla/channel_element.h>
+#include <supla/action_handler.h>
 
 namespace Supla {
 namespace Sensor {
-class ImpulseCounter : public Element, public Triggerable {
+class ImpulseCounter : public ChannelElement, public ActionHandler {
  public:
   ImpulseCounter(int _impulsePin,
                  bool _detectLowToHigh = false,
@@ -35,7 +34,7 @@ class ImpulseCounter : public Element, public Triggerable {
   void onLoadState();
   void onSaveState();
   void onFastTimer();
-  void runAction(int event, int action);
+  void handleAction(int event, int action);
 
   // Returns value of a counter at given Supla channel
   _supla_int64_t getCounter();
@@ -46,8 +45,6 @@ class ImpulseCounter : public Element, public Triggerable {
   // Increment the counter by 1
   void incCounter();
 
-  Channel *getChannel();
-
  protected:
   int prevState;  // Store previous state of pin (LOW/HIGH). It is used to track
                   // changes on pin state.
@@ -62,9 +59,6 @@ class ImpulseCounter : public Element, public Triggerable {
   bool inputPullup;
 
   unsigned _supla_int64_t counter;  // Actual count of impulses
-
-  Channel channel;
-
 };
 };  // namespace Sensor
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/sensor/pressure.h b/lib/SuplaDevice/src/supla/sensor/pressure.h
index cdb9a77d..b9c2653c 100644
--- a/lib/SuplaDevice/src/supla/sensor/pressure.h
+++ b/lib/SuplaDevice/src/supla/sensor/pressure.h
@@ -17,14 +17,13 @@
 #ifndef _pressure_h
 #define _pressure_h
 
-#include "supla/channel.h"
-#include "supla/element.h"
+#include "supla/channel_element.h"
 
 #define PRESSURE_NOT_AVAILABLE -1
 
 namespace Supla {
 namespace Sensor {
-class Pressure : public Element {
+class Pressure : public ChannelElement {
  public:
   Pressure() : lastReadTime(0) {
     channel.setType(SUPLA_CHANNELTYPE_PRESSURESENSOR);
@@ -43,12 +42,7 @@ class Pressure : public Element {
     }
   }
 
-  Channel *getChannel() {
-    return &channel;
-  }
-
  protected:
-  Channel channel;
   unsigned long lastReadTime;
 };
 
diff --git a/lib/SuplaDevice/src/supla/sensor/rain.h b/lib/SuplaDevice/src/supla/sensor/rain.h
index 40300bc4..4fdbe177 100644
--- a/lib/SuplaDevice/src/supla/sensor/rain.h
+++ b/lib/SuplaDevice/src/supla/sensor/rain.h
@@ -17,14 +17,13 @@
 #ifndef _rain_h
 #define _rain_h
 
-#include "supla/channel.h"
-#include "supla/element.h"
+#include "supla/channel_element.h"
 
 #define RAIN_NOT_AVAILABLE -1
 
 namespace Supla {
 namespace Sensor {
-class Rain: public Element {
+class Rain: public ChannelElement {
  public:
   Rain() : lastReadTime(0) {
     channel.setType(SUPLA_CHANNELTYPE_RAINSENSOR);
@@ -43,12 +42,7 @@ class Rain: public Element {
     }
   }
 
-  Channel *getChannel() {
-    return &channel;
-  }
-
  protected:
-  Channel channel;
   unsigned long lastReadTime;
 };
 
diff --git a/lib/SuplaDevice/src/supla/sensor/thermometer.cpp b/lib/SuplaDevice/src/supla/sensor/thermometer.cpp
index 9525fb91..e9e8ccbb 100644
--- a/lib/SuplaDevice/src/supla/sensor/thermometer.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/thermometer.cpp
@@ -26,12 +26,9 @@ double Supla::Sensor::Thermometer::getValue() {
 }
 
 void Supla::Sensor::Thermometer::iterateAlways() {
-  if (lastReadTime + 10000 < millis()) {
+  if (millis() - lastReadTime > 10000) {
     lastReadTime = millis();
     channel.setNewValue(getValue());
   }
 }
 
-Supla::Channel *Supla::Sensor::Thermometer::getChannel() {
-  return &channel;
-}
diff --git a/lib/SuplaDevice/src/supla/sensor/thermometer.h b/lib/SuplaDevice/src/supla/sensor/thermometer.h
index 71f810fb..8be2f28a 100644
--- a/lib/SuplaDevice/src/supla/sensor/thermometer.h
+++ b/lib/SuplaDevice/src/supla/sensor/thermometer.h
@@ -18,23 +18,19 @@
 #define _thermometer_h
 
 #include <Arduino.h>
-#include "supla/channel.h"
-#include "supla/element.h"
+#include "supla/channel_element.h"
 
 #define TEMPERATURE_NOT_AVAILABLE -275
 
 namespace Supla {
 namespace Sensor {
-class Thermometer : public Element {
+class Thermometer : public ChannelElement {
  public:
   Thermometer();
   virtual double getValue();
   void iterateAlways();
 
-  Channel *getChannel();
-
  protected:
-  Channel channel;
   unsigned long lastReadTime;
 };
 
diff --git a/lib/SuplaDevice/src/supla/sensor/virtual_binary.cpp b/lib/SuplaDevice/src/supla/sensor/virtual_binary.cpp
index c0a66b5f..04240e0d 100644
--- a/lib/SuplaDevice/src/supla/sensor/virtual_binary.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/virtual_binary.cpp
@@ -38,7 +38,7 @@ void VirtualBinary::onInit() {
   channel.setNewValue(getValue());
 }
 
-void VirtualBinary::runAction(int event, int action) {
+void VirtualBinary::handleAction(int event, int action) {
   (void)(event);
   switch (action) {
     case SET: {
@@ -56,9 +56,5 @@ void VirtualBinary::runAction(int event, int action) {
   }
 }
 
-Channel *VirtualBinary::getChannel() {
-  return &channel;
-}
-
 };  // namespace Sensor
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/sensor/virtual_binary.h b/lib/SuplaDevice/src/supla/sensor/virtual_binary.h
index 62d39b85..94521b89 100644
--- a/lib/SuplaDevice/src/supla/sensor/virtual_binary.h
+++ b/lib/SuplaDevice/src/supla/sensor/virtual_binary.h
@@ -19,24 +19,21 @@
 
 #include <Arduino.h>
 
-#include "../channel.h"
-#include "../element.h"
-#include "../triggerable.h"
+#include "../channel_element.h"
+#include "../action_handler.h"
 #include "../actions.h"
 
 namespace Supla {
 namespace Sensor {
-class VirtualBinary : public Element, public Triggerable {
+class VirtualBinary : public ChannelElement, public ActionHandler {
  public:
   VirtualBinary();
   bool getValue();
   void iterateAlways();
   void onInit();
-  void runAction(int event, int action);
-  Channel *getChannel();
+  void handleAction(int event, int action);
 
  protected:
-  Channel channel;
   bool state;
   unsigned long lastReadTime;
 };
diff --git a/lib/SuplaDevice/src/supla/sensor/weight.h b/lib/SuplaDevice/src/supla/sensor/weight.h
index c5b8f8c4..89a8efb6 100644
--- a/lib/SuplaDevice/src/supla/sensor/weight.h
+++ b/lib/SuplaDevice/src/supla/sensor/weight.h
@@ -17,14 +17,14 @@
 #ifndef _weight_h
 #define _weight_h
 
-#include "supla/channel.h"
+#include "supla/channel_element.h"
 #include "supla/element.h"
 
 #define WEIGHT_NOT_AVAILABLE -1
 
 namespace Supla {
 namespace Sensor {
-class Weight : public Element {
+class Weight : public ChannelElement {
  public:
   Weight() : lastReadTime(0) {
     channel.setType(SUPLA_CHANNELTYPE_WEIGHTSENSOR);
@@ -43,12 +43,7 @@ class Weight : public Element {
     }
   }
 
-  Channel *getChannel() {
-    return &channel;
-  }
-
  protected:
-  Channel channel;
   unsigned long lastReadTime;
 };
 
diff --git a/lib/SuplaDevice/src/supla/sensor/wind.h b/lib/SuplaDevice/src/supla/sensor/wind.h
index 49b38afb..c8c147a7 100644
--- a/lib/SuplaDevice/src/supla/sensor/wind.h
+++ b/lib/SuplaDevice/src/supla/sensor/wind.h
@@ -17,14 +17,13 @@
 #ifndef _wind_h
 #define _wind_h
 
-#include "supla/channel.h"
-#include "supla/element.h"
+#include "supla/channel_element.h"
 
 #define WIND_NOT_AVAILABLE -1
 
 namespace Supla {
 namespace Sensor {
-class Wind: public Element {
+class Wind: public ChannelElement {
  public:
   Wind() : lastReadTime(0) {
     channel.setType(SUPLA_CHANNELTYPE_WINDSENSOR);
@@ -43,12 +42,7 @@ class Wind: public Element {
     }
   }
 
-  Channel *getChannel() {
-    return &channel;
-  }
-
  protected:
-  Channel channel;
   unsigned long lastReadTime;
 };
 
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index e6b07b98..bafe1174 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -76,7 +76,7 @@ void SuplaConfigESP::addConfigESP(int _pinNumberConfig, int _pinLedConfig, int _
   }
 }
 
-void SuplaConfigESP::runAction(int event, int action) {
+void SuplaConfigESP::handleAction(int event, int action) {
   if (action == CONFIG_MODE_10_ON_PRESSES) {
     if (event == Supla::ON_CLICK_10) {
       configModeInit();
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index a7d64978..f5711b8a 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -45,12 +45,12 @@ typedef struct {
   const char *old_msg;
 } _supla_status;
 
-class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
+class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
  public:
   SuplaConfigESP();
 
   void addConfigESP(int _pinNumberConfig, int _pinLedConfig, int _modeConfigButton, bool _highIsOn = true);
-  void runAction(int event, int action);
+  void handleAction(int event, int action);
   void rebootESP();
 
   const char *getLastStatusSupla();
@@ -120,7 +120,6 @@ class SuplaConfigESP : public Supla::Triggerable, public Supla::Element {
 void ledBlinking_func(void *timer_arg);
 void status_func(int status, const char *msg);
 
-
 uint32_t getFreeStackWatermark();
 unsigned long FreeMem();
 void checkRAM();
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 66340988..5425d32f 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -385,7 +385,7 @@ void SuplaOled::addButtonOled(int pin) {
   }
 }
 
-void SuplaOled::runAction(int event, int action) {
+void SuplaOled::handleAction(int event, int action) {
   if (action == TURN_ON_OLED) {
     display->setBrightness(255);
     timeLastChangeOled = millis();
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index 4d7532e1..61e8b787 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -45,14 +45,14 @@ void displayDoubleTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, i
 void displayDoubleHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
 void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
 
-class SuplaOled : public Supla::Triggerable, public Supla::Element {
+class SuplaOled : public Supla::ActionHandler, public Supla::Element {
  public:
   SuplaOled();
   void addButtonOled(int pin);
 
  private:
   void iterateAlways();
-  void runAction(int event, int action);
+  void handleAction(int event, int action);
 
   OLEDDisplay* display;
   OLEDDisplayUi* ui;

From 4ea87aa60c88b50e88dcb1fc964f5ac431b4d5e8 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 21 Jan 2021 19:04:42 +0100
Subject: [PATCH 045/165] PinStatusLed

---
 platformio.ini                |   2 +-
 src/GUI-Generic.ino           |  11 +--
 src/SuplaConfigESP.cpp        | 138 ++++++++++++++++++----------------
 src/SuplaConfigManager.h      |   3 +-
 src/SuplaDeviceGUI.cpp        |  56 +++++++++++++-
 src/SuplaDeviceGUI.h          |   7 +-
 src/SuplaTemplateBoard.cpp    |   5 ++
 src/SuplaTemplateBoard.h      |   1 +
 src/SuplaWebPageControl.cpp   |  13 +---
 src/SuplaWebPageRelay.cpp     |  17 ++---
 src/SuplaWebPageStatusLed.cpp |  65 ++++++++++++++++
 src/SuplaWebPageStatusLed.h   |  13 ++++
 src/SuplaWebServer.cpp        |   4 +
 src/language/pl.h             |   3 +-
 14 files changed, 235 insertions(+), 103 deletions(-)
 create mode 100644 src/SuplaWebPageStatusLed.cpp
 create mode 100644 src/SuplaWebPageStatusLed.h

diff --git a/platformio.ini b/platformio.ini
index aa825226..c05bb474 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.12"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.13"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 1d47261d..6870f6bc 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -40,15 +40,11 @@ void setup() {
       if (rollershutters > 0) {
 #ifdef SUPLA_BUTTON
         if (ConfigESP->getLevel(nr, FUNCTION_BUTTON) == Supla::ON_CHANGE && ConfigESP->getLevel(nr + 1, FUNCTION_BUTTON) == Supla::ON_CHANGE) {
-          Supla::GUI::addRolleShutterMomentary(ConfigESP->getGpio(nr, FUNCTION_RELAY), ConfigESP->getGpio(nr + 1, FUNCTION_RELAY),
-                                               ConfigESP->getGpio(nr, FUNCTION_BUTTON), ConfigESP->getGpio(nr + 1, FUNCTION_BUTTON),
-                                               ConfigESP->getLevel(nr, FUNCTION_RELAY));
+          Supla::GUI::addRolleShutterMomentary(nr);
         }
         else {
 #endif
-          Supla::GUI::addRolleShutter(ConfigESP->getGpio(nr, FUNCTION_RELAY), ConfigESP->getGpio(nr + 1, FUNCTION_RELAY),
-                                      ConfigESP->getGpio(nr, FUNCTION_BUTTON), ConfigESP->getGpio(nr + 1, FUNCTION_BUTTON),
-                                      ConfigESP->getLevel(nr, FUNCTION_RELAY));
+          Supla::GUI::addRolleShutter(nr);
 #ifdef SUPLA_BUTTON
         }
 #endif
@@ -57,8 +53,7 @@ void setup() {
       }
       else {
 #endif
-        Supla::GUI::addRelayButton(ConfigESP->getGpio(nr, FUNCTION_RELAY), ConfigESP->getGpio(nr, FUNCTION_BUTTON),
-                                   ConfigESP->getLevel(nr, FUNCTION_RELAY));
+        Supla::GUI::addRelayButton(nr);
 #ifdef SUPLA_ROLLERSHUTTER
       }
 #endif
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index bafe1174..9bfff53b 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -287,31 +287,33 @@ int SuplaConfigESP::getLevel(int nr, int function) {
       }
     }
 
-    switch (getAdressMCP23017(nr, function)) {
-      case 0:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(LEVEL).toInt();
-            ;
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+      switch (getAdressMCP23017(nr, function)) {
+        case 0:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(LEVEL).toInt();
+              ;
+            }
           }
-        }
-        break;
-      case 1:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(LEVEL).toInt();
-            ;
+          break;
+        case 1:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(LEVEL).toInt();
+              ;
+            }
           }
-        }
-        break;
-      case 2:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(LEVEL).toInt();
-            ;
+          break;
+        case 2:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(LEVEL).toInt();
+              ;
+            }
           }
-        }
-        break;
+          break;
+      }
     }
   }
   return OFF_GPIO;
@@ -326,31 +328,33 @@ int SuplaConfigESP::getMemory(int nr, int function) {
       }
     }
 
-    switch (getAdressMCP23017(nr, function)) {
-      case 0:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(MEMORY).toInt();
-            ;
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+      switch (getAdressMCP23017(nr, function)) {
+        case 0:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(MEMORY).toInt();
+              ;
+            }
           }
-        }
-        break;
-      case 1:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(MEMORY).toInt();
-            ;
+          break;
+        case 1:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(MEMORY).toInt();
+              ;
+            }
           }
-        }
-        break;
-      case 2:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(MEMORY).toInt();
-            ;
+          break;
+        case 2:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(MEMORY).toInt();
+              ;
+            }
           }
-        }
-        break;
+          break;
+      }
     }
   }
   return OFF_GPIO;
@@ -366,31 +370,33 @@ int SuplaConfigESP::getAction(int nr, int function) {
       }
     }
 
-    switch (getAdressMCP23017(nr, function)) {
-      case 0:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(ACTION).toInt();
-            ;
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+      switch (getAdressMCP23017(nr, function)) {
+        case 0:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(ACTION).toInt();
+              ;
+            }
           }
-        }
-        break;
-      case 1:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(ACTION).toInt();
-            ;
+          break;
+        case 1:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(ACTION).toInt();
+              ;
+            }
           }
-        }
-        break;
-      case 2:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-            return ConfigManager->get(key)->getElement(ACTION).toInt();
-            ;
+          break;
+        case 2:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
+            if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+              return ConfigManager->get(key)->getElement(ACTION).toInt();
+              ;
+            }
           }
-        }
-        break;
+          break;
+      }
     }
   }
   return OFF_GPIO;
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index db8f15b9..8d0d1efe 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -123,7 +123,8 @@ enum _function
   FUNCTION_IMPULSE_COUNTER,
   FUNCTION_CF,
   FUNCTION_CF1,
-  FUNCTION_SEL
+  FUNCTION_SEL,
+  FUNCTION_LED
 };
 
 enum _e_onfig
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index bcfa68e7..c35c7e8e 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -54,7 +54,15 @@ void begin() {
 }
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
-void addRelayButton(int pinRelay, int pinButton, bool highIsOn) {
+void addRelayButton(uint8_t nr) {
+  uint8_t pinRelay, pinButton, pinLED;
+  bool highIsOn;
+
+  pinRelay = ConfigESP->getGpio(nr, FUNCTION_RELAY);
+  pinButton = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
+  pinLED = ConfigESP->getGpio(nr, FUNCTION_LED);
+  highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
+
   if (pinRelay != OFF_GPIO) {
     relay.push_back(new Supla::Control::Relay(pinRelay, highIsOn));
 
@@ -80,6 +88,10 @@ void addRelayButton(int pinRelay, int pinButton, bool highIsOn) {
       button[size]->addAction(ConfigESP->getAction(size + 1, FUNCTION_BUTTON), *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
       button[size]->setSwNoiseFilterDelay(50);
     }
+
+    if (pinLED != OFF_GPIO) {
+      new Supla::Control::PinStatusLed(pinRelay, pinLED, highIsOn);
+    }
   }
 }
 #endif
@@ -109,7 +121,19 @@ std::vector<Supla::Control::RollerShutter *> RollerShutterRelay;
 std::vector<Supla::Control::Button *> RollerShutterButtonOpen;
 std::vector<Supla::Control::Button *> RollerShutterButtonClose;
 
-void addRolleShutter(int pinRelayUp, int pinRelayDown, int pinButtonUp, int pinButtonDown, bool highIsOn) {
+void addRolleShutter(uint8_t nr) {
+  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinLedUP, pinLedDown;
+  bool highIsOn;
+
+  pinRelayUp = ConfigESP->getGpio(nr, FUNCTION_RELAY);
+  pinRelayDown = ConfigESP->getGpio(nr + 1, FUNCTION_RELAY);
+  pinButtonUp = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
+  pinButtonDown = ConfigESP->getGpio(nr + 1, FUNCTION_BUTTON);
+  pinLedUP = ConfigESP->getGpio(nr, FUNCTION_LED);
+  pinLedDown = ConfigESP->getGpio(nr + 1, FUNCTION_LED);
+
+  highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
+
   RollerShutterRelay.push_back(new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn));
   if (pinButtonUp != OFF_GPIO)
     RollerShutterButtonOpen.push_back(new Supla::Control::Button(pinButtonUp, true, true));
@@ -124,9 +148,28 @@ void addRolleShutter(int pinRelayUp, int pinRelayDown, int pinButtonUp, int pinB
     RollerShutterButtonOpen[size]->addAction(Supla::STEP_BY_STEP, *RollerShutterRelay[size], Supla::ON_PRESS);
   }
   eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
+
+  if (pinLedUP != OFF_GPIO) {
+    new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, highIsOn);
+  }
+  if (pinLedDown != OFF_GPIO) {
+    new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, highIsOn);
+  }
 }
 
-void addRolleShutterMomentary(int pinRelayUp, int pinRelayDown, int pinButtonUp, int pinButtonDown, bool highIsOn) {
+void addRolleShutterMomentary(uint8_t nr) {
+  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinLedUP, pinLedDown;
+  bool highIsOn;
+
+  pinRelayUp = ConfigESP->getGpio(nr, FUNCTION_RELAY);
+  pinRelayDown = ConfigESP->getGpio(nr + 1, FUNCTION_RELAY);
+  pinButtonUp = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
+  pinButtonDown = ConfigESP->getGpio(nr + 1, FUNCTION_BUTTON);
+  pinLedUP = ConfigESP->getGpio(nr, FUNCTION_LED);
+  pinLedDown = ConfigESP->getGpio(nr + 1, FUNCTION_LED);
+
+  highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
+
   RollerShutterRelay.push_back(new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn));
   if (pinButtonUp != OFF_GPIO)
     RollerShutterButtonOpen.push_back(new Supla::Control::Button(pinButtonUp, true, true));
@@ -141,6 +184,13 @@ void addRolleShutterMomentary(int pinRelayUp, int pinRelayDown, int pinButtonUp,
     RollerShutterButtonClose[size]->addAction(Supla::STOP, *RollerShutterRelay[size], Supla::ON_RELEASE);
   }
   eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
+
+  if (pinLedUP != OFF_GPIO) {
+    new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, highIsOn);
+  }
+  if (pinLedDown != OFF_GPIO) {
+    new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, highIsOn);
+  }
 }
 #endif
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 02399296..0c33001d 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -75,6 +75,7 @@
 #endif
 
 #include <supla/sensor/HJ101.h>
+#include <supla/control/pin_status_led.h>
 
 #include <Wire.h>
 
@@ -84,7 +85,7 @@ namespace GUI {
 void begin();
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
-void addRelayButton(int pinRelay, int pinButton, bool highIsOn = true);
+void addRelayButton(uint8_t nr);
 
 extern std::vector<Supla::Control::Relay *> relay;
 extern std::vector<Supla::Control::Button *> button;
@@ -101,8 +102,8 @@ void addConfigESP(int pinNumberConfig, int pinLedConfig, int modeConfigButton, b
 #endif
 
 #ifdef SUPLA_ROLLERSHUTTER
-void addRolleShutter(int pinRelayUp, int pinRelayDown, int pinButtonUp, int pinButtonDown, bool highIsOn = true);
-void addRolleShutterMomentary(int pinRelayUp, int pinRelayDown, int pinButtonUp, int pinButtonDown, bool highIsOn = true);
+void addRolleShutter(uint8_t nr);
+void addRolleShutterMomentary(uint8_t nr);
 
 extern std::vector<Supla::Control::RollerShutter *> RollerShutterRelay;
 extern std::vector<Supla::Control::Button *> RollerShutterButtonOpen;
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index ebe6a4af..88aa8ace 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -34,6 +34,10 @@ void addLedCFG(uint8_t gpio, uint8_t level) {
   ConfigESP->setGpio(gpio, FUNCTION_CFG_LED, level);
 }
 
+void addLed(uint8_t gpio) {
+  ConfigESP->setGpio(gpio, FUNCTION_LED);
+}
+
 void addButtonCFG(uint8_t gpio) {
   ConfigESP->setGpio(gpio, FUNCTION_CFG_BUTTON);
 }
@@ -195,6 +199,7 @@ void chooseTemplateBoard(uint8_t board) {
       addButtonCFG(13);
       addButton(13, Supla::ON_RELEASE);
       addRelay(15);
+      addLed(0);
 #ifdef SUPLA_HLW8012
       addHLW8012(5, 4, 12);
       Supla::GUI::counterHLW8012->setCurrentMultiplier(18388);
diff --git a/src/SuplaTemplateBoard.h b/src/SuplaTemplateBoard.h
index 1cfbeed7..8e6b6ceb 100644
--- a/src/SuplaTemplateBoard.h
+++ b/src/SuplaTemplateBoard.h
@@ -9,6 +9,7 @@ void addButton(uint8_t gpio, uint8_t event = 0);
 void addRelay(uint8_t gpio, uint8_t level = HIGH);
 void addLimitSwitch(uint8_t gpio);
 void addLedCFG(uint8_t gpio, uint8_t level = HIGH);
+void addLed(uint8_t gpio);
 void addButtonCFG(uint8_t gpio);
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
 
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index f7fe8878..996b70bb 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -155,10 +155,10 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   String readUrl, nr_button, input, path;
   uint8_t place, key, gpio;
 
-  input.reserve(10);
-  readUrl.reserve(11);
+  input.reserve(5);
+  readUrl.reserve(16);
   nr_button.reserve(2);
-  path.reserve(14);
+  path.reserve(16);
 
   path = PATH_START;
   path += PATH_SAVE_BUTTON_SET;
@@ -167,12 +167,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   place = readUrl.indexOf(path);
   nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
 
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
-    gpio = ConfigESP->getGpioMCP23017(nr_button.toInt(), FUNCTION_BUTTON);
-  }
-  else {
-    gpio = ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
-  }
+  gpio = ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
   key = KEY_GPIO + gpio;
 
   input = INPUT_BUTTON_LEVEL;
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index f1d8760c..09f4bb08 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -142,27 +142,22 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  String readUrl, nr_relay, input;
+  String readUrl, nr_relay, input, path;
   uint8_t place, key, gpio;
 
-  input.reserve(9);
+  input.reserve(6);
   readUrl.reserve(11);
   nr_relay.reserve(2);
+  path.reserve(15);
 
-  String path = PATH_START;
+  path = PATH_START;
   path += PATH_SAVE_RELAY_SET;
   readUrl = WebServer->httpServer.uri();
 
   place = readUrl.indexOf(path);
   nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
 
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
-    gpio = ConfigESP->getGpioMCP23017(nr_relay.toInt(), FUNCTION_RELAY);
-  }
-  else {
-    gpio = ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY);
-  }
-
+  gpio = ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_RELAY);
   key = KEY_GPIO + gpio;
 
   input = INPUT_RELAY_MEMORY;
@@ -187,7 +182,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save) {
   String path, readUrl, nr_relay;
   uint8_t place, selected;
 
-  path.reserve(9);
+  path.reserve(10);
   readUrl.reserve(11);
   nr_relay.reserve(2);
 
diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
new file mode 100644
index 00000000..1c09d085
--- /dev/null
+++ b/src/SuplaWebPageStatusLed.cpp
@@ -0,0 +1,65 @@
+#include "SuplaWebPageStatusLed.h"
+#include "SuplaDeviceGUI.h"
+#include "SuplaWebServer.h"
+#include "GUIGenericCommon.h"
+#include "Markup.h"
+
+void createWebStatusLed() {
+  WebServer->httpServer.on(getURL(PATH_LED), handleStatusLed);
+  WebServer->httpServer.on(getURL(PATH_SAVE_LED), handleStatusLedSave);
+}
+
+void handleStatusLed() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  webStatusLed(0);
+}
+
+void handleStatusLedSave() {
+  uint8_t nr;
+
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
+    if (!WebServer->saveGPIO(INPUT_LED, FUNCTION_LED, nr)) {
+      webStatusLed(6);
+      return;
+    }
+  }
+
+  switch (ConfigManager->save()) {
+    case E_CONFIG_OK:
+      webStatusLed(1);
+      break;
+    case E_CONFIG_FILE_OPEN:
+      webStatusLed(2);
+      break;
+  }
+}
+
+void webStatusLed(int save) {
+  uint8_t nr;
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_LED);
+  addForm(webContentBuffer, F("post"), PATH_SAVE_LED);
+
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" LED"));
+
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
+    addListGPIOBox(webContentBuffer, INPUT_LED, F("LED"), FUNCTION_LED, nr);
+  }
+
+  addFormHeaderEnd(webContentBuffer);
+
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
+
+  WebServer->sendContent();
+}
\ No newline at end of file
diff --git a/src/SuplaWebPageStatusLed.h b/src/SuplaWebPageStatusLed.h
new file mode 100644
index 00000000..332eef9c
--- /dev/null
+++ b/src/SuplaWebPageStatusLed.h
@@ -0,0 +1,13 @@
+#ifndef SuplaWebPageStatusLed_h
+#define SuplaWebPageStatusLed_h
+
+#define PATH_LED      "led"
+#define PATH_SAVE_LED "saveled"
+#define INPUT_LED     "led"
+
+void createWebStatusLed();
+void handleStatusLed();
+void handleStatusLedSave();
+void webStatusLed(int save);
+
+#endif  // SuplaWebPageStatusLed_h
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 7ade7151..c20e6b4a 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -20,6 +20,7 @@
 #include "SuplaWebPageControl.h"
 #include "SuplaWebPageRelay.h"
 #include "SuplaWebPageSensor.h"
+#include "SuplaWebPageStatusLed.h"
 #include "SuplaCommonPROGMEM.h"
 #include "SuplaTemplateBoard.h"
 #include "Markup.h"
@@ -75,6 +76,7 @@ void SuplaWebServer::createWebServer() {
   createWebDownload();
   createWebUpload();
   createWebTools();
+  createWebStatusLed();
 }
 
 void SuplaWebServer::handle() {
@@ -221,6 +223,8 @@ void SuplaWebServer::deviceSettings(int save) {
   addButton(webContentBuffer, F("KONTAKTRON"), PATH_SWITCH);
 #endif
 
+  addButton(webContentBuffer, F("LED"), PATH_LED);
+
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
   addButton(webContentBuffer, S_SENSORS_1WIRE, PATH_1WIRE);
 #endif
diff --git a/src/language/pl.h b/src/language/pl.h
index 043a25ef..f414b9d3 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -30,6 +30,7 @@
 #define S_CFG_MODE                                             "Tryb"
 #define S_QUANTITY                                             "ILOŚĆ"
 #define S_GPIO_SETTINGS_FOR_RELAYS                             "Ustawienie GPIO dla przekaźników"
+#define S_GPIO_SETTINGS_FOR                                    "Ustawienie GPIO dla"
 #define S_RELAY                                                "PRZEKAŹNIK"
 #define S_RELAY_NR_SETTINGS                                    "Ustawienia przekaźnika nr."
 #define S_NO_RELAY_NR                                          "Brak przekaźnika nr."
@@ -60,7 +61,7 @@
 #define S_WRITE_ERROR_BAD_DATA                                 "Błąd zapisu - złe dane."
 
 //#### SuplaConfigESP.cpp ####
-#define S_ALREADY_INITIATED                           "Już zainicjalizowane"
+#define S_ALREADY_INITIATED                            "Już zainicjalizowane"
 #define S_NOT_ASSIGNED_CB                              "Nie przypisane CB"
 #define S_INVALID_GUID_OR_DEVICE_REGISTRATION_INACTIVE "Nieprawidłowy identyfikator GUID lub rejestracja urządzeń NIEAKTYWNA"
 #define S_UNKNOWN_SEVER_ADDRESS                        "Nieznany adres serwera"

From 563a0baf2cbb6bd5bf09863e58614847542ac305 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 22 Jan 2021 06:40:03 +0100
Subject: [PATCH 046/165] poprawa OLEDa dla SUPLA_MAX6675

---
 platformio.ini             |  2 +-
 src/GUI-Generic.ino        | 57 ++++++++++++++++++++------------------
 src/GUIGenericCommon.cpp   |  4 +--
 src/GUIGenericCommon.h     |  2 +-
 src/SuplaOled.cpp          |  2 +-
 src/SuplaWebPageSensor.cpp |  6 ++--
 6 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index c05bb474..4c225066 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.13"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.14"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 6870f6bc..14149b88 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -108,6 +108,31 @@ void setup() {
   }
 #endif
 
+#ifdef SUPLA_MAX6675
+  if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
+    new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
+  }
+#endif
+
+#ifdef SUPLA_IMPULSE_COUNTER
+  if (ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt() > 0) {
+    for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
+      if (ConfigESP->getGpio(nr, FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
+        Supla::GUI::addImpulseCounter(ConfigESP->getGpio(nr, FUNCTION_IMPULSE_COUNTER), ConfigESP->getLevel(nr, FUNCTION_IMPULSE_COUNTER),
+                                      ConfigESP->getMemory(nr, FUNCTION_IMPULSE_COUNTER),
+                                      ConfigManager->get(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT)->getValueInt());
+      }
+    }
+  }
+
+#endif
+
+#ifdef SUPLA_HLW8012
+  if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
+    Supla::GUI::addHLW8012(ConfigESP->getGpio(FUNCTION_CF), ConfigESP->getGpio(FUNCTION_CF1), ConfigESP->getGpio(FUNCTION_SEL));
+  }
+#endif
+
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_HTU21D) || defined(SUPLA_SHT71) || \
     defined(SUPLA_BH1750) || defined(SUPLA_MAX44009) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
@@ -149,13 +174,7 @@ void setup() {
     }
 #endif
 
-#ifdef SUPLA_OLED
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
-      SuplaOled *oled = new SuplaOled();
-      oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
-    }
-#endif
-
+#ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
       if (!mcp1.begin(0))
         Serial.println(F("MCP23017 1 not found!"));  // begin(uint8_t address)  "Pin 100 - 115"
@@ -169,29 +188,13 @@ void setup() {
   }
 #endif
 
-#ifdef SUPLA_MAX6675
-  if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
-    new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
-  }
-#endif
-
-#ifdef SUPLA_IMPULSE_COUNTER
-  if (ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt() > 0) {
-    for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
-      if (ConfigESP->getGpio(nr, FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
-        Supla::GUI::addImpulseCounter(ConfigESP->getGpio(nr, FUNCTION_IMPULSE_COUNTER), ConfigESP->getLevel(nr, FUNCTION_IMPULSE_COUNTER),
-                                      ConfigESP->getMemory(nr, FUNCTION_IMPULSE_COUNTER),
-                                      ConfigManager->get(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT)->getValueInt());
-      }
-    }
+#ifdef SUPLA_OLED
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+    SuplaOled *oled = new SuplaOled();
+    oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
   }
-
 #endif
 
-#ifdef SUPLA_HLW8012
-  if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
-    Supla::GUI::addHLW8012(ConfigESP->getGpio(FUNCTION_CF), ConfigESP->getGpio(FUNCTION_CF1), ConfigESP->getGpio(FUNCTION_SEL));
-  }
 #endif
 
   Supla::GUI::begin();
diff --git a/src/GUIGenericCommon.cpp b/src/GUIGenericCommon.cpp
index 5b8efdb9..30113cdf 100644
--- a/src/GUIGenericCommon.cpp
+++ b/src/GUIGenericCommon.cpp
@@ -11,12 +11,12 @@ uint8_t *HexToBytes(String _value) {
   return buffer;
 }
 
-int getNumberChannels() {
+int getCountSensorChannels() {
   int maxFrame = 0;
   for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
     if (element->getChannel()) {
       auto channel = element->getChannel();
-      
+
       if (channel->getChannelType() == SUPLA_CHANNELTYPE_THERMOMETER) {
         maxFrame += 1;
       }
diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 7fcd07c8..09dd8308 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -13,6 +13,6 @@
 #include "SuplaDeviceGUI.h"
 
 uint8_t *HexToBytes(String _value);
-int getNumberChannels();
+int getCountSensorChannels();
 
 #endif  // GUI_GENERIC_COMMON_H
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 5425d32f..689c43cf 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -293,7 +293,7 @@ SuplaOled::SuplaOled() {
     ui = new OLEDDisplayUi(display);
 
     overlays[0] = {msOverlay};
-    int maxFrame = getNumberChannels();
+    int maxFrame = getCountSensorChannels();
 
     if (maxFrame == 0)
       maxFrame = 1;
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index c6afb737..299964d0 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -452,7 +452,7 @@ void SuplaWebPageSensor::handlei2cSave() {
     ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_OLED, WebServer->httpServer.arg(input).toInt());
   }
 
-  for (uint8_t i = 0; i < getNumberChannels(); i++) {
+  for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
     input = INPUT_DS18B20_NAME;
     input += i;
     if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
@@ -527,7 +527,7 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
       String name, sensorName, input;
 
-      for (uint8_t i = 0; i < getNumberChannels(); i++) {
+      for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
         sensorName = String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
         input = INPUT_DS18B20_NAME;
         input += i;
@@ -671,7 +671,7 @@ void SuplaWebPageSensor::handleOtherSave() {
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
-  //Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+  // Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
 
   last_value = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {

From f2fc4f19fe36cb7708e64898f84d2d1fd9282493 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 22 Jan 2021 11:08:00 +0100
Subject: [PATCH 047/165] poprawa kompilacji

---
 src/GUI-Generic.ino | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 14149b88..d43920d0 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -185,18 +185,16 @@ void setup() {
       if (!mcp4.begin(3))
         Serial.println(F("MCP23017 4 not found!"));  // begin(uint8_t address)  "Pin 148 - 163"
     }
-  }
 #endif
 
 #ifdef SUPLA_OLED
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
-    SuplaOled *oled = new SuplaOled();
-    oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
-  }
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+      SuplaOled *oled = new SuplaOled();
+      oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
+    }
 #endif
-
+  }
 #endif
-
   Supla::GUI::begin();
 }
 

From 3296448cf1fb3523d9fdb8f20b0c3540f52eb7be Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 22 Jan 2021 19:16:27 +0100
Subject: [PATCH 048/165] =?UTF-8?q?mo=C5=BCliwo=C5=9B=C4=87=20okreslenia?=
 =?UTF-8?q?=20stanu=20sterowania=20dla=20LEDa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini                |  2 +-
 src/Markup.cpp                |  4 ++--
 src/SuplaConfigESP.h          |  1 +
 src/SuplaConfigManager.cpp    |  1 +
 src/SuplaConfigManager.h      |  2 +-
 src/SuplaDeviceGUI.cpp        | 19 +++++++++++--------
 src/SuplaWebPageStatusLed.cpp |  8 +++++++-
 src/SuplaWebPageStatusLed.h   |  7 ++++---
 src/SuplaWebServer.h          |  3 ---
 src/language/pl.h             | 10 +++++-----
 10 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 4c225066..5a340709 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.14"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.15"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/Markup.cpp b/src/Markup.cpp
index def7b111..c00b434c 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -141,7 +141,7 @@ void addLinkBox(String& html, const String& name, const String& url) {
   html += url;
   html += F("'>");
   html += name;
-  html += PGMT(ICON_EDIT);
+  //html += PGMT(ICON_EDIT);
   html += F("</a>");
   html += F("</label>");
   html += F("</i>");
@@ -198,7 +198,7 @@ void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const Stri
   }
   html += name;
   if (ConfigESP->getGpioMCP23017(nr, function) != OFF_GPIO) {
-    html += PGMT(ICON_EDIT);
+   // html += PGMT(ICON_EDIT);
     html += F("</a>");
   }
   html += F("</label>");
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index f5711b8a..61c3e614 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -37,6 +37,7 @@ enum _ConfigMode
   FACTORYRESET
 };
 
+#define OFF_GPIO 17
 #define OFF_MCP23017 2
 
 typedef struct {
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 4f9fc3d3..24f60372 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -176,6 +176,7 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_CFG_MODE, "0", 2);
   this->addKey(KEY_ADDR_DS18B20, MAX_DS18B20_ADDRESS_HEX * MAX_DS18B20);
   this->addKey(KEY_NAME_SENSOR, MAX_DS18B20_NAME * MAX_DS18B20);
+  this->addKey(KEY_LEVEL_LED, "0", 1);
 
   this->load();
   //  switch (this->load()) {
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 8d0d1efe..ef012d53 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -73,8 +73,8 @@ enum _key
   KEY_CFG_MODE,
   KEY_ADDR_DS18B20,
   KEY_NAME_SENSOR,
-
   KEY_GPIO,
+  KEY_LEVEL_LED = KEY_GPIO + MAX_GPIO + 1
   //KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
   //KEY_DS_NAME = KEY_DS + MAX_DS18B20
 };
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index c35c7e8e..c73f7fc8 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -56,12 +56,13 @@ void begin() {
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 void addRelayButton(uint8_t nr) {
   uint8_t pinRelay, pinButton, pinLED;
-  bool highIsOn;
+  bool highIsOn, levelLed;
 
   pinRelay = ConfigESP->getGpio(nr, FUNCTION_RELAY);
   pinButton = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
   pinLED = ConfigESP->getGpio(nr, FUNCTION_LED);
   highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
+  levelLed = ConfigManager->get(KEY_LEVEL_LED)->getValueInt();
 
   if (pinRelay != OFF_GPIO) {
     relay.push_back(new Supla::Control::Relay(pinRelay, highIsOn));
@@ -90,7 +91,7 @@ void addRelayButton(uint8_t nr) {
     }
 
     if (pinLED != OFF_GPIO) {
-      new Supla::Control::PinStatusLed(pinRelay, pinLED, highIsOn);
+      new Supla::Control::PinStatusLed(pinRelay, pinLED, !levelLed);
     }
   }
 }
@@ -123,7 +124,7 @@ std::vector<Supla::Control::Button *> RollerShutterButtonClose;
 
 void addRolleShutter(uint8_t nr) {
   int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinLedUP, pinLedDown;
-  bool highIsOn;
+  bool highIsOn, levelLed;
 
   pinRelayUp = ConfigESP->getGpio(nr, FUNCTION_RELAY);
   pinRelayDown = ConfigESP->getGpio(nr + 1, FUNCTION_RELAY);
@@ -133,6 +134,7 @@ void addRolleShutter(uint8_t nr) {
   pinLedDown = ConfigESP->getGpio(nr + 1, FUNCTION_LED);
 
   highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
+  levelLed = ConfigManager->get(KEY_LEVEL_LED)->getValueInt();
 
   RollerShutterRelay.push_back(new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn));
   if (pinButtonUp != OFF_GPIO)
@@ -150,16 +152,16 @@ void addRolleShutter(uint8_t nr) {
   eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
   if (pinLedUP != OFF_GPIO) {
-    new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, highIsOn);
+    new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, !levelLed);
   }
   if (pinLedDown != OFF_GPIO) {
-    new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, highIsOn);
+    new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, !levelLed);
   }
 }
 
 void addRolleShutterMomentary(uint8_t nr) {
   int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinLedUP, pinLedDown;
-  bool highIsOn;
+  bool highIsOn, levelLed;
 
   pinRelayUp = ConfigESP->getGpio(nr, FUNCTION_RELAY);
   pinRelayDown = ConfigESP->getGpio(nr + 1, FUNCTION_RELAY);
@@ -169,6 +171,7 @@ void addRolleShutterMomentary(uint8_t nr) {
   pinLedDown = ConfigESP->getGpio(nr + 1, FUNCTION_LED);
 
   highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
+  levelLed = ConfigManager->get(KEY_LEVEL_LED)->getValueInt();
 
   RollerShutterRelay.push_back(new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn));
   if (pinButtonUp != OFF_GPIO)
@@ -186,10 +189,10 @@ void addRolleShutterMomentary(uint8_t nr) {
   eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
   if (pinLedUP != OFF_GPIO) {
-    new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, highIsOn);
+    new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, !levelLed);
   }
   if (pinLedDown != OFF_GPIO) {
-    new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, highIsOn);
+    new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, !levelLed);
   }
 }
 #endif
diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
index 1c09d085..b6d110eb 100644
--- a/src/SuplaWebPageStatusLed.cpp
+++ b/src/SuplaWebPageStatusLed.cpp
@@ -25,6 +25,10 @@ void handleStatusLedSave() {
       return WebServer->httpServer.requestAuthentication();
   }
 
+  if (strcmp(WebServer->httpServer.arg(INPUT_LEVEL_LED).c_str(), "") != 0) {
+    ConfigManager->set(KEY_LEVEL_LED, WebServer->httpServer.arg(INPUT_LEVEL_LED).c_str());
+  }
+
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
     if (!WebServer->saveGPIO(INPUT_LED, FUNCTION_LED, nr)) {
       webStatusLed(6);
@@ -43,13 +47,15 @@ void handleStatusLedSave() {
 }
 
 void webStatusLed(int save) {
-  uint8_t nr;
+  uint8_t nr, selected;
 
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_LED);
   addForm(webContentBuffer, F("post"), PATH_SAVE_LED);
 
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" LED"));
+  selected = ConfigManager->get(KEY_LEVEL_LED)->getValueInt();
+  addListBox(webContentBuffer, INPUT_LEVEL_LED, S_STATE_CONTROL, LEVEL_P, 2, selected);
 
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
     addListGPIOBox(webContentBuffer, INPUT_LED, F("LED"), FUNCTION_LED, nr);
diff --git a/src/SuplaWebPageStatusLed.h b/src/SuplaWebPageStatusLed.h
index 332eef9c..3da59441 100644
--- a/src/SuplaWebPageStatusLed.h
+++ b/src/SuplaWebPageStatusLed.h
@@ -1,9 +1,10 @@
 #ifndef SuplaWebPageStatusLed_h
 #define SuplaWebPageStatusLed_h
 
-#define PATH_LED      "led"
-#define PATH_SAVE_LED "saveled"
-#define INPUT_LED     "led"
+#define PATH_LED        "led"
+#define PATH_SAVE_LED   "saveled"
+#define INPUT_LED       "led"
+#define INPUT_LEVEL_LED "ill"
 
 void createWebStatusLed();
 void handleStatusLed();
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 9479bf2b..ce5e8d77 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -32,9 +32,6 @@
 #define DEFAULT_LOGIN    "admin"
 #define DEFAULT_PASSWORD "password"
 
-#define MAX_GPIO 13
-#define OFF_GPIO 17
-
 #define PATH_START            "/"
 #define PATH_SAVE_LOGIN       "savelogin"
 #define PATH_REBOT            "rbt"
diff --git a/src/language/pl.h b/src/language/pl.h
index f414b9d3..62eecf04 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -22,11 +22,11 @@
 #define S_TYPE                                                 "Rodzaj"
 #define S_RELAYS                                               "PRZEKAŹNIKI"
 #define S_BUTTONS                                              "PRZYCISKI"
-#define S_SENSORS_1WIRE                                        "SENSORY 1Wire"
-#define S_SENSORS_I2C                                          "i2c"
-#define S_SENSORS_SPI                                          "SENSORY SPI"
-#define S_SENSORS_OTHER                                        "SENSORY INNE"
-#define S_LED_BUTTON_CFG                                       "LED, BUTTON CONFIG"
+#define S_SENSORS_1WIRE                                        "1WIRE"
+#define S_SENSORS_I2C                                          "I2C"
+#define S_SENSORS_SPI                                          "SPI"
+#define S_SENSORS_OTHER                                        "INNE"
+#define S_LED_BUTTON_CFG                                       "KONFIGURACJA"
 #define S_CFG_MODE                                             "Tryb"
 #define S_QUANTITY                                             "ILOŚĆ"
 #define S_GPIO_SETTINGS_FOR_RELAYS                             "Ustawienie GPIO dla przekaźników"

From 2a37099c40ae7811063bc93177199dd2c7649196 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 27 Jan 2021 06:13:03 +0100
Subject: [PATCH 049/165] dodatkowe wsparcie dla OLEDa

---
 .../.github/stale.yml                         |  17 -
 lib/esp8266-oled-ssd1306-master/.travis.yml   |   8 +-
 lib/esp8266-oled-ssd1306-master/README.md     |   8 +-
 lib/esp8266-oled-ssd1306-master/keywords.txt  | 100 +++
 lib/esp8266-oled-ssd1306-master/library.json  |   3 +-
 .../library.properties                        |   3 +-
 .../platformio.ini                            |   2 +-
 .../resources/DemoFrame1.jpg                  | Bin 16026 -> 0 bytes
 .../resources/DemoFrame2.jpg                  | Bin 19502 -> 0 bytes
 .../resources/DemoFrame3.jpg                  | Bin 21777 -> 0 bytes
 .../resources/DemoFrame4.jpg                  | Bin 25325 -> 0 bytes
 .../resources/FontTool.png                    | Bin 14052 -> 0 bytes
 .../resources/SPI_version.jpg                 | Bin 26912 -> 0 bytes
 .../resources/glyphEditor.html                | 664 ------------------
 .../resources/glyphEditor.png                 | Bin 68751 -> 0 bytes
 .../resources/xbmPreview.png                  | Bin 41692 -> 0 bytes
 .../src/OLEDDisplay.cpp                       |  18 +-
 .../src/OLEDDisplay.h                         |   1 +
 .../src/OLEDDisplayUi.cpp                     |   7 +-
 .../src/SSD1306Wire.h                         |   4 +-
 platformio.ini                                |   2 +-
 src/SuplaCommonPROGMEM.h                      |   5 +
 src/SuplaConfigManager.cpp                    |   2 +
 src/SuplaConfigManager.h                      |  12 +-
 src/SuplaOled.cpp                             |  32 +-
 src/SuplaOled.h                               |  10 +-
 src/SuplaWebPageSensor.cpp                    |  21 +-
 src/SuplaWebPageSensor.h                      |   3 +
 28 files changed, 208 insertions(+), 714 deletions(-)
 delete mode 100644 lib/esp8266-oled-ssd1306-master/.github/stale.yml
 create mode 100644 lib/esp8266-oled-ssd1306-master/keywords.txt
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame1.jpg
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame2.jpg
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame3.jpg
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/DemoFrame4.jpg
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/FontTool.png
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/SPI_version.jpg
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/glyphEditor.png
 delete mode 100644 lib/esp8266-oled-ssd1306-master/resources/xbmPreview.png

diff --git a/lib/esp8266-oled-ssd1306-master/.github/stale.yml b/lib/esp8266-oled-ssd1306-master/.github/stale.yml
deleted file mode 100644
index 9bcd4eb1..00000000
--- a/lib/esp8266-oled-ssd1306-master/.github/stale.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 180
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
diff --git a/lib/esp8266-oled-ssd1306-master/.travis.yml b/lib/esp8266-oled-ssd1306-master/.travis.yml
index 1ade30e9..49ea5b62 100644
--- a/lib/esp8266-oled-ssd1306-master/.travis.yml
+++ b/lib/esp8266-oled-ssd1306-master/.travis.yml
@@ -1,12 +1,15 @@
+# documentation at https://docs.platformio.org/en/latest/integration/ci/travis.html
+
 language: python
 python:
-    - "2.7"
+    - "3.7"
 
 # Cache PlatformIO packages using Travis CI container-based infrastructure
 sudo: false
 cache:
     directories:
         - "~/.platformio"
+        - $HOME/.cache/pip
 
 env:
     - PLATFORMIO_CI_SRC=examples/SSD1306UiDemo
@@ -19,7 +22,8 @@ env:
 
 install:
     - pip install -U platformio
-    - platformio lib install 44
+    - pio update
+    - platformio lib -g install "paulstoffregen/Time@^1.6"
 
 script:
     - platformio ci --lib="." --board=nodemcuv2
diff --git a/lib/esp8266-oled-ssd1306-master/README.md b/lib/esp8266-oled-ssd1306-master/README.md
index ff3a6ca4..ed2d8b13 100644
--- a/lib/esp8266-oled-ssd1306-master/README.md
+++ b/lib/esp8266-oled-ssd1306-master/README.md
@@ -2,14 +2,16 @@
 
 # ThingPulse OLED SSD1306 (ESP8266/ESP32/Mbed-OS)
 
-> We just released version 4.0.0. Please have a look at our [upgrade guide](UPGRADE-4.0.md)
-
 This is a driver for SSD1306 128x64, 128x32, 64x48 and 64x32 OLED displays running on the Arduino/ESP8266 & ESP32 and mbed-os platforms.
 Can be used with either the I2C or SPI version of the display.
 
+This library drives the OLED display included in the [ThingPulse IoT starter kit](https://thingpulse.com/product/esp8266-iot-electronics-starter-kit-weatherstation-planespotter-worldclock/) aka classic kit aka weather station kit.
+
+[![ThingPulse ESP8266 WeatherStation Classic Kit](https://github.com/ThingPulse/esp8266-weather-station/blob/master/resources/ThingPulse-ESP8266-Weather-Station.jpeg?raw=true)](https://thingpulse.com/product/esp8266-iot-electronics-starter-kit-weatherstation-planespotter-worldclock/)
+
 You can either download this library as a zip file and unpack it to your Arduino/libraries folder or find it in the Arduino library manager under "ESP8266 and ESP32 Oled Driver for SSD1306 display". For mbed-os a copy of the files are available as an mbed-os library. 
 
-It is also available as a platformio library. Just execute the following command:
+It is also available as a [PlatformIO library](https://platformio.org/lib/show/562/ESP8266%20and%20ESP32%20OLED%20driver%20for%20SSD1306%20displays/examples). Just execute the following command:
 ```
 platformio lib install 562
 ```
diff --git a/lib/esp8266-oled-ssd1306-master/keywords.txt b/lib/esp8266-oled-ssd1306-master/keywords.txt
new file mode 100644
index 00000000..db59d6e8
--- /dev/null
+++ b/lib/esp8266-oled-ssd1306-master/keywords.txt
@@ -0,0 +1,100 @@
+#######################################
+# Syntax Coloring Map List
+#######################################
+
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+INVERSE    LITERAL1
+
+TEXT_ALIGN_LEFT    LITERAL1
+TEXT_ALIGN_RIGHT    LITERAL1
+TEXT_ALIGN_CENTER    LITERAL1
+TEXT_ALIGN_CENTER_BOTH    LITERAL1
+
+GEOMETRY_128_64    LITERAL1
+GEOMETRY_128_32    LITERAL1
+GEOMETRY_RAWMODE    LITERAL1
+
+ArialMT_Plain_10    LITERAL1
+ArialMT_Plain_16    LITERAL1
+ArialMT_Plain_24    LITERAL1
+
+SLIDE_UP    LITERAL1
+SLIDE_DOWN    LITERAL1
+SLIDE_LEFT    LITERAL1
+SLIDE_RIGHT    LITERAL1
+
+TOP    LITERAL1
+RIGHT    LITERAL1
+BOTTOM    LITERAL1
+LEFT    LITERAL1
+
+LEFT_RIGHT    LITERAL1
+RIGHT_LEFT    LITERAL1
+
+IN_TRANSITION    LITERAL1
+FIXED    LITERAL1
+
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+OLEDDisplay    KEYWORD1
+OLEDDisplayUi    KEYWORD1
+
+SH1106Wire    KEYWORD1
+SH1106Brzo    KEYWORD1
+SH1106Spi    KEYWORD1
+
+SSD1306Wire    KEYWORD1
+SSD1306Brzo    KEYWORD1
+SSD1306I2C    KEYWORD1
+SSD1306Spi    KEYWORD1
+
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+allocateBuffer    KEYWORD2
+init    KEYWORD2
+resetDisplay    KEYWORD2
+setColor    KEYWORD2
+getColor    KEYWORD2
+setPixel    KEYWORD2
+setPixelColor    KEYWORD2
+clearPixel    KEYWORD2
+drawLine    KEYWORD2
+drawRect    KEYWORD2
+fillRect    KEYWORD2
+drawCircle    KEYWORD2
+drawCircleQuads    KEYWORD2
+fillCircle    KEYWORD2
+fillRing    KEYWORD2
+drawHorizontalLine    KEYWORD2
+drawVerticalLine    KEYWORD2
+drawProgressBar    KEYWORD2
+drawFastImage    KEYWORD2
+drawXbm    KEYWORD2
+drawIco16x16    KEYWORD2
+drawString    KEYWORD2
+drawStringMaxWidth    KEYWORD2
+getStringWidth    KEYWORD2
+setTextAlignment    KEYWORD2
+setFont    KEYWORD2
+setFontTableLookupFunction    KEYWORD2
+displayOn    KEYWORD2
+displayOff    KEYWORD2
+invertDisplay    KEYWORD2
+normalDisplay    KEYWORD2
+setContrast    KEYWORD2
+setBrightness    KEYWORD2
+resetOrientation    KEYWORD2
+flipScreenVertically    KEYWORD2
+mirrorScreen    KEYWORD2
+display    KEYWORD2
+setLogBuffer    KEYWORD2
+drawLogBuffer    KEYWORD2
+getWidth    KEYWORD2
+getHeight    KEYWORD2
diff --git a/lib/esp8266-oled-ssd1306-master/library.json b/lib/esp8266-oled-ssd1306-master/library.json
index 446d8e08..acd11ce9 100644
--- a/lib/esp8266-oled-ssd1306-master/library.json
+++ b/lib/esp8266-oled-ssd1306-master/library.json
@@ -1,8 +1,9 @@
 {
   "name": "ESP8266 and ESP32 OLED driver for SSD1306 displays",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "keywords": "ssd1306, oled, display, i2c",
   "description": "I2C display driver for SSD1306 OLED displays connected to ESP8266, ESP32, Mbed-OS",
+  "license": "MIT",
   "repository":
   {
     "type": "git",
diff --git a/lib/esp8266-oled-ssd1306-master/library.properties b/lib/esp8266-oled-ssd1306-master/library.properties
index a62c352f..e931a3f6 100644
--- a/lib/esp8266-oled-ssd1306-master/library.properties
+++ b/lib/esp8266-oled-ssd1306-master/library.properties
@@ -1,5 +1,5 @@
 name=ESP8266 and ESP32 OLED driver for SSD1306 displays
-version=4.1.0
+version=4.2.0
 author=ThingPulse, Fabrice Weinberg
 maintainer=ThingPulse <info@thingpulse.com>
 sentence=I2C display driver for SSD1306 OLED displays connected to ESP8266, ESP32, Mbed-OS
@@ -7,3 +7,4 @@ paragraph=The following geometries are currently supported: 128x64, 128x32, 64x4
 category=Display
 url=https://github.com/ThingPulse/esp8266-oled-ssd1306
 architectures=esp8266,esp32
+license=MIT
diff --git a/lib/esp8266-oled-ssd1306-master/platformio.ini b/lib/esp8266-oled-ssd1306-master/platformio.ini
index db055d8d..530c046e 100644
--- a/lib/esp8266-oled-ssd1306-master/platformio.ini
+++ b/lib/esp8266-oled-ssd1306-master/platformio.ini
@@ -13,7 +13,7 @@ platform = espressif8266
 board = d1_mini
 framework = arduino
 upload_speed = 921600
-board_f_cpu = 160000000L
+board_build.f_cpu = 160000000L
 upload_port = /dev/cu.SLAB_USBtoUART
 monitor_port = /dev/cu.SLAB_USBtoUART
 lib_deps =
diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame1.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame1.jpg
deleted file mode 100644
index 536b570db09931ec634b38777033432276bafed8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16026
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

diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame2.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame2.jpg
deleted file mode 100644
index 8dccbcd0210b5c1dd7bad824982c1ecbf5c1edc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19502
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
N99K<Hh=?45|Jj<OQl0<+

diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame3.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame3.jpg
deleted file mode 100644
index 49e07ab53a6bbcfcc5922d5730c8492aaf8ba7bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21777
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
C1xwrj

diff --git a/lib/esp8266-oled-ssd1306-master/resources/DemoFrame4.jpg b/lib/esp8266-oled-ssd1306-master/resources/DemoFrame4.jpg
deleted file mode 100644
index 99cbe1bc41ce7fe01700f5cd00bf04da68f9602a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25325
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
L$#fM=#4rEZQ7{~E

diff --git a/lib/esp8266-oled-ssd1306-master/resources/FontTool.png b/lib/esp8266-oled-ssd1306-master/resources/FontTool.png
deleted file mode 100644
index c7bb222bed6067b921d8a3e479b56e4981a185d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14052
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
EUrx=8H~;_u

diff --git a/lib/esp8266-oled-ssd1306-master/resources/SPI_version.jpg b/lib/esp8266-oled-ssd1306-master/resources/SPI_version.jpg
deleted file mode 100644
index 115c9f3bccef1177204c88ef8b8cb8f22daa9e7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26912
zcmeFXXH*nj^Do*1NDw6FETBl193&Y?A|N0+j3i;mISGt{pk&EP6af(hM#&k;nUO4U
zfFTG7%z(fM1KjpW@Bf~4KHT?yxNF^Yp54>a)wOGfs@~yO)qVc$d=a3&tFEOEKp+r6
z6Fh+PC8lh(K-ePy(9r<|0RSKcC;=|u0!Tr?n|25lKmgLjAl(n4{(~k1>8}u4fbb6)
zFb5+3kIW22;t!f0lvyO8`%4C_={XD_`m4^LFRuJeGhQo{_@gZ_kLg~a<lpr$xfV+O
zLGyro?@e}q1gwt&EMK$90f6oQ?i)3D0RZ+*@Q?Hl^54IIE%2`e{<Xlr7Wmf!|61Vx
zObh&hTW)%Kx;g-``%WJ24%{*TATKH*Dh^0o7nf1EE(QL$#pM*hpM*33aD`|7jdf^)
z!*l+j!(Z_Hg<U}O^Md~``WOIS0>7~cKy+O~Li{D+-&lt><|WZTbZ!#lPZ<aSA&?CD
zr_PFGf`90SWWs;w_GF@e=>BAqzuE#dNhbS?2BA*!#eZZ*lj;B9gP4hSCOPDHTZHN$
zy_}r%M;{2qL7kJ6|3km|yU*g+ufKu(RVRp`-Vpqa!zjMIA^e*rd-;~>FBwqxf<JWu
z;UWMO68y#gO%whP`odo{2goP>o6qg`AKZ4){Xe*k<U3gWU)=WF2>+&kE%2`e{<Xlr
z7Wmf!|7Tm^H@sj5Pjc|Q@V`T9|2rNS_?ZSnK|3If69a%t)ga920eN(Pneum?hTut0
z3?=FzAtaLi0~d0`^gt#AjCPTOQKY|ONg(zi_>H3oL_zsiAcFag@tnZ>ZZPL>ncqn6
zZ@LMLi2Y4Bg3^D}5HJ>X5iASF#t210?q7Te9T-*nTL$dWKlJaI7+~w^3iI*3eqE1-
z0MG^Q0k;5szyL4@OaTzZg559%x`1!M6mSF#0y^NK0XzWnT>)<(1n>cz!7_$GFMtAY
z01~9k0TVzOFai<*UqA`C21o(Y057Q2Hn0KA0v3Qh@DPvzB!C>CAC$TWo@Kx|kOt;n
zfE)uIkTF0WETsZ;0z+UKE`SpV1P*~*@WcS8z!N|jatERc2mmX<87RXIN(ce3foSmV
z2s|hu;eZIh1h4>a05re{I08jrJ{Ry9xCEhv5JM6m7LZ6V_ZnFHEZDC~@Lv$%0D=KB
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
Vmt>cr&zI7iF#5{vw(shH|JlZ6us8q!

diff --git a/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html b/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html
deleted file mode 100644
index 31fbd907..00000000
--- a/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.html
+++ /dev/null
@@ -1,664 +0,0 @@
-<!--The MIT License (MIT)
-
-Copyright (c) 2017 by Xavier Grosjean
-
-Based on work 
-Copyright (c) 2016 by Daniel Eichhorn
-Copyright (c) 2016 by Fabrice Weinberg
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--->
-<!--
- Standalone page to draw icons in matrix and generates the map definition with the format required by 
- library for OLED SD1306 screen: https://github.com/squix78/esp8266-oled-ssd1306
- 100% quick and dirty vanilla ECS6, no framework or library was injured for this project.
-
--->
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <style>
-      #form, #chars table {
-        user-select: none; 
-        -moz-user-select: none; 
-        margin-top: 5px;
-      }
-      #chars table, tr, td, th {
-        border-collapse: collapse;
-      }
-      #chars td, th {
-        border: 1px solid #CCC;
-        width: 12px;
-        height: 15px;
-      }
-      #chars th[action] {
-        cursor:pointer;
-      }
-      #chars th[action="up"], #chars th[action="down"], #chars th[action="left"], #chars th[action="right"] {
-        font-size: 10px;
-      }
-      #chars td.on {
-        background-color: #00F;
-      }
-      
-      #addChar, #generate {
-        display: none;
-      }
-      body.started #addChar, body.started #generate {
-        display: inline;
-      }
-      body.started #create {
-        display: none;
-      }
-      #page {
-        position:relative;
-      }
-      #page>div {
-        position: relative;
-        float: left;
-      }
-
-      #output {
-        margin-left: 20px;
-        margin-top: 12px;
-        font-size:12px;
-        user-select: all;
-        -moz-user-select: all;
-        max-width:60%;
-      }
-      
-      #header {
-        margin-top: 10px;
-      }
-      #inputText {
-        width: 100%;
-        height:120px;
-      }
-      
-    </style>
-  </head>
-  <body>
-    <div id="form">
-      <table width="100%">
-        <tr>
-          <td>Font array name:</td><td><input placeholder="Font array name" type="text" id="name" value="My_Font"/></td>
-          <td width="75%" rowspan="5">
-            <textarea id="inputText" placeholder="Or paste a char array font definition here">
-const uint8_t My_Font[] PROGMEM = {
-  0x0A, // Width: 10
-  0x0D, // Height: 13
-  0x01, // First char: 1
-  0x02, // Number of chars: 2
-  // Jump Table:
-  0x00, 0x00, 0x13, 0x0A, // 1
-  0x00, 0x13, 0x14, 0x0A, // 2
-  // Font Data:
-  0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0x10, 0x02, 0xF0, 0x03, 0xC0, // 1
-  0x00, 0x0C, 0x80, 0x0B, 0x70, 0x08, 0x0C, 0x08, 0xF3, 0x0A, 0xF3, 0x0A, 0x0C, 0x08, 0x70, 0x08, 0x80, 0x0B, 0x00, 0x0C, // 2
-};              
-            </textarea></td>
-        </tr>
-        <tr>
-          <td>First char code:</td><td><input placeholder="First char code" type="number" id="code" value="1" min="1"/></td>
-        </tr>
-        <tr>
-          <td>Width:</td><td><input placeholder="Font width" type="number" id="width" value="10"/></td>
-        </tr>
-        <tr>
-          <td>Height:</td><td><input placeholder="Font height" type="number" id="height" value="13" max="64"/></td>
-        </tr>
-        <tr>
-          <td colspan="3"> </td>     <!--slightly improves layout-->
-        </tr>
-        <tr>
-          <td colspan="2">
-            <button id="create">Create</button>
-            <button id="shiftUp">Shift all up</button>
-            <button id="generate">Generate</button>
-            <button id="savetoFile">Save To File</button>
-          </td>
-          <td><input type="file" id="fileinput" />  <button id="parse">Parse</button></td>
-        </tr>
-      </table>
-      <br/>
-    </div>
-    <div id="page">
-      <div id="charxContainer" ondragstart="return false;">
-        <div id="chars"></div><br/>
-        <button id="addChar">Add a character</button>
-      </div>
-      <div id="output">
-        <div class="output" id="header"> </div>
-        <div class="output" id="jump"> </div>
-        <div class="output" id="data"> </div>
-      </div>
-    </div>
-    <script>
-    (function() {
-      let font;
-      
-      class Font {
-        constructor() {
-          this.height = parseInt(document.getElementById('height').value);
-          this.width = parseInt(document.getElementById('width').value);
-          this.currentCharCode = parseInt(document.getElementById('code').value);
-          this.fontContainer = document.getElementById('chars');
-          this.bytesForHeight = (1 + ((this.height - 1) >> 3));  // number of bytes needed for this font height
-          document.body.className = "started";
-          document.getElementById('height').disabled = true;
-          document.getElementById('width').disabled = true;          
-        }
-        
-        // Should we have a Char and a Pixel class ? not sure it's worth it.
-        // Let's use the DOM to store everything for now
-        
-        static updateCaption(element, code) {
-          element.textContent = `Char #${code}`;
-        }
-        
-        // Add a pixel matrix to draw a new character
-        // jumpaData not used for now: some day, use the last byte for optimisation 
-        addChar(jumpData, charData) {
-          let charContainer = this.fontContainer.appendChild(document.createElement("table"));
-          charContainer.setAttribute("code", this.currentCharCode);
-          let caption = charContainer.appendChild(document.createElement("caption"));
-          Font.updateCaption(caption, this.currentCharCode);
-          let header = charContainer.appendChild(document.createElement("tr"));
-          header.innerHTML = '<th  title="Delete this char" action="delete">&cross;</th>'
-              + '<th title="Add a char above" action="add">+</th>'
-              + '<th title="Shift pixels to the left" action="left">&larr;</th>'
-              + '<th title="Shift pixels down" action="down">&darr;</th>'
-              + '<th title="Shift pixels up" action="up">&uarr;</th>'
-              + '<th title="Shift pixels to the right" action="right">&rarr;</th>'
-              + '<th title="Copy from another character" action="copy">&copy;</th>'
-              + '<th title="Reset all pixels" action="clean">&empty;</th>';
-          // If data is provided, decode it to pixel initialization friendly structure
-          let pixelInit = [];
-          if (charData && charData.length) {
-            // charData byte count needs to be a multiple of bytesForHeight. End bytes with value 0 may have been trimmed
-            let missingBytes = charData.length % this.bytesForHeight;
-            for(let b = 0; b < missingBytes ; b++) {
-              charData.push(0);
-            }
-            while(charData.length) {
-              let row = charData.splice(0, this.bytesForHeight).reverse();
-              let pixelRow = [];
-              for (let b = 0; b < row.length; b++) {
-                let mask = 0x80;
-                let byte = row[b];
-                for (let bit = 0; bit < 8; bit++) {
-                  if (byte & mask) {
-                    pixelRow.push(1);
-                  } else {
-                    pixelRow.push(0);
-                  }
-                  mask = mask >> 1;
-                }
-              }
-              pixelRow.splice(0, pixelRow.length - this.height);
-              //Font.output('data', pixelRow);
-              pixelInit.push(pixelRow.reverse());
-            }
-          }
-          
-          for(let r = 0; r < this.height; r++) {
-          	let rowContainer = charContainer.appendChild(document.createElement("tr"));
-            for(let c = 0; c < this.width; c++) {
-          		let pixContainer = rowContainer.appendChild(document.createElement("td"));
-              pixContainer.setAttribute('action', 'toggle');
-          		// If there is some init data, set the pixel accordingly
-              if (pixelInit.length && pixelInit[c]) {
-                if (pixelInit[c][r]) {
-                  pixContainer.className = 'on';
-                }
-              }          		
-            }
-          }
-          this.currentCharCode++;
-          return charContainer;
-        }
-        
-        static togglePixel(pixel) {
-          pixel.className = pixel.className === 'on' ? '': 'on';
-        }
-        
-        // Return anInt as hex string
-        static toHexString(aByte) {
-          let zero = aByte < 16?'0':'';
-          return `0x${zero}${aByte.toString(16).toUpperCase()}`
-        }
-        
-        // Return least significant byte as hex string
-        static getLsB(anInt) {
-          return Font.toHexString(anInt & 0xFF);      
-        }
-        // Return most significant byte as hex string
-        static getMsB(anInt) {
-          return Font.toHexString(anInt>>>8);      
-        }
-       
-        static output(targetId, msg) {
-          let output = document.getElementById(targetId);
-          let line = output.appendChild(document.createElement('div'));
-          line.textContent = msg;
-        }
-        static emptyChars() {
-          document.getElementById('chars').textContent = '';
-        }
-        static emptyOutput() {
-          document.getElementById('header').textContent = '';
-          document.getElementById('jump').textContent = '';
-          document.getElementById('data').textContent = '';
-        }
-		
-        saveFile() {
-          let filename = document.getElementById('name').value.replace(/[^a-zA-Z0-9_$]/g, '_') + ".h";
-          let data = document.getElementById("output").innerText;
-          if(data.length < 10) return;
-          let blobObject = new Blob([data], {type:'text/plain'}); 
-    
-          if(window.navigator.msSaveBlob) {
-            window.navigator.msSaveBlob(blobObject, filename);
-          } else {
-            let a = document.createElement("a");
-            a.setAttribute("href", URL.createObjectURL(blobObject));
-            a.setAttribute("download", filename);
-            if (document.createEvent) {
-              let event = document.createEvent('MouseEvents');
-              event.initEvent('click', true, true);
-              a.dispatchEvent(event);
-            } else {
-              a.click();
-            }
-          }  
-        }
-			
-        // Read from the <td> css class the pixels that need to be on
-        // generates the jump table and font data 
-        generate() {
-          // this.width -= 3;  // hack to narrow an existing font
-          Font.emptyOutput();
-          let chars = this.fontContainer.getElementsByTagName('table');
-          let firstCharCode = parseInt(document.getElementById('code').value);
-          let name = document.getElementById('name').value.replace(/[^a-zA-Z0-9_$]/g, '_');
-          
-          let bits2add = this.bytesForHeight*8 - this.height;  // number of missing bits to fill leftmost byte
-          let charCount = chars.length;
-          let charAddr = 0;
-          // Comments are used when parsing back a generated font
-          Font.output('jump', '  // Jump Table:');
-          Font.output('data', '  // Font Data:');
-          // Browse each character
-          for(let ch = 0; ch < charCount; ch++) {
-            // Fix renumbering in case first char code was modified  
-            Font.updateCaption(chars[ch].getElementsByTagName('caption')[0], ch + firstCharCode);
-            let charBytes = [];
-            let charCode = ch + firstCharCode;
-            let rows = chars[ch].getElementsByTagName('tr');
-            let charNotZero = false;
-            // Browse each column
-            for(let col = 0; col < this.width ; col++) {
-              let bits = ""; // using string because js uses 32b ints when performing bit operations
-              // Browse each row starting from the bottom one, going up, and accumulate pixels in
-              // a string: this rotates the glyph
-              // Beware, row 0 is table headers.
-              for(let r = rows.length-1; r >=1 ; r--) {
-                let pixelState = rows[r].children[col].className;
-                bits += (pixelState === 'on' ? '1': '0');           
-              }
-              // Need to complete missing bits to have a sizeof byte multiple number of bits
-              for(let b = 0; b < bits2add; b++) {
-                bits =  '0' + bits;
-              }
-              // Font.output('data', `  // ${bits}`);  // Debugging help: rotated bitmap
-
-              // read bytes from the end
-              for(let b = bits.length - 1; b >= 7; b -= 8) {
-                //Font.output('data', `  // ${bits.substr(b-7, 8)}`);  // Debugging help: rotated bitmap
-                let byte = parseInt(bits.substr(b-7, 8), 2);
-                if (byte !== 0) {
-                  charNotZero = true;
-                }
-                charBytes.push(Font.toHexString(byte));
-              } 
-            }
-            // Compute the used width of the character:  
-            // rightmost column with pixels plus one
-            // one column is spread over several bytes...
-            let charWidth = 0;
-            for(let i=charBytes.length - 1; i >= 0; i-=this.bytesForHeight) {
-              let sum = 0;
-              for(let j=0; j < this.bytesForHeight; j++) {
-                sum += parseInt(charBytes[i - j], 16);
-              }
-              if(sum !== 0) {
-                charWidth = (i + 1)/this.bytesForHeight + 1;
-                break;
-              }
-            }
-
-            // Memory optim: Remove bytes with value 0 at the end of the array.
-            while(parseInt(charBytes[charBytes.length-1], 16) === 0 && charBytes.length > 1) {
-              charBytes.pop();
-            }
-            if (charNotZero) {
-              Font.output('data', `  ${charBytes.join(', ')},  // ${charCode}`);
-              Font.output('jump', `  ${Font.getMsB(charAddr)}, ${Font.getLsB(charAddr)}, ${Font.toHexString(charBytes.length)}, ${Font.toHexString(charWidth)},  // ${charCode} `);
-              charAddr += charBytes.length;
-            } else {
-              Font.output('jump', `  0xFF, 0xFF, 0x00, ${Font.toHexString(this.width)},  // ${charCode} `);
-            }
-          }
-          Font.output('data', '};');
-          
-          Font.output('header', "// Font generated or edited with the glyphEditor");
-          Font.output('header', `const uint8_t ${name}[] PROGMEM = {`);
-          // Comments are used when parsing back a generated font
-          Font.output('header', `  ${Font.toHexString(this.width)}, // Width: ${this.width}`);
-          Font.output('header', `  ${Font.toHexString(this.height)}, // Height: ${this.height}`);          
-          Font.output('header', `  ${Font.toHexString(firstCharCode)}, // First char: ${firstCharCode}`);
-          Font.output('header', `  ${Font.toHexString(charCount)}, // Number of chars: ${charCount}`);
-        }
-      }
-	  
-      document.getElementById('fileinput').addEventListener('change', function(e) {
-        let f = e.target.files[0]; 
-        if (f) {
-          let r = new FileReader();
-          r.onload = function(e) { 
-            let contents = e.target.result;
-                alert( "Got the file.\n" 
-                +"name: " + f.name + "\n"
-                +"type: " + f.type + "\n"
-                +"size: " + f.size + " bytes\n"
-                +"starts with: " + contents.substr(0, contents.indexOf("\n")) 
-            );
-              document.getElementById("inputText").value = contents;
-          };
-          r.readAsText(f);
-        } else { 
-          alert("Failed to load file");
-        }
-        });
-      
-      document.getElementById('savetoFile').addEventListener('click', function() {
-        font.saveFile();
-      });
-      
-      document.getElementById('shiftUp').addEventListener('click', function() {
-        var chars = document.getElementById("chars");
-        var tables = chars.getElementsByTagName("table");
-        for(var i=0; i< tables.length; i++) {
-          shiftUp(tables[i]);
-        }
-      });
-      
-      document.getElementById('generate').addEventListener('click', function() {
-        font.generate();
-      });
-      document.getElementById('addChar').addEventListener('click', function() {
-        font.addChar();
-      });
-      document.getElementById('inputText').addEventListener('click', function(e) {
-        let target = e.target;
-        target.select();
-      });
-      document.getElementById('chars').addEventListener('mousedown', function(e) {
-        if (e.button !== 0) return;
-        let target = e.target;
-        let action = target.getAttribute('action') || '';
-        if (action === '') return;
-        let result, code, nextContainer, previousContainer, pixels ;
-        let currentContainer = target.parentNode.parentNode;
-        switch(action) {
-          case 'add':
-            code = currentContainer.getAttribute('code');
-            nextContainer = font.addChar();
-            currentContainer.parentNode.insertBefore(nextContainer, currentContainer);
-            do {
-              nextContainer.setAttribute('code', code);
-              Font.updateCaption(nextContainer.getElementsByTagName('caption')[0], code);
-              code ++;
-            } while (nextContainer = nextContainer.nextSibling);
-            break;
-
-          case 'delete':
-            result = confirm("Delete this character ?");
-            if (!result) return;
-            code = currentContainer.getAttribute('code');
-            nextContainer = currentContainer;
-            while (nextContainer = nextContainer.nextSibling) {
-              nextContainer.setAttribute('code', code);
-              Font.updateCaption(nextContainer.getElementsByTagName('caption')[0], code);
-              code ++;
-            }
-            currentContainer.parentNode.removeChild(currentContainer);
-            break;
-
-          // Shift pixels to the left  
-          case 'left':
-            pixels = currentContainer.getElementsByTagName('td');
-            for(p = 0; p < pixels.length; p++) {
-              if((p + 1) % font.width) {
-                pixels[p].className = pixels[p + 1].className;
-              } else {
-                pixels[p].className = '';
-              }
-            }
-            break;
-          
-          // Shift pixels to the right
-          case 'right':
-            pixels = currentContainer.getElementsByTagName('td');
-            for(p = pixels.length-1; p >=0 ; p--) {
-              if(p % font.width) {
-                pixels[p].className = pixels[p - 1].className;
-              } else {
-                pixels[p].className = '';
-              }
-            }
-            break;
-
-          // Shift pixels down
-          case 'down':
-            pixels = currentContainer.getElementsByTagName('td');
-            for(p = pixels.length-1; p >=0 ; p--) {
-              if(p >= font.width) {
-                pixels[p].className = pixels[p - font.width].className;
-              } else {
-                pixels[p].className = '';
-              }
-            }            break;
-
-          // Shift pixels up
-          case 'up':
-            shiftUp(currentContainer);
-            break;
-
-          case 'toggle':
-            Font.togglePixel(target);
-            break;
-
-          case 'clean':
-            result = confirm("Delete the pixels ?");
-            if (!result) return;
-            pixels = currentContainer.getElementsByTagName('td');
-            for (let p = 0; p < pixels.length; p++) {
-              pixels[p].className = '';
-            }
-            break;
-          
-          case 'copy':
-             let charNumber = parseInt(prompt("Source char #: "));
-             let chars = font.fontContainer.getElementsByTagName('table');
-             let tableOffset = charNumber - parseInt(document.getElementById('code').value);
-             let srcPixels = chars[tableOffset].getElementsByTagName('td');
-             let targetPixels = currentContainer.getElementsByTagName('td');
-             for(let i=0; i < srcPixels.length; i++) {
-               // First tds are in the th row, for editing actions. Skip them
-               if (targetPixels[i].parentNode.localName === 'th') continue; // In case we give them css at some point...
-               targetPixels[i].className = srcPixels[i].className;
-             }
-            break;
-          default:
-            // no.
-        }
-        
-      });
-      function shiftUp(container) {
-        var pixels = container.getElementsByTagName('td');
-        for(p = 0; p < pixels.length; p++) {
-          if(p < font.width*(font.height -1)) {
-            pixels[p].className = pixels[p + font.width].className;
-          } else {
-            pixels[p].className = '';
-          }
-        }  
-      }
-      
-      document.getElementById('chars').addEventListener('mouseover', function(e) {
-        let target = e.target;
-        let action = target.getAttribute('action');
-        if (action !== 'toggle' || e.buttons !== 1) return;
-        Font.togglePixel(target);
-      });
-      document.getElementById('chars').addEventListener('dragstart', function() {
-        return false;
-      });
-
-      document.getElementById('create').addEventListener('click', function() {
-      	font = new Font();
-        font.addChar();
-      });
-
-      // parse a char array declaration for an existing font.
-      // parsing heavily relies on comments.
-      document.getElementById('parse').addEventListener('click', function() {
-        if (document.getElementById('chars').childElementCount) {
-          let result = confirm("Confirm you want to overwrite the existing grids ?");
-          if (!result) return;          
-        } 
-        let lines = document.getElementById('inputText').value.split('\n');
-        let name = '';
-        let height = 0;
-        let width = 0;
-        let firstCharCode = 0;
-        let jumpTable = [];
-        let charData = [];
-        let readingJumpTable = false;
-        let readingData = false;
-        
-        for(let l = 0 ; l < lines.length; l++) {
-          // TODO ? keep C compilation directives to copy them (not lowercased :)) to newly generated char array
-          let line = lines[l].trim();
-          //alert(line);
-          let fields;
-
-          // Declaration line: grab the name
-          if (line.indexOf('PROGMEM') > 0) {
-            fields = line.split(' ');
-            name = fields[2].replace(/[\[\]]/g, '');
-            continue;
-          }
-          line = line.toLowerCase();
-          // Todo: could rely on line order...
-          // width line: grab the width
-          if (line.indexOf('width') > 0) {
-            fields = line.split(',');
-            width = fields[0];
-            continue;
-          }
-          // height line: grab the height 
-          if (line.indexOf('height') > 0) {
-            fields = line.split(',');
-            height = fields[0];
-            continue;
-          }
-          // first char code line: grab the first char code 
-          if (line.indexOf('first char') > 0) {
-            fields = line.split(',');
-            firstCharCode = fields[0];
-            continue;
-          }
-          // End of array declaration
-          // TODO warn if more lines: next fonts are ignored
-          if (line.indexOf('};') === 0) {
-            break;
-          }
-          
-          if (readingJumpTable || readingData) {
-            if (line.indexOf('#') !== 0 && line.length !== 0 && line.indexOf('//') !== 0) {
-              line = line.replace(/\/\/.*/, ''); // get rid of end of line comments
-              fields = line.split(',');
-              let newEntry = [];
-              for(let f=0; f < fields.length; f++) {
-                let value = parseInt(fields[f]);
-                if (isNaN(value)) continue;
-                if (readingData) {
-                  charData.push(value);
-                }
-                if (readingJumpTable) {
-                  newEntry.push(value);
-                }
-              }
-              if (readingJumpTable) {
-                jumpTable.push(newEntry);
-              }
-            }            
-          }
-          
-          // Begining of data
-          if (line.indexOf('font data') > 0) {
-            readingData = true;
-            readingJumpTable = false;
-          }
-          // Begining of jump table
-          if (line.indexOf('jump table') > 0) {
-            readingJumpTable = true;
-          }
-        }
-        if (!name || !height || !width || !firstCharCode) {
-          alert("Does not look like a parsable font. Try again.");
-          return;
-        }
-        
-        Font.emptyChars();
-        Font.emptyOutput();
-        document.getElementById('name').value = name;
-        document.getElementById('height').value = parseInt(height);
-        document.getElementById('width').value = parseInt(width);
-        document.getElementById('code').value = parseInt(firstCharCode);
-      	font = new Font();
-      	for(let c = 0 ; c < jumpTable.length; c++) {
-      	  let jumpEntry = jumpTable[c];
-      	  let charEntry = [];
-      	  // displayable character 
-      	  if (jumpEntry[0] !== 255 || jumpEntry[1] !== 255) {
-      	    charEntry = charData.splice(0, jumpEntry[2]);
-          }
-      	  font.addChar(jumpEntry, charEntry);
-        }
-        document.body.className = "started";
-      });        
-      
-      })();
-    </script>  
-  </body>
-</html>
diff --git a/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.png b/lib/esp8266-oled-ssd1306-master/resources/glyphEditor.png
deleted file mode 100644
index 800efc56f4bd50ba347eab57f3205ec8d0c0dd31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68751
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
V=l%V&;(J^#ke61GDt>7i_#ZiQOU?iQ

diff --git a/lib/esp8266-oled-ssd1306-master/resources/xbmPreview.png b/lib/esp8266-oled-ssd1306-master/resources/xbmPreview.png
deleted file mode 100644
index 70ea3a53a843f220f18d2ef7cc0698516a990ba6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41692
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

diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp
index bf4a5ee0..89a80108 100644
--- a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.cpp
@@ -65,14 +65,14 @@ bool OLEDDisplay::allocateBuffer() {
   logBufferMaxLines = 0;
   logBuffer = NULL;
 
-  if (!this->connect()) {
+  if (!connect()) {
     DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Can't establish connection to display\n");
     return false;
   }
 
   if(this->buffer==NULL) {
-    this->buffer = (uint8_t*) malloc((sizeof(uint8_t) * displayBufferSize) + getBufferOffset());
-    this->buffer += getBufferOffset();
+    this->buffer = (uint8_t*) malloc((sizeof(uint8_t) * displayBufferSize) + BufferOffset);
+    this->buffer += BufferOffset;
 
     if(!this->buffer) {
       DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create display\n");
@@ -82,12 +82,12 @@ bool OLEDDisplay::allocateBuffer() {
 
   #ifdef OLEDDISPLAY_DOUBLE_BUFFER
   if(this->buffer_back==NULL) {
-    this->buffer_back = (uint8_t*) malloc((sizeof(uint8_t) * displayBufferSize) + getBufferOffset());
-    this->buffer_back += getBufferOffset();
+    this->buffer_back = (uint8_t*) malloc((sizeof(uint8_t) * displayBufferSize) + BufferOffset);
+    this->buffer_back += BufferOffset;
 
     if(!this->buffer_back) {
       DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create back buffer\n");
-      free(this->buffer - getBufferOffset());
+      free(this->buffer - BufferOffset);
       return false;
     }
   }
@@ -98,6 +98,8 @@ bool OLEDDisplay::allocateBuffer() {
 
 bool OLEDDisplay::init() {
 
+  BufferOffset = getBufferOffset();
+  
   if(!allocateBuffer()) {
     return false;
   }
@@ -109,9 +111,9 @@ bool OLEDDisplay::init() {
 }
 
 void OLEDDisplay::end() {
-  if (this->buffer) { free(this->buffer - getBufferOffset()); this->buffer = NULL; }
+  if (this->buffer) { free(this->buffer - BufferOffset); this->buffer = NULL; }
   #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-  if (this->buffer_back) { free(this->buffer_back - getBufferOffset()); this->buffer_back = NULL; }
+  if (this->buffer_back) { free(this->buffer_back - BufferOffset); this->buffer_back = NULL; }
   #endif
   if (this->logBuffer != NULL) { free(this->logBuffer); this->logBuffer = NULL; }
 }
diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h
index 8500b761..d43ee162 100644
--- a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplay.h
@@ -359,6 +359,7 @@ class OLEDDisplay : public Stream {
 
 
 	// the header size of the buffer used, e.g. for the SPI command header
+  int BufferOffset;
 	virtual int getBufferOffset(void) = 0;
 	
     // Send a command to the display (low level function)
diff --git a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp
index 6fcfafbf..778a2e77 100644
--- a/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp
+++ b/lib/esp8266-oled-ssd1306-master/src/OLEDDisplayUi.cpp
@@ -41,7 +41,7 @@ void LoadingDrawDefault(OLEDDisplay *display, LoadingStage* stage, uint8_t progr
 
 OLEDDisplayUi::OLEDDisplayUi(OLEDDisplay *display) {
   this->display = display;
-	
+
   indicatorPosition = BOTTOM;
   indicatorDirection = LEFT_RIGHT;
   activeSymbol = ANIMATION_activeSymbol;
@@ -300,7 +300,10 @@ void OLEDDisplayUi::resetState() {
 void OLEDDisplayUi::drawFrame(){
   switch (this->state.frameState){
      case IN_TRANSITION: {
-       float progress = (float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition;
+       float progress = 0.f;
+       if (this->ticksPerTransition > 0u) {
+         progress = (float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition;
+       }
        int16_t x = 0, y = 0, x1 = 0, y1 = 0;
        switch(this->frameAnimationDirection){
         case SLIDE_LEFT:
diff --git a/lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h b/lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h
index 7d27850f..9df32d14 100644
--- a/lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h
+++ b/lib/esp8266-oled-ssd1306-master/src/SSD1306Wire.h
@@ -82,7 +82,7 @@ class SSD1306Wire : public OLEDDisplay {
     }
 
     bool connect() {
-#if !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH8266)
+#if !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH_ESP8266)
       _wire->begin();
 #else
       // On ESP32 arduino, -1 means 'don't change pins', someone else has called begin for us.
@@ -198,7 +198,7 @@ class SSD1306Wire : public OLEDDisplay {
 
     void initI2cIfNeccesary() {
       if (_doI2cAutoInit) {
-#if !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH8266)
+#if !defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ARCH_ESP8266)
       	_wire->begin();
 #else
       	_wire->begin(this->_sda, this->_scl);
diff --git a/platformio.ini b/platformio.ini
index 5a340709..3a0ff0bd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.15"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.16"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 18cf7412..b0c7e11c 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -150,6 +150,11 @@ const char SSD1306[] PROGMEM = "SSD1306 - 0,96''";
 const char SH1106[] PROGMEM = "SH1106 - 1,3''";
 const char SSD1306_WEMOS_SHIELD[] PROGMEM = "SSD1306 - 0,66'' WEMOS OLED shield";
 const char* const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106, SSD1306_WEMOS_SHIELD};
+
+const char CONTROLL_NORMAL[] PROGMEM = "NORMALNE";
+const char CONTROLL_SLOW[] PROGMEM = "WOLNE";
+const char CONTROLL_MANUAL[] PROGMEM = "RĘCZNE";
+const char* const OLED_CONTROLL_P[] PROGMEM = {CONTROLL_NORMAL, CONTROLL_SLOW, CONTROLL_MANUAL};
 #endif
 
 #endif  // SuplaCommonPROGMEM_h
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 24f60372..3c8ffe7f 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -177,6 +177,8 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_ADDR_DS18B20, MAX_DS18B20_ADDRESS_HEX * MAX_DS18B20);
   this->addKey(KEY_NAME_SENSOR, MAX_DS18B20_NAME * MAX_DS18B20);
   this->addKey(KEY_LEVEL_LED, "0", 1);
+  this->addKey(KEY_OLED_ANIMATION, "0", 1);
+  this->addKey(KEY_OLED_BACK_LIGHT_TIME, "5", 2);
 
   this->load();
   //  switch (this->load()) {
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index ef012d53..dcd0f50f 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -44,8 +44,8 @@
 #define MAX_MONOSTABLE_TRIGGER  1
 #define MAX_FUNCTION            1
 
-#define MAX_DS18B20             20
-#define MAX_GPIO                17
+#define MAX_DS18B20 20
+#define MAX_GPIO    17
 
 enum _key
 {
@@ -74,9 +74,11 @@ enum _key
   KEY_ADDR_DS18B20,
   KEY_NAME_SENSOR,
   KEY_GPIO,
-  KEY_LEVEL_LED = KEY_GPIO + MAX_GPIO + 1
-  //KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
-  //KEY_DS_NAME = KEY_DS + MAX_DS18B20
+  KEY_LEVEL_LED = KEY_GPIO + MAX_GPIO + 1,
+  KEY_OLED_ANIMATION,
+  KEY_OLED_BACK_LIGHT_TIME
+  // KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
+  // KEY_DS_NAME = KEY_DS + MAX_DS18B20
 };
 
 //#define GPIO      "GPIO"
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 689c43cf..c3f68126 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -340,12 +340,24 @@ SuplaOled::SuplaOled() {
       ui->disableAutoTransition();
     }
     else {
+      switch (ConfigManager->get(KEY_OLED_ANIMATION)->getValueInt()) {
+        case OLED_CONTROLL_NORMAL:
+          ui->setTimePerFrame(5000);
+          break;
+        case OLED_CONTROLL_SLOW:
+          ui->setTimePerFrame(10000);
+          break;
+        case OLED_CONTROLL_MANUAL:
+          ui->disableAutoTransition();
+          ui->setTimePerTransition(250);
+          break;
+      }
+      /*ui->setTargetFPS(30);
       ui->setIndicatorPosition(BOTTOM);
       ui->setIndicatorDirection(LEFT_RIGHT);
-      ui->setFrameAnimation(SLIDE_LEFT);
+      ui->setFrameAnimation(SLIDE_LEFT);*/
     }
 
-    ui->setTargetFPS(60);
     ui->setFrames(frames, frameCount);
     ui->setOverlays(overlays, overlaysCount);
     ui->init();
@@ -360,7 +372,8 @@ void SuplaOled::iterateAlways() {
       return;
     }
 
-    if (millis() - timeLastChangeOled > 30000 && oledON) {
+    if (millis() - timeLastChangeOled > (ConfigManager->get(KEY_OLED_BACK_LIGHT_TIME)->getValueInt() * 1000) && oledON &&
+        ConfigManager->get(KEY_OLED_BACK_LIGHT_TIME)->getValueInt() != 0) {
       display->setBrightness(50);
       oledON = false;
       // display.displayOff();
@@ -381,11 +394,22 @@ void SuplaOled::iterateAlways() {
 void SuplaOled::addButtonOled(int pin) {
   if (pin != OFF_GPIO) {
     Supla::Control::Button* button = new Supla::Control::Button(pin, true, true);
-    button->addAction(TURN_ON_OLED, this, Supla::ON_PRESS);
+
+    if (ConfigManager->get(KEY_OLED_BACK_LIGHT_TIME)->getValueInt() != 0) {
+      button->addAction(TURN_ON_OLED, this, Supla::ON_PRESS);
+    }
+
+    if (ConfigManager->get(KEY_OLED_ANIMATION)->getValueInt() == OLED_CONTROLL_MANUAL) {
+      button->addAction(NEXT_FRAME, this, Supla::ON_PRESS);
+    }
   }
 }
 
 void SuplaOled::handleAction(int event, int action) {
+  if (action == NEXT_FRAME) {
+    ui->nextFrame();
+  }
+
   if (action == TURN_ON_OLED) {
     display->setBrightness(255);
     timeLastChangeOled = millis();
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index 61e8b787..da33d3e6 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -14,7 +14,8 @@
 
 enum customActions
 {
-  TURN_ON_OLED
+  TURN_ON_OLED,
+  NEXT_FRAME
 };
 
 enum _OLED
@@ -24,6 +25,13 @@ enum _OLED
   OLED_SSD1306_0_66
 };
 
+enum
+{
+  OLED_CONTROLL_NORMAL,
+  OLED_CONTROLL_SLOW,
+  OLED_CONTROLL_MANUAL
+};
+
 String getTempString(double temperature);
 String getHumidityString(double humidity);
 String getPressureString(double pressure);
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 299964d0..e7e5dbcb 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -452,6 +452,16 @@ void SuplaWebPageSensor::handlei2cSave() {
     ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_OLED, WebServer->httpServer.arg(input).toInt());
   }
 
+  if (!WebServer->saveGPIO(INPUT_BUTTON_GPIO, FUNCTION_CFG_BUTTON)) {
+    supla_webpage_i2c(6);
+    return;
+  }
+
+  input = INPUT_OLED_ANIMATION;
+  ConfigManager->set(KEY_OLED_ANIMATION, WebServer->httpServer.arg(input).c_str());
+  input = INPUT_OLED_BRIGHTNESS;
+  ConfigManager->set(KEY_OLED_BACK_LIGHT_TIME, WebServer->httpServer.arg(input).c_str());
+
   for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
     input = INPUT_DS18B20_NAME;
     input += i;
@@ -521,17 +531,24 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #endif
 
 #ifdef SUPLA_OLED
-    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
     addFormHeader(webContentBuffer);
+
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
     addListBox(webContentBuffer, INPUT_OLED, F("OLED"), OLED_P, 4, selected);
+
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
       String name, sensorName, input;
 
+      addListGPIOBox(webContentBuffer, INPUT_BUTTON_GPIO, F("PRZYCISK OLED"), FUNCTION_CFG_BUTTON);
+      selected = ConfigManager->get(KEY_OLED_ANIMATION)->getValueInt();
+      addListBox(webContentBuffer, INPUT_OLED_ANIMATION, F("STEROWANIE"), OLED_CONTROLL_P, 3, selected);
+      addNumberBox(webContentBuffer, INPUT_OLED_BRIGHTNESS, F("PODŚWIETLENIE[s]"), KEY_OLED_BACK_LIGHT_TIME, 99);
+
       for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
         sensorName = String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
         input = INPUT_DS18B20_NAME;
         input += i;
-        name = F("Ekran ");
+        name = F("EKRAN ");
         name += i + 1;
         addTextBox(webContentBuffer, input, name, sensorName, 0, MAX_DS18B20_NAME, false);
       }
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index c0b98eb1..c539868f 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -3,6 +3,7 @@
 
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
+#include "SuplaWebPageControl.h"
 
 #define PATH_MULTI_DS                 "multids"
 #define PATH_SAVE_MULTI_DS            "savemultids"
@@ -27,6 +28,8 @@
 #define INPUT_SHT3x                            "sht30"
 #define INPUT_SI7021                           "si7021"
 #define INPUT_OLED                             "oled"
+#define INPUT_OLED_ANIMATION                   "oleda"
+#define INPUT_OLED_BRIGHTNESS                  "oledb"
 #define INPUT_MCP23017                         "mcp"
 #define INPUT_SI7021_SONOFF                    "si7021sonoff"
 #define INPUT_TRIG_GPIO                        "trig"

From 6533c27e591c95e083360c94e051d557bd5d2f5f Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 28 Jan 2021 21:30:58 +0100
Subject: [PATCH 050/165] poprawki oled

---
 platformio.ini    | 2 +-
 src/SuplaOled.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 3a0ff0bd..4caa2fdb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.16"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.17"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index c3f68126..140f31ee 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -352,15 +352,17 @@ SuplaOled::SuplaOled() {
           ui->setTimePerTransition(250);
           break;
       }
-      /*ui->setTargetFPS(30);
+      ui->setTargetFPS(30);
       ui->setIndicatorPosition(BOTTOM);
       ui->setIndicatorDirection(LEFT_RIGHT);
-      ui->setFrameAnimation(SLIDE_LEFT);*/
+      ui->setFrameAnimation(SLIDE_LEFT);
     }
 
     ui->setFrames(frames, frameCount);
     ui->setOverlays(overlays, overlaysCount);
     ui->init();
+    
+    display->setBrightness(255);
     display->flipScreenVertically();
   }
 }

From 68559869ff20df1a5a8194f4e8b6ed132aa8698c Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 28 Jan 2021 21:31:17 +0100
Subject: [PATCH 051/165] poprawki HLW8012

---
 lib/SuplaDevice/src/supla/sensor/HJ101.cpp | 22 +++++++---------------
 lib/SuplaDevice/src/supla/sensor/HJ101.h   | 15 +++++++++++----
 src/SuplaTemplateBoard.cpp                 |  1 -
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
index 13b3f082..37217aa1 100644
--- a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
@@ -50,14 +50,14 @@ void HJ101::readValuesFromDevice() {
 }
 
 void HJ101::onSaveState() {
-  double current_multiplier = getCurrentMultiplier();
-  double voltage_multiplier = getVoltageMultiplier();
-  double power_multiplier = getPowerMultiplier();
+  //double current_multiplier = getCurrentMultiplier();
+  //double voltage_multiplier = getVoltageMultiplier();
+  //double power_multiplier = getPowerMultiplier();
 
   Supla::Storage::WriteState((unsigned char *)&energy, sizeof(energy));
-  Supla::Storage::WriteState((unsigned char *)&current_multiplier, sizeof(current_multiplier));
-  Supla::Storage::WriteState((unsigned char *)&voltage_multiplier, sizeof(voltage_multiplier));
-  Supla::Storage::WriteState((unsigned char *)&power_multiplier, sizeof(power_multiplier));
+  //Supla::Storage::WriteState((unsigned char *)&current_multiplier, sizeof(current_multiplier));
+  //Supla::Storage::WriteState((unsigned char *)&voltage_multiplier, sizeof(voltage_multiplier));
+  //Supla::Storage::WriteState((unsigned char *)&power_multiplier, sizeof(power_multiplier));
 }
 
 void HJ101::onLoadState() {
@@ -134,18 +134,10 @@ void HJ101::calibrate(double calibPower, double calibVoltage) {
   Serial.println(voltage_multi);
   Serial.print(F("[HLW] New power multiplier   : "));
   Serial.println(power_multi);
-  saveState();
+  Supla::Storage::ScheduleSave(1000);
   yield();
 }
 
-void HJ101::saveState() {
-  Supla::Storage::PrepareState();
-  for (auto element = Supla::Element::begin(); element != nullptr; element = element->next()) {
-    element->onSaveState();
-  }
-  Supla::Storage::FinalizeSaveState();
-}
-
 HLW8012 *HJ101::hj101 = nullptr;
 };  // namespace Sensor
 };  // namespace Supla
\ No newline at end of file
diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.h b/lib/SuplaDevice/src/supla/sensor/HJ101.h
index c4814604..5ccd921d 100644
--- a/lib/SuplaDevice/src/supla/sensor/HJ101.h
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.h
@@ -6,8 +6,9 @@
 
 // https://github.com/xoseperez/hlw8012
 #include <HLW8012.h>
-#include <supla/storage/storage.h>
 #include <supla/element.h>
+#include <supla/storage/storage.h>
+
 #include "one_phase_electricity_meter.h"
 
 namespace Supla {
@@ -15,7 +16,11 @@ namespace Sensor {
 
 class HJ101 : public OnePhaseElectricityMeter, public Element {
  public:
-  HJ101(int8_t pinCF, int8_t pinCF1, int8_t pinSEL, bool currentWhen = LOW, bool use_interrupts = true);
+  HJ101(int8_t pinCF,
+        int8_t pinCF1,
+        int8_t pinSEL,
+        bool currentWhen = LOW,
+        bool use_interrupts = true);
 
   void onInit();
   void readValuesFromDevice();
@@ -26,7 +31,6 @@ class HJ101 : public OnePhaseElectricityMeter, public Element {
   static void ICACHE_RAM_ATTR hjl01_cf1_interrupt();
   static void ICACHE_RAM_ATTR hjl01_cf_interrupt();
   void calibrate(double calibPower, double calibVoltage);
-  void saveState();
 
   double getCurrentMultiplier() {
     return hj101->getCurrentMultiplier();
@@ -40,12 +44,15 @@ class HJ101 : public OnePhaseElectricityMeter, public Element {
 
   void setCurrentMultiplier(double current_multiplier) {
     hj101->setCurrentMultiplier(current_multiplier);
+    Supla::Storage::ScheduleSave(1000);
   };
   void setVoltageMultiplier(double voltage_multiplier) {
     hj101->setVoltageMultiplier(voltage_multiplier);
+    Supla::Storage::ScheduleSave(1000);
   };
   void setPowerMultiplier(double power_multiplier) {
     hj101->setPowerMultiplier(power_multiplier);
+    Supla::Storage::ScheduleSave(1000);
   };
 
  protected:
@@ -57,7 +64,7 @@ class HJ101 : public OnePhaseElectricityMeter, public Element {
   bool use_interrupts;
 
   unsigned _supla_int64_t energy;
-  unsigned _supla_int64_t _energy;  // ----------  energy value read from memory at startup ----
+  unsigned _supla_int64_t _energy;  // energy value read from memory at startup
 };
 
 };  // namespace Sensor
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 88aa8ace..1fd78e46 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -205,7 +205,6 @@ void chooseTemplateBoard(uint8_t board) {
       Supla::GUI::counterHLW8012->setCurrentMultiplier(18388);
       Supla::GUI::counterHLW8012->setVoltageMultiplier(247704);
       Supla::GUI::counterHLW8012->setPowerMultiplier(2586583);
-      Supla::GUI::counterHLW8012->saveState();
 #endif
       break;
   }

From 79aaeac9aa830d40f6d9963b0dd3f836aaaa119f Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 29 Jan 2021 13:32:27 +0100
Subject: [PATCH 052/165] MCP23017 -> LEVEL_RELAY, LEVEL_BUTTON

---
 platformio.ini              |  2 +-
 src/Markup.cpp              | 61 +++++++++++++++++++++++++++----------
 src/Markup.h                | 19 ++++++++++--
 src/SuplaConfigESP.cpp      | 30 ++++++++++++++----
 src/SuplaConfigManager.h    |  2 ++
 src/SuplaWebPageControl.cpp | 11 +++----
 src/SuplaWebPageRelay.cpp   | 11 +++----
 src/SuplaWebServer.cpp      |  2 ++
 8 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 4caa2fdb..8be24209 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.17"'
+build_flags =   -D BUILD_VERSION='"GUI 1.1.18"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/Markup.cpp b/src/Markup.cpp
index c00b434c..4e5b0069 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -141,7 +141,7 @@ void addLinkBox(String& html, const String& name, const String& url) {
   html += url;
   html += F("'>");
   html += name;
-  //html += PGMT(ICON_EDIT);
+  // html += PGMT(ICON_EDIT);
   html += F("</a>");
   html += F("</label>");
   html += F("</i>");
@@ -181,26 +181,16 @@ void addListMCP23017GPIOBox(String& html, const String& input_id, const String&
 void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr) {
   if (nr == 1) {
     uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
-    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address);
+    addListLinkBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address, url);
   }
 
-  html += F("<i>");
-  html += F("<label>");
-  if (ConfigESP->getGpioMCP23017(nr, function) != OFF_GPIO) {
-    html += F("<a href='");
-    html += PATH_START;
-    html += url;
-    html += F("'>");
-  }
+  html += F("<i><label>");
   if (nr > 0) {
     html += nr;
-    html += F(". ");
+    html += F(".");
   }
+  html += F(" ");
   html += name;
-  if (ConfigESP->getGpioMCP23017(nr, function) != OFF_GPIO) {
-   // html += PGMT(ICON_EDIT);
-    html += F("</a>");
-  }
   html += F("</label>");
   addListMCP23017GPIO(html, input_id, function, nr);
   html += F("</i>");
@@ -267,6 +257,46 @@ void addListBox(String& html, const String& input_id, const String& name, const
   html += F("</select></i>");
 }
 
+void addListLinkBox(String& html,
+                    const String& input_id,
+                    const String& name,
+                    const char* const* array_P,
+                    uint8_t size,
+                    uint8_t selected,
+                    const String& url,
+                    uint8_t nr) {
+  html += F("<i><label><a href='");
+  html += PATH_START;
+  html += url;
+  html += F("'>");
+
+  if (nr != 0) {
+    html += nr;
+    html += F(". ");
+  }
+  html += name;
+  html += F("</a>");
+  html += "</label><select name='";
+  html += input_id;
+  if (nr != 0) {
+    html += nr;
+  }
+  html += F("'>");
+
+  for (uint8_t suported = 0; suported < size; suported++) {
+    html += F("<option value='");
+    html += suported;
+    if (selected == suported) {
+      html += F("' selected>");
+    }
+    else {
+      html += F("'>");
+    }
+    html += PGMT(array_P[suported]);
+  }
+  html += F("</select></i>");
+}
+
 void addButton(String& html, const String& name, const String& url) {
   html += F("<a href='");
   html += getURL(url);
@@ -313,7 +343,6 @@ void addListGPIOSelect(String& html, const String& input_id, uint8_t function, u
 }
 
 void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function, uint8_t nr) {
-  ;
   html += F("<select name='");
   html += input_id;
   html += nr;
diff --git a/src/Markup.h b/src/Markup.h
index f04c9200..a030cbc9 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -34,8 +34,14 @@ void addTextBox(String& html,
 void addTextBox(
     String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required, bool readonly = false);
 
-void addTextBox(
-    String& html, const String& input_id, const String& name, const String& value, int minlength, int maxlength, bool required,  bool readonly = false);
+void addTextBox(String& html,
+                const String& input_id,
+                const String& name,
+                const String& value,
+                int minlength,
+                int maxlength,
+                bool required,
+                bool readonly = false);
 
 void addTextBoxPassword(String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required);
 
@@ -55,6 +61,15 @@ void addListGPIOLinkBox(String& html, const String& input_id, const String& name
 
 void addListBox(String& html, const String& input_id, const String& name, const char* const* list_P, uint8_t size, uint8_t selected, uint8_t nr = 0);
 
+void addListLinkBox(String& html,
+                    const String& input_id,
+                    const String& name,
+                    const char* const* array_P,
+                    uint8_t size,
+                    uint8_t selected,
+                    const String& url,
+                    uint8_t nr = 0);
+
 void addButton(String& html, const String& name, const String& url);
 
 void addButtonSubmit(String& html, const String& name);
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 9bfff53b..b0c55fa5 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -292,24 +292,42 @@ int SuplaConfigESP::getLevel(int nr, int function) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(LEVEL).toInt();
-              ;
+              switch (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt()) {
+                case FUNCTION_RELAY:
+                  return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
+                  break;
+                case FUNCTION_BUTTON:
+                  return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+                  break;
+              }
             }
           }
           break;
         case 1:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(LEVEL).toInt();
-              ;
+              switch (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt()) {
+                case FUNCTION_RELAY:
+                  return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
+                  break;
+                case FUNCTION_BUTTON:
+                  return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+                  break;
+              }
             }
           }
           break;
         case 2:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(LEVEL).toInt();
-              ;
+              switch (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt()) {
+                case FUNCTION_RELAY:
+                  return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
+                  break;
+                case FUNCTION_BUTTON:
+                  return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+                  break;
+              }
             }
           }
           break;
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index dcd0f50f..6f7be111 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -100,6 +100,8 @@ enum _settings
   MCP23017_FUNCTION_3,
   MCP23017_NR_4,
   MCP23017_FUNCTION_4,
+  LEVEL_RELAY,
+  LEVEL_BUTTON,
   SETTINGSCOUNT
 };
 
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 996b70bb..b188a0bf 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -355,13 +355,10 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   input = INPUT_BUTTON_ACTION;
   action = WebServer->httpServer.arg(input).toInt();
 
-  for (uint8_t i = 1; i <= OFF_GPIO; i++) {
-    gpio = ConfigESP->getGpioMCP23017(i, FUNCTION_BUTTON);
-    if (gpio != OFF_GPIO) {
-      key = KEY_GPIO + gpio;
-      ConfigManager->setElement(key, LEVEL, level);
-      ConfigManager->setElement(key, ACTION, action);
-    }
+  for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    key = KEY_GPIO + gpio;
+    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+    ConfigManager->setElement(key, ACTION, action);
   }
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 09f4bb08..d6fc0862 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -261,13 +261,10 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
   input = INPUT_RELAY_LEVEL;
   level = WebServer->httpServer.arg(input).toInt();
 
-  for (uint8_t i = 1; i <= OFF_GPIO; i++) {
-    gpio = ConfigESP->getGpioMCP23017(i, FUNCTION_RELAY);
-    if (gpio != OFF_GPIO) {
-      key = KEY_GPIO + gpio;
-      ConfigManager->setElement(key, MEMORY, memory);
-      ConfigManager->setElement(key, LEVEL, level);
-    }
+  for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    key = KEY_GPIO + gpio;
+    ConfigManager->setElement(key, MEMORY, memory);
+    ConfigManager->setElement(key, LEVEL_RELAY, level);
   }
 
   switch (ConfigManager->save()) {
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index c20e6b4a..62649dff 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -344,6 +344,8 @@ void SuplaWebServer::sendContent() {
 void SuplaWebServer::handleNotFound() {
   httpServer.sendHeader("Location", "/", true);
   httpServer.send(302, "text/plane", "");
+
+  supla_webpage_reboot();
 }
 
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {

From 879749900467fed110c56852ef2925d4c30c15c9 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 4 Feb 2021 12:59:26 +0100
Subject: [PATCH 053/165] wsparcie dla RGBW, RGB, DIMMER

---
 platformio.ini             |   9 +-
 src/GUI-Generic.ino        |   7 +
 src/GUI-Generic_Config.h   |   3 +
 src/Markup.cpp             |  14 +-
 src/Markup.h               |   4 +-
 src/SuplaConfigESP.cpp     |  16 +-
 src/SuplaConfigManager.cpp |  10 +-
 src/SuplaConfigManager.h   |  13 +-
 src/SuplaDeviceGUI.cpp     |  65 ++++++-
 src/SuplaDeviceGUI.h       |  12 ++
 src/SuplaOled.cpp          |  10 +-
 src/SuplaTemplateBoard.cpp |  50 ++++--
 src/SuplaTemplateBoard.h   |   8 +-
 src/SuplaWebPageOther.cpp  | 359 +++++++++++++++++++++++++++++++++++++
 src/SuplaWebPageOther.h    |  53 ++++++
 src/SuplaWebPageSensor.cpp | 351 ------------------------------------
 src/SuplaWebPageSensor.h   |  35 ----
 src/SuplaWebServer.cpp     |  24 +--
 src/language/pl.h          |   1 -
 19 files changed, 605 insertions(+), 439 deletions(-)
 create mode 100644 src/SuplaWebPageOther.cpp
 create mode 100644 src/SuplaWebPageOther.h

diff --git a/platformio.ini b/platformio.ini
index 8be24209..edc13b3c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI 1.1.18"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.0"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -44,7 +44,8 @@ build_flags =   -D BUILD_VERSION='"GUI 1.1.18"'
                 -D SUPLA_IMPULSE_COUNTER
                 -D SUPLA_OLED
                 -D SUPLA_HLW8012
-                -D SUPLA_MCP23017             
+                -D SUPLA_MCP23017
+                -D SUPLA_RGBW             
 
 [env]
 framework = arduino
@@ -53,8 +54,10 @@ upload_speed = 256000
 monitor_speed = 74880
 upload_resetmethod = nodemcu
 board_build.flash_mode = dout
-; set frequency to 160MHz
+;set frequency to 160MHz
 board_build.f_cpu = 160000000L
+; set frequency to 80MHz
+board_build.f_flash = 80000000L
 lib_deps = 
 	milesburton/DallasTemperature@^3.9.1
 	adafruit/DHT sensor library@^1.4.0
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index d43920d0..09c3b128 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -195,6 +195,13 @@ void setup() {
 #endif
   }
 #endif
+
+#ifdef SUPLA_RGBW
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RGBW)->getValueInt(); nr++) {
+    Supla::GUI::addRGBWLeds(nr);
+  }
+#endif
+
   Supla::GUI::begin();
 }
 
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index c3d7cb17..23c604a7 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -1,7 +1,9 @@
 #ifndef GUI_Generic_Config_h
 #define GUI_Generic_Config_h
 
+#ifndef DEBUG_MODE
 #define supla_lib_config_h_  // silences unnecessary debug messages "should be disabled by default"
+#endif
 
 //#define USE_CUSTOM
 
@@ -49,6 +51,7 @@
 #define SUPLA_HC_SR04
 #define SUPLA_IMPULSE_COUNTER
 #define SUPLA_HLW8012
+#define SUPLA_RGBW
 
 #endif
 #endif  // GUI-Generic_Config_h
diff --git a/src/Markup.cpp b/src/Markup.cpp
index 4e5b0069..98f7127f 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -147,8 +147,14 @@ void addLinkBox(String& html, const String& name, const String& url) {
   html += F("</i>");
 }
 
-void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr) {
-  html += F("<i><label>");
+void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr, bool underline) {
+  if (underline) {
+    html += F("<i><label>");
+  }
+  else {
+    html += F("<i style='border-bottom:none !important;'><label>");
+  }
+
   if (nr > 0) {
     html += nr;
     html += F(".");
@@ -370,6 +376,10 @@ String getURL(const String& url) {
   return String(F(PATH_START)) + url;
 }
 
+String getURL(const String& url, uint8_t nr) {
+  return String(F(PATH_START)) + url + nr;
+}
+
 const String SuplaJavaScript(const String& java_return) {
   String java_script =
       F("<script type='text/javascript'>setTimeout(function(){var "
diff --git a/src/Markup.h b/src/Markup.h
index a030cbc9..98336e98 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -51,7 +51,7 @@ void addNumberBox(String& html, const String& input_id, const String& name, cons
 
 void addLinkBox(String& html, const String& name, const String& url);
 
-void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0);
+void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr = 0, bool underline = true);
 
 void addListMCP23017GPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr);
 
@@ -80,6 +80,8 @@ void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function,
 
 String getURL(const String& url);
 
+String getURL(const String& url, uint8_t nr);
+
 const String SuplaJavaScript(const String& java_return = PATH_START);
 
 const String SuplaSaveResult(int save);
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index b0c55fa5..6722db57 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -679,12 +679,12 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
     ConfigManager->set(KEY_HOST_NAME, DEFAULT_HOSTNAME);
     ConfigManager->set(KEY_LOGIN, DEFAULT_LOGIN);
     ConfigManager->set(KEY_LOGIN_PASS, DEFAULT_LOGIN_PASS);
-    ConfigManager->set(KEY_MAX_RELAY, "1");
-    ConfigManager->set(KEY_MAX_BUTTON, "1");
+    ConfigManager->set(KEY_MAX_RELAY, "0");
+    ConfigManager->set(KEY_MAX_BUTTON, "0");
     ConfigManager->set(KEY_MAX_LIMIT_SWITCH, "0");
-    ConfigManager->set(KEY_MAX_DHT22, "1");
-    ConfigManager->set(KEY_MAX_DHT11, "1");
-    ConfigManager->set(KEY_MULTI_MAX_DS18B20, "1");
+    ConfigManager->set(KEY_MAX_DHT22, "0");
+    ConfigManager->set(KEY_MAX_DHT11, "0");
+    ConfigManager->set(KEY_MULTI_MAX_DS18B20, "0");
     ConfigManager->set(KEY_MAX_ROLLERSHUTTER, "0");
     ConfigManager->set(KEY_ALTITUDE_BME280, "0");
     ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, "0");
@@ -694,7 +694,7 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
     ConfigManager->set(KEY_CFG_MODE, "0");
 
     uint8_t nr, key;
-    for (nr = 0; nr <= 17; nr++) {
+    for (nr = 0; nr <= OFF_GPIO; nr++) {
       key = KEY_GPIO + nr;
       ConfigManager->set(key, "");
     }
@@ -704,6 +704,8 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
 
     ConfigManager->save();
 
-    // rebootESP();
+    if (!forceReset) {
+      rebootESP();
+    }
   }
 }
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 3c8ffe7f..d5d024a6 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -77,7 +77,7 @@ int ConfigOption::getLength() {
 
 const String ConfigOption::getElement(int index) {
   String data = _value;
-  data.reserve(_maxLength);
+ // data.reserve(_maxLength);
   int found = 0;
   int strIndex[] = {0, -1};
   int maxIndex = data.length() - 1;
@@ -168,7 +168,7 @@ SuplaConfigManager::SuplaConfigManager() {
 
   for (nr = 0; nr <= 17; nr++) {
     key = KEY_GPIO + nr;
-    this->addKey(key, "", SETTINGSCOUNT * 2);
+    this->addKey(key, "", SETTINGSCOUNT * 3);
   }
 
   this->addKey(KEY_ACTIVE_SENSOR, "", 16);
@@ -179,6 +179,7 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_LEVEL_LED, "0", 1);
   this->addKey(KEY_OLED_ANIMATION, "0", 1);
   this->addKey(KEY_OLED_BACK_LIGHT_TIME, "5", 2);
+  this->addKey(KEY_MAX_RGBW, "0", 2);
 
   this->load();
   //  switch (this->load()) {
@@ -377,6 +378,11 @@ ConfigOption *SuplaConfigManager::get(uint8_t key) {
   }
   return NULL;
 }
+bool SuplaConfigManager::set(uint8_t key, int value) {
+  char buffer[10];
+  itoa(value, buffer, 10);
+  return set(key, buffer);
+}
 
 bool SuplaConfigManager::set(uint8_t key, const char *value) {
   for (int i = 0; i < _optionCount; i++) {
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 6f7be111..3cdb2c51 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -76,9 +76,8 @@ enum _key
   KEY_GPIO,
   KEY_LEVEL_LED = KEY_GPIO + MAX_GPIO + 1,
   KEY_OLED_ANIMATION,
-  KEY_OLED_BACK_LIGHT_TIME
-  // KEY_DS = KEY_GPIO + MAX_GPIO + MAX_DS18B20,
-  // KEY_DS_NAME = KEY_DS + MAX_DS18B20
+  KEY_OLED_BACK_LIGHT_TIME,
+  KEY_MAX_RGBW
 };
 
 //#define GPIO      "GPIO"
@@ -128,7 +127,12 @@ enum _function
   FUNCTION_CF,
   FUNCTION_CF1,
   FUNCTION_SEL,
-  FUNCTION_LED
+  FUNCTION_LED,
+  FUNCTION_RGBW_RED,
+  FUNCTION_RGBW_GREEN,
+  FUNCTION_RGBW_BLUE,
+  FUNCTION_RGBW_BRIGHTNESS,
+  FUNCTION_RGBW_COLOR_BRIGHTNESS
 };
 
 enum _e_onfig
@@ -178,6 +182,7 @@ class SuplaConfigManager {
   void showAllValue();
 
   ConfigOption *get(uint8_t key);
+  bool set(uint8_t key, int value);
   bool set(uint8_t key, const char *value);
   bool setElement(uint8_t key, int index, int newvalue);
   bool setElement(uint8_t key, int index, const char *newvalue);
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index c73f7fc8..cea01ab6 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -54,6 +54,7 @@ void begin() {
 }
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
+
 void addRelayButton(uint8_t nr) {
   uint8_t pinRelay, pinButton, pinLED;
   bool highIsOn, levelLed;
@@ -82,7 +83,7 @@ void addRelayButton(uint8_t nr) {
     }
 
     relay[size]->keepTurnOnDuration();
-    eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
+        // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
     if (pinButton != OFF_GPIO) {
       button.push_back(new Supla::Control::Button(pinButton, true));
@@ -149,7 +150,7 @@ void addRolleShutter(uint8_t nr) {
   else if ((pinButtonUp == OFF_GPIO && pinButtonDown != OFF_GPIO) || (pinButtonUp != OFF_GPIO && pinButtonDown == OFF_GPIO)) {
     RollerShutterButtonOpen[size]->addAction(Supla::STEP_BY_STEP, *RollerShutterRelay[size], Supla::ON_PRESS);
   }
-  eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
+  // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
   if (pinLedUP != OFF_GPIO) {
     new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, !levelLed);
@@ -186,7 +187,7 @@ void addRolleShutterMomentary(uint8_t nr) {
     RollerShutterButtonClose[size]->addAction(Supla::CLOSE, *RollerShutterRelay[size], Supla::ON_PRESS);
     RollerShutterButtonClose[size]->addAction(Supla::STOP, *RollerShutterRelay[size], Supla::ON_RELEASE);
   }
-  eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
+  // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
   if (pinLedUP != OFF_GPIO) {
     new Supla::Control::PinStatusLed(pinRelayUp, pinLedUP, !levelLed);
@@ -206,6 +207,64 @@ void addImpulseCounter(int pin, bool lowToHigh, bool inputPullup, unsigned int d
 }
 #endif
 
+#ifdef SUPLA_RGBW
+void addRGBWLeds(uint8_t nr) {
+  int redPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_RED);
+  int greenPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_GREEN);
+  int bluePin = ConfigESP->getGpio(nr, FUNCTION_RGBW_BLUE);
+  int colorBrightnessPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_COLOR_BRIGHTNESS);
+  int brightnessPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_BRIGHTNESS);
+  int buttonPin = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
+
+  if (redPin != OFF_GPIO && greenPin != OFF_GPIO && bluePin != OFF_GPIO && colorBrightnessPin != OFF_GPIO && brightnessPin != OFF_GPIO) {
+    Serial.println("---------------------------------------");
+
+    Serial.println(redPin);
+    Serial.println(greenPin);
+    Serial.println(bluePin);
+    Serial.println(colorBrightnessPin);
+    Serial.println(colorBrightnessPin);
+    auto rgbw = new Supla::Control::RGBWLeds(redPin, greenPin, bluePin, colorBrightnessPin, brightnessPin);
+
+    if (buttonPin != OFF_GPIO) {
+      auto button = new Supla::Control::Button(buttonPin, true, true);
+      button->setMulticlickTime(200);
+      button->setHoldTime(400);
+      button->repeatOnHoldEvery(200);
+
+      button->addAction(Supla::ITERATE_DIM_ALL, rgbw, Supla::ON_HOLD);
+      button->addAction(Supla::TOGGLE, rgbw, Supla::ON_CLICK_1);
+    }
+  }
+  else if (redPin != OFF_GPIO && greenPin != OFF_GPIO && bluePin != OFF_GPIO && colorBrightnessPin != OFF_GPIO) {
+    auto rgbw = new Supla::Control::RGBLeds(redPin, greenPin, bluePin, colorBrightnessPin);
+
+    if (buttonPin != OFF_GPIO) {
+      auto button = new Supla::Control::Button(buttonPin, true, true);
+      button->setMulticlickTime(200);
+      button->setHoldTime(400);
+      button->repeatOnHoldEvery(200);
+
+      button->addAction(Supla::ITERATE_DIM_ALL, rgbw, Supla::ON_HOLD);
+      button->addAction(Supla::TOGGLE, rgbw, Supla::ON_CLICK_1);
+    }
+  }
+  else if (brightnessPin != OFF_GPIO) {
+    auto rgbw = new Supla::Control::DimmerLeds(brightnessPin);
+
+    if (buttonPin != OFF_GPIO) {
+      auto button = new Supla::Control::Button(buttonPin, true, true);
+      button->setMulticlickTime(200);
+      button->setHoldTime(400);
+      button->repeatOnHoldEvery(200);
+
+      button->addAction(Supla::ITERATE_DIM_ALL, rgbw, Supla::ON_HOLD);
+      button->addAction(Supla::TOGGLE, rgbw, Supla::ON_CLICK_1);
+    }
+  }
+}
+#endif
+
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 std::vector<Supla::Control::Relay *> relay;
 std::vector<Supla::Control::Button *> button;
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 0c33001d..723ed9f4 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -77,8 +77,16 @@
 #include <supla/sensor/HJ101.h>
 #include <supla/control/pin_status_led.h>
 
+#ifdef SUPLA_RGBW
+#include <supla/control/rgbw_leds.h>
+#include <supla/control/rgb_leds.h>
+#include <supla/control/dimmer_leds.h>
+#endif
+
 #include <Wire.h>
 
+#include <supla/control/pushover.h>
+
 namespace Supla {
 namespace GUI {
 
@@ -115,6 +123,10 @@ extern std::vector<Supla::Sensor::ImpulseCounter *> impulseCounter;
 void addImpulseCounter(int pin, bool lowToHigh, bool inputPullup, unsigned int debounceDelay);
 #endif
 
+#ifdef SUPLA_RGBW
+void addRGBWLeds(uint8_t nr);
+#endif
+
 #ifdef SUPLA_HLW8012
 extern Supla::Sensor::HJ101 *counterHLW8012;
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 140f31ee..32f41628 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -280,13 +280,13 @@ SuplaOled::SuplaOled() {
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
     switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
       case OLED_SSD1306_0_96:
-        display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
+        display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL), GEOMETRY_128_64, I2C_ONE, -1);
         break;
       case OLED_SH1106_1_3:
-        display = new SH1106Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
+        display = new SH1106Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL), GEOMETRY_128_64, I2C_ONE, -1);
         break;
       case OLED_SSD1306_0_66:
-        display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL), GEOMETRY_64_48);
+        display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL), GEOMETRY_64_48, I2C_ONE, -1);
         break;
     }
 
@@ -361,7 +361,7 @@ SuplaOled::SuplaOled() {
     ui->setFrames(frames, frameCount);
     ui->setOverlays(overlays, overlaysCount);
     ui->init();
-    
+
     display->setBrightness(255);
     display->flipScreenVertically();
   }
@@ -401,7 +401,7 @@ void SuplaOled::addButtonOled(int pin) {
       button->addAction(TURN_ON_OLED, this, Supla::ON_PRESS);
     }
 
-    if (ConfigManager->get(KEY_OLED_ANIMATION)->getValueInt() == OLED_CONTROLL_MANUAL) {
+    if (ConfigManager->get(KEY_OLED_ANIMATION)->getValueInt() == OLED_CONTROLL_MANUAL && frameCount > 1) {
       button->addAction(NEXT_FRAME, this, Supla::ON_PRESS);
     }
   }
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 1fd78e46..d75cf194 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -4,30 +4,24 @@
 
 void addButton(uint8_t gpio, uint8_t event) {
   uint8_t nr = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
-  String test;
-  nr = nr + 1;
-  test = nr;
-  ConfigManager->set(KEY_MAX_BUTTON, test.c_str());
+  nr++;
   ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON, event);
+  ConfigManager->set(KEY_MAX_BUTTON, nr++);
 }
 
 void addRelay(uint8_t gpio, uint8_t level) {
   uint8_t nr = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
-  String test;
-  nr = nr + 1;
-  test = nr;
-  ConfigManager->set(KEY_MAX_RELAY, test.c_str());
+  nr++;
   ConfigESP->setGpio(gpio, nr, FUNCTION_RELAY, level, MEMORY_RELAY_RESTORE);
+  ConfigManager->set(KEY_MAX_RELAY, nr++);
 }
 
 void addLimitSwitch(uint8_t gpio) {
   uint8_t nr = ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt();
-  String test;
-  nr = nr + 1;
-  test = nr;
-  ConfigManager->set(KEY_MAX_LIMIT_SWITCH, test.c_str());
+  nr++;
   ConfigESP->setGpio(gpio, nr, FUNCTION_LIMIT_SWITCH, 0);
   ConfigESP->setGpio(4, 1, FUNCTION_LIMIT_SWITCH, 0);
+  ConfigManager->set(KEY_MAX_LIMIT_SWITCH, nr++);
 }
 
 void addLedCFG(uint8_t gpio, uint8_t level) {
@@ -51,10 +45,32 @@ void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
 }
 #endif
 
+void addRGBW(int8_t redPin, int8_t greenPin, int8_t bluePin, int8_t colorBrightnessPin, int8_t brightnessPin) {
+  uint8_t nr = ConfigManager->get(KEY_MAX_RGBW)->getValueInt();
+  nr++;
+  ConfigESP->setGpio(redPin, nr, FUNCTION_RGBW_RED, 0);
+  ConfigESP->setGpio(greenPin, nr, FUNCTION_RGBW_GREEN, 0);
+  ConfigESP->setGpio(bluePin, nr, FUNCTION_RGBW_BLUE, 0);
+  ConfigESP->setGpio(colorBrightnessPin, nr, FUNCTION_RGBW_COLOR_BRIGHTNESS, 0);
+  ConfigESP->setGpio(brightnessPin, nr, FUNCTION_RGBW_BRIGHTNESS, 0);
+  ConfigManager->set(KEY_MAX_RGBW, nr++);
+}
+
+void addDimmer(int8_t brightnessPin) {
+  addRGBW(OFF_GPIO, OFF_GPIO, OFF_GPIO, OFF_GPIO, brightnessPin);
+}
+
 void chooseTemplateBoard(uint8_t board) {
+  int8_t nr, key;
+  for (nr = 0; nr <= OFF_GPIO; nr++) {
+    key = KEY_GPIO + nr;
+    ConfigManager->set(key, "");
+  }
+  
   ConfigManager->set(KEY_MAX_BUTTON, "0");
   ConfigManager->set(KEY_MAX_RELAY, "0");
   ConfigManager->set(KEY_MAX_LIMIT_SWITCH, "0");
+  ConfigManager->set(KEY_MAX_RGBW, "0");
 
   switch (board) {
     case BOARD_ELECTRODRAGON:
@@ -207,5 +223,15 @@ void chooseTemplateBoard(uint8_t board) {
       Supla::GUI::counterHLW8012->setPowerMultiplier(2586583);
 #endif
       break;
+    case BOARD_DIMMER_LUKASZH:
+      addLedCFG(15);
+      addButtonCFG(0);
+      addDimmer(14);
+      addDimmer(12);
+      addDimmer(13);
+      addButton(5);
+      addButton(4);
+      addButton(16);
+      break;
   }
 }
diff --git a/src/SuplaTemplateBoard.h b/src/SuplaTemplateBoard.h
index 8e6b6ceb..13615782 100644
--- a/src/SuplaTemplateBoard.h
+++ b/src/SuplaTemplateBoard.h
@@ -12,6 +12,8 @@ void addLedCFG(uint8_t gpio, uint8_t level = HIGH);
 void addLed(uint8_t gpio);
 void addButtonCFG(uint8_t gpio);
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
+void addRGBW(int8_t redPin, int8_t greenPin, int8_t bluePin, int8_t colorBrightnessPin, int8_t brightnessPin);
+void addDimmer(int8_t brightnessPin);
 
 enum _board
 {
@@ -34,6 +36,7 @@ enum _board
   BOARD_YUNSHAN,
   BOARD_YUNTONG_SMART,
   BOARD_GOSUND_SP111,
+  BOARD_DIMMER_LUKASZH,
   MAX_MODULE
 };
 
@@ -57,10 +60,11 @@ const char SONOFF_4CH[] PROGMEM = "SONOFF 4CH";
 const char YUNSHAN[] PROGMEM = "Yunshan";
 const char YUNTONG_SMART[] PROGMEM = "YUNTONG Smart";
 const char GOSUNG_SP111[] PROGMEM = "Gosund SP111";
+const char DRIMMER_LUKASZH[] PROGMEM = "Dimmer by @LukaszH";
 
 const char* const BOARD_P[MAX_MODULE] PROGMEM = {
-    BOARD_NULL, ELECTRODRAGON, INCAN3,    INCAN4,       MELINK,           NEO_COOLCAM,      SHELLY1,    SHELLY2, SONOFF_BASIC, SONOFF_DUAL_R2,
-    SONOFF_S2X, SONOFF_SV,     SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHAN, YUNTONG_SMART, GOSUNG_SP111};
+    BOARD_NULL, ELECTRODRAGON, INCAN3,    INCAN4,       MELINK,           NEO_COOLCAM,      SHELLY1,    SHELLY2, SONOFF_BASIC,  SONOFF_DUAL_R2,
+    SONOFF_S2X, SONOFF_SV,     SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHAN, YUNTONG_SMART, GOSUNG_SP111, DRIMMER_LUKASZH};
 
 void chooseTemplateBoard(uint8_t board);
 
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
new file mode 100644
index 00000000..fd1ccf5d
--- /dev/null
+++ b/src/SuplaWebPageOther.cpp
@@ -0,0 +1,359 @@
+#include "SuplaWebPageOther.h"
+
+void createWebPageOther() {
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
+  WebServer->httpServer.on(getURL(PATH_OTHER), handleOther);
+  WebServer->httpServer.on(getURL(PATH_SAVE_OTHER), handleOtherSave);
+
+#if defined(SUPLA_IMPULSE_COUNTER)
+  for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); i++) {
+    WebServer->httpServer.on(getURL(PATH_IMPULSE_COUNTER_SET, i), handleImpulseCounterSet);
+    WebServer->httpServer.on(getURL(PATH_SAVE_IMPULSE_COUNTER_SET, i), handleImpulseCounterSaveSet);
+  }
+#endif
+
+#if defined(SUPLA_HLW8012)
+  if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
+    WebServer->httpServer.on(getURL(PATH_HLW8012_CALIBRATE), handleHLW8012Calibrate);
+    WebServer->httpServer.on(getURL(PATH_SAVE_HLW8012_CALIBRATE), handleHLW8012CalibrateSave);
+  }
+#endif
+#endif
+}
+
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
+void handleOther() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  suplaWebPageOther(0);
+}
+
+void handleOtherSave() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  uint8_t nr, current_value, last_value;
+
+#ifdef SUPLA_HC_SR04
+  if (!WebServer->saveGPIO(INPUT_TRIG_GPIO, FUNCTION_TRIG)) {
+    suplaWebPageOther(6);
+    return;
+  }
+  if (!WebServer->saveGPIO(INPUT_ECHO_GPIO, FUNCTION_ECHO)) {
+    suplaWebPageOther(6);
+    return;
+  }
+#endif
+
+#ifdef SUPLA_IMPULSE_COUNTER
+  // Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+
+  last_value = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
+  for (nr = 1; nr <= last_value; nr++) {
+    if (!WebServer->saveGPIO(INPUT_IMPULSE_COUNTER_GPIO, FUNCTION_IMPULSE_COUNTER, nr, INPUT_MAX_IMPULSE_COUNTER)) {
+      suplaWebPageOther(6);
+      return;
+    }
+  }
+
+  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_IMPULSE_COUNTER).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_IMPULSE_COUNTER, WebServer->httpServer.arg(INPUT_MAX_IMPULSE_COUNTER).c_str());
+  }
+#endif
+
+#ifdef SUPLA_RGBW
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RGBW)->getValueInt(); nr++) {
+    if (!WebServer->saveGPIO(INPUT_RGBW_RED, FUNCTION_RGBW_RED, nr, INPUT_RGBW_MAX) ||
+        !WebServer->saveGPIO(INPUT_RGBW_GREEN, FUNCTION_RGBW_GREEN, nr, INPUT_RGBW_MAX) ||
+        !WebServer->saveGPIO(INPUT_RGBW_BLUE, FUNCTION_RGBW_BLUE, nr, INPUT_RGBW_MAX) ||
+        !WebServer->saveGPIO(INPUT_RGBW_BRIGHTNESS, FUNCTION_RGBW_BRIGHTNESS, nr, INPUT_RGBW_MAX) ||
+        !WebServer->saveGPIO(INPUT_RGBW_COLOR_BRIGHTNESS, FUNCTION_RGBW_COLOR_BRIGHTNESS, nr, INPUT_RGBW_MAX)) {
+      suplaWebPageOther(6);
+      return;
+    }
+  }
+  ConfigManager->set(KEY_MAX_RGBW, WebServer->httpServer.arg(INPUT_RGBW_MAX).c_str());
+#endif
+
+#ifdef SUPLA_HLW8012
+  if (!WebServer->saveGPIO(INPUT_CF, FUNCTION_CF) || !WebServer->saveGPIO(INPUT_CF1, FUNCTION_CF1) || !WebServer->saveGPIO(INPUT_SEL, FUNCTION_SEL)) {
+    suplaWebPageOther(6);
+    return;
+  }
+#endif
+
+  switch (ConfigManager->save()) {
+    case E_CONFIG_OK:
+      suplaWebPageOther(1);
+      break;
+    case E_CONFIG_FILE_OPEN:
+      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
+      suplaWebPageOther(2);
+      break;
+  }
+}
+
+void suplaWebPageOther(int save) {
+  uint8_t nr, suported, selected;
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_OTHER);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_OTHER);
+#ifdef SUPLA_HC_SR04
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
+  addListGPIOBox(webContentBuffer, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
+  addListGPIOBox(webContentBuffer, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
+  addFormHeaderEnd(webContentBuffer);
+#endif
+
+#ifdef SUPLA_IMPULSE_COUNTER
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " " + S_IMPULSE_COUNTER);
+  addNumberBox(webContentBuffer, INPUT_MAX_IMPULSE_COUNTER, S_QUANTITY, KEY_MAX_IMPULSE_COUNTER, ConfigESP->countFreeGpio(FUNCTION_IMPULSE_COUNTER));
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
+    addListGPIOLinkBox(webContentBuffer, INPUT_IMPULSE_COUNTER_GPIO, F("IC GPIO"), FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
+  }
+  addFormHeaderEnd(webContentBuffer);
+#endif
+
+#ifdef SUPLA_HLW8012
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HLW8012"));
+  addListGPIOBox(webContentBuffer, INPUT_CF, F("CF"), FUNCTION_CF);
+  addListGPIOBox(webContentBuffer, INPUT_CF1, F("CF1"), FUNCTION_CF1);
+  addListGPIOBox(webContentBuffer, INPUT_SEL, F("SELi"), FUNCTION_SEL);
+  if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
+    addLinkBox(webContentBuffer, F("Kalibracja"), PATH_HLW8012_CALIBRATE);
+  }
+  addFormHeaderEnd(webContentBuffer);
+#endif
+
+#ifdef SUPLA_RGBW
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " RGBW/RGB/DIMMER");
+  addNumberBox(webContentBuffer, INPUT_RGBW_MAX, S_QUANTITY, KEY_MAX_RGBW, ConfigESP->countFreeGpio());
+  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RGBW)->getValueInt(); nr++) {
+    addListGPIOBox(webContentBuffer, INPUT_RGBW_RED, F("RED"), FUNCTION_RGBW_RED, nr, false);
+    addListGPIOBox(webContentBuffer, INPUT_RGBW_GREEN, F("GREEN"), FUNCTION_RGBW_GREEN, nr, false);
+    addListGPIOBox(webContentBuffer, INPUT_RGBW_BLUE, F("BLUE"), FUNCTION_RGBW_BLUE, nr, false);
+    addListGPIOBox(webContentBuffer, INPUT_RGBW_BRIGHTNESS, F("WHITE / DIMMER"), FUNCTION_RGBW_BRIGHTNESS, nr, false);
+    addListGPIOBox(webContentBuffer, INPUT_RGBW_COLOR_BRIGHTNESS, F("BRIGHTNESS"), FUNCTION_RGBW_COLOR_BRIGHTNESS, nr);
+  }
+  addFormHeaderEnd(webContentBuffer);
+#endif
+
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
+  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
+  WebServer->sendContent();
+}
+#endif
+
+#ifdef SUPLA_IMPULSE_COUNTER
+void handleImpulseCounterSet() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  supla_impulse_counter_set(0);
+}
+
+void handleImpulseCounterSaveSet() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  String readUrl, nr, input;
+  uint8_t place;
+
+  String path = PATH_START;
+  path += PATH_SAVE_IMPULSE_COUNTER_SET;
+  readUrl = WebServer->httpServer.uri();
+
+  place = readUrl.indexOf(path);
+  nr = readUrl.substring(place + path.length(), place + path.length() + 3);
+  uint8_t key = KEY_GPIO + ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
+
+  input = INPUT_IMPULSE_COUNTER_PULL_UP;
+  input += nr;
+  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
+
+  input = INPUT_IMPULSE_COUNTER_RAISING_EDGE;
+  input += nr;
+  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
+
+  ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
+  Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+
+  switch (ConfigManager->save()) {
+    case E_CONFIG_OK:
+      //      Serial.println(F("E_CONFIG_OK: Dane zapisane"));
+      suplaWebPageOther(1);
+      break;
+
+    case E_CONFIG_FILE_OPEN:
+      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
+      suplaWebPageOther(2);
+      break;
+  }
+}
+
+void supla_impulse_counter_set(int save) {
+  String readUrl, nr;
+  uint8_t place, selected, suported;
+
+  String path = PATH_START;
+  path += PATH_IMPULSE_COUNTER_SET;
+  readUrl = WebServer->httpServer.uri();
+
+  place = readUrl.indexOf(path);
+  nr = readUrl.substring(place + path.length(), place + path.length() + 3);
+
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_OTHER);
+  uint8_t relays = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
+  if (nr.toInt() <= relays && ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
+    webContentBuffer += F("<form method='post' action='");
+    webContentBuffer += PATH_SAVE_IMPULSE_COUNTER_SET;
+    webContentBuffer += nr;
+    webContentBuffer += F("'><div class='w'><h3>");
+    webContentBuffer += S_IMPULSE_COUNTER_SETTINGS_NR;
+    webContentBuffer += F(" ");
+    webContentBuffer += nr;
+    webContentBuffer += F("</h3>");
+    webContentBuffer += F("<i><label>");
+    webContentBuffer += S_IMPULSE_COUNTER_PULL_UP;
+    webContentBuffer += F("</label><select name='");
+    webContentBuffer += INPUT_IMPULSE_COUNTER_PULL_UP;
+    webContentBuffer += nr;
+    webContentBuffer += F("'>");
+    selected = ConfigESP->getMemory(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
+    for (suported = 0; suported < 2; suported++) {
+      webContentBuffer += F("<option value='");
+      webContentBuffer += suported;
+      if (selected == suported) {
+        webContentBuffer += F("' selected>");
+      }
+      else
+        webContentBuffer += F("'>");
+      webContentBuffer += PGMT(STATE_P[suported]);
+    }
+    webContentBuffer += F("</select></i>");
+    webContentBuffer += F("<i><label>");
+    webContentBuffer += S_IMPULSE_COUNTER_RAISING_EDGE;
+    webContentBuffer += F("</label><select name='");
+    webContentBuffer += INPUT_IMPULSE_COUNTER_RAISING_EDGE;
+    webContentBuffer += nr;
+    webContentBuffer += F("'>");
+    selected = ConfigESP->getLevel(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
+    for (suported = 0; suported < 2; suported++) {
+      webContentBuffer += F("<option value='");
+      webContentBuffer += suported;
+      if (selected == suported) {
+        webContentBuffer += F("' selected>");
+      }
+      else
+        webContentBuffer += F("'>");
+      webContentBuffer += PGMT(STATE_P[suported]);
+    }
+    webContentBuffer += F("</select></i>");
+    addNumberBox(webContentBuffer, INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, S_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT,
+                 99999999);
+    webContentBuffer += F("<i><label>");
+    webContentBuffer += S_IMPULSE_COUNTER_CHANGE_VALUE;
+    webContentBuffer += F("</label><input name='");
+    webContentBuffer += INPUT_IMPULSE_COUNTER_CHANGE_VALUE;
+    webContentBuffer += F("' type='number' placeholder='0' step='1' min='0' max='");
+    webContentBuffer += 100;
+    webContentBuffer += F("' value='");
+    uint32_t count = Supla::GUI::impulseCounter[nr.toInt() - 1]->getCounter();
+    webContentBuffer += count;
+    webContentBuffer += F("'></i>");
+
+    webContentBuffer += F("</div><button type='submit'>");
+    webContentBuffer += S_SAVE;
+    webContentBuffer += F("</button></form>");
+  }
+  else {
+    webContentBuffer += F("<div class='w'><h3>");
+    webContentBuffer += S_NO_IMPULSE_COUNTER_NR;
+    webContentBuffer += F(" ");
+    webContentBuffer += nr;
+    webContentBuffer += F("</h3>");
+  }
+  webContentBuffer += F("<br>");
+  webContentBuffer += F("<a href='");
+  webContentBuffer += PATH_START;
+  webContentBuffer += PATH_OTHER;
+  webContentBuffer += F("'><button>");
+  webContentBuffer += S_RETURN;
+  webContentBuffer += F("</button></a><br><br>");
+  WebServer->sendContent();
+}
+#endif
+
+#if defined(SUPLA_HLW8012)
+void handleHLW8012Calibrate() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+  suplaWebpageHLW8012Calibrate(0);
+}
+
+void handleHLW8012CalibrateSave() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer.requestAuthentication();
+  }
+
+  double calibPower, calibVoltage = 0;
+  String input = INPUT_CALIB_POWER;
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
+    calibPower = WebServer->httpServer.arg(input).toDouble();
+  }
+
+  input = INPUT_CALIB_VOLTAGE;
+  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
+    calibVoltage = WebServer->httpServer.arg(input).toDouble();
+  }
+
+  if (calibPower && calibVoltage) {
+    Supla::GUI::counterHLW8012->calibrate(calibPower, calibVoltage);
+    suplaWebpageHLW8012Calibrate(1);
+  }
+  else {
+    suplaWebpageHLW8012Calibrate(6);
+  }
+}
+
+void suplaWebpageHLW8012Calibrate(uint8_t save) {
+  webContentBuffer += SuplaSaveResult(save);
+  webContentBuffer += SuplaJavaScript(PATH_HLW8012_CALIBRATE);
+
+  addFormHeader(webContentBuffer);
+  webContentBuffer += F("<p style='color:#000;'>Current Multi: ");
+  webContentBuffer += Supla::GUI::counterHLW8012->getCurrentMultiplier();
+  webContentBuffer += F("<br>Voltage Multi: ");
+  webContentBuffer += Supla::GUI::counterHLW8012->getVoltageMultiplier();
+  webContentBuffer += F("<br>Power Multi: ");
+  webContentBuffer += Supla::GUI::counterHLW8012->getPowerMultiplier();
+  webContentBuffer += F("</p>");
+  addFormHeaderEnd(webContentBuffer);
+
+  addForm(webContentBuffer, F("post"), PATH_SAVE_HLW8012_CALIBRATE);
+  addFormHeader(webContentBuffer, F("Ustawienia kalibracji"));
+  addNumberBox(webContentBuffer, INPUT_CALIB_POWER, F("Moc żarówki [W]"), F("25"), true);
+  addNumberBox(webContentBuffer, INPUT_CALIB_VOLTAGE, F("Napięcie [V]"), F("230"), true);
+  addFormHeaderEnd(webContentBuffer);
+
+  addButtonSubmit(webContentBuffer, F("Kalibracja"));
+  addFormEnd(webContentBuffer);
+
+  addButton(webContentBuffer, S_RETURN, PATH_OTHER);
+  WebServer->sendContent();
+}
+#endif
\ No newline at end of file
diff --git a/src/SuplaWebPageOther.h b/src/SuplaWebPageOther.h
new file mode 100644
index 00000000..a2f0dc34
--- /dev/null
+++ b/src/SuplaWebPageOther.h
@@ -0,0 +1,53 @@
+#ifndef SuplaWebPageOther_h
+#define SuplaWebPageOther_h
+
+#include "SuplaDeviceGUI.h"
+#include "SuplaWebServer.h"
+
+void createWebPageOther();
+
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
+void suplaWebPageOther(int save);
+void handleOther();
+void handleOtherSave();
+#endif
+
+#if defined(SUPLA_IMPULSE_COUNTER)
+#define INPUT_IMPULSE_COUNTER_GPIO             "ic"
+#define INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT "icdt"
+#define INPUT_IMPULSE_COUNTER_PULL_UP          "icpu"
+#define INPUT_IMPULSE_COUNTER_RAISING_EDGE     "icre"
+#define INPUT_IMPULSE_COUNTER_CHANGE_VALUE     "iccv"
+#define INPUT_MAX_IMPULSE_COUNTER              "imic"
+void handleImpulseCounterSet();
+void handleImpulseCounterSaveSet();
+void supla_impulse_counter_set(int save);
+#endif
+
+#if defined(SUPLA_HLW8012)
+#define INPUT_CF  "cf"
+#define INPUT_CF1 "cf1"
+#define INPUT_SEL "sel"
+
+#define PATH_HLW8012_CALIBRATE      "calibrate"
+#define PATH_SAVE_HLW8012_CALIBRATE "savecalibrate"
+
+#define INPUT_CALIB_POWER   "power"
+#define INPUT_CALIB_VOLTAGE "voltage"
+
+void handleHLW8012Calibrate();
+void handleHLW8012CalibrateSave();
+void suplaWebpageHLW8012Calibrate(uint8_t save);
+#endif
+
+#ifdef SUPLA_RGBW
+#define INPUT_RGBW_MAX              "rgbwm"
+#define INPUT_RGBW_RED              "rgbwr"
+#define INPUT_RGBW_GREEN            "rgbwg"
+#define INPUT_RGBW_BLUE             "rgbwb"
+#define INPUT_RGBW_BRIGHTNESS       "rgbwbr"
+#define INPUT_RGBW_COLOR_BRIGHTNESS "rgbwcb"
+
+#endif
+
+#endif  // SuplaWebPageOther_h
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index e7e5dbcb..3fc5fbeb 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -48,39 +48,6 @@ void SuplaWebPageSensor::createWebPageSensor() {
   path += PATH_SAVE_SPI;
   WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleSpiSave, this));
 #endif
-
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
-  path = PATH_START;
-  path += PATH_OTHER;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleOther, this));
-  path = PATH_START;
-  path += PATH_SAVE_OTHER;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleOtherSave, this));
-
-#if defined(SUPLA_IMPULSE_COUNTER)
-  for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); i++) {
-    path = PATH_START;
-    path += PATH_IMPULSE_COUNTER_SET;
-    path += i;
-    WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleImpulseCounterSet, this));
-
-    path = PATH_START;
-    path += PATH_SAVE_IMPULSE_COUNTER_SET;
-    path += i;
-    WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleImpulseCounterSaveSet, this));
-  }
-#endif
-
-#if defined(SUPLA_HLW8012)
-  path = PATH_START;
-  path += PATH_HLW8012_CALIBRATE;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleHLW8012Calibrate, this));
-
-  path = PATH_START;
-  path += PATH_SAVE_HLW8012_CALIBRATE;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleHLW8012CalibrateSave, this));
-#endif
-#endif
 }
 
 #ifdef SUPLA_DS18B20
@@ -657,322 +624,4 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
   webContentBuffer += F("</button></a><br><br>");
   WebServer->sendContent();
 }
-#endif
-
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
-void SuplaWebPageSensor::handleOther() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
-  }
-  supla_webpage_other(0);
-}
-
-void SuplaWebPageSensor::handleOtherSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
-  }
-
-  uint8_t nr, current_value, last_value;
-
-#ifdef SUPLA_HC_SR04
-  if (!WebServer->saveGPIO(INPUT_TRIG_GPIO, FUNCTION_TRIG)) {
-    supla_webpage_other(6);
-    return;
-  }
-  if (!WebServer->saveGPIO(INPUT_ECHO_GPIO, FUNCTION_ECHO)) {
-    supla_webpage_other(6);
-    return;
-  }
-#endif
-
-#ifdef SUPLA_IMPULSE_COUNTER
-  // Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
-
-  last_value = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
-  for (nr = 1; nr <= last_value; nr++) {
-    if (!WebServer->saveGPIO(INPUT_IMPULSE_COUNTER_GPIO, FUNCTION_IMPULSE_COUNTER, nr, INPUT_MAX_IMPULSE_COUNTER)) {
-      supla_webpage_other(6);
-      return;
-    }
-  }
-
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_IMPULSE_COUNTER).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_IMPULSE_COUNTER, WebServer->httpServer.arg(INPUT_MAX_IMPULSE_COUNTER).c_str());
-  }
-#endif
-
-#ifdef SUPLA_HLW8012
-  if (!WebServer->saveGPIO(INPUT_CF, FUNCTION_CF)) {
-    supla_webpage_other(6);
-    return;
-  }
-  if (!WebServer->saveGPIO(INPUT_CF1, FUNCTION_CF1)) {
-    supla_webpage_other(6);
-    return;
-  }
-  if (!WebServer->saveGPIO(INPUT_SEL, FUNCTION_SEL)) {
-    supla_webpage_other(6);
-    return;
-  }
-#endif
-
-  switch (ConfigManager->save()) {
-    case E_CONFIG_OK:
-      supla_webpage_other(1);
-      break;
-    case E_CONFIG_FILE_OPEN:
-      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      supla_webpage_other(2);
-      break;
-  }
-}
-
-void SuplaWebPageSensor::supla_webpage_other(int save) {
-  uint8_t nr, suported, selected;
-
-  webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_OTHER);
-
-  addForm(webContentBuffer, F("post"), PATH_SAVE_OTHER);
-#ifdef SUPLA_HC_SR04
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
-  addListGPIOBox(webContentBuffer, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
-  addListGPIOBox(webContentBuffer, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
-  addFormHeaderEnd(webContentBuffer);
-#endif
-
-#ifdef SUPLA_IMPULSE_COUNTER
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " " + S_IMPULSE_COUNTER);
-  addNumberBox(webContentBuffer, INPUT_MAX_IMPULSE_COUNTER, S_QUANTITY, KEY_MAX_IMPULSE_COUNTER, ConfigESP->countFreeGpio(FUNCTION_IMPULSE_COUNTER));
-  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
-    addListGPIOLinkBox(webContentBuffer, INPUT_IMPULSE_COUNTER_GPIO, F("IC GPIO"), FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
-  }
-  addFormHeaderEnd(webContentBuffer);
-#endif
-
-#ifdef SUPLA_HLW8012
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HLW8012"));
-  addListGPIOBox(webContentBuffer, INPUT_CF, F("CF"), FUNCTION_CF);
-  addListGPIOBox(webContentBuffer, INPUT_CF1, F("CF1"), FUNCTION_CF1);
-  addListGPIOBox(webContentBuffer, INPUT_SEL, F("SELi"), FUNCTION_SEL);
-  if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
-    addLinkBox(webContentBuffer, F("Kalibracja"), PATH_HLW8012_CALIBRATE);
-  }
-  addFormHeaderEnd(webContentBuffer);
-#endif
-
-  addButtonSubmit(webContentBuffer, S_SAVE);
-  addFormEnd(webContentBuffer);
-  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
-  WebServer->sendContent();
-}
-#endif
-
-#ifdef SUPLA_IMPULSE_COUNTER
-void SuplaWebPageSensor::handleImpulseCounterSet() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
-  }
-  supla_impulse_counter_set(0);
-}
-
-void SuplaWebPageSensor::handleImpulseCounterSaveSet() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
-  }
-
-  String readUrl, nr, input;
-  uint8_t place;
-
-  String path = PATH_START;
-  path += PATH_SAVE_IMPULSE_COUNTER_SET;
-  readUrl = WebServer->httpServer.uri();
-
-  place = readUrl.indexOf(path);
-  nr = readUrl.substring(place + path.length(), place + path.length() + 3);
-  uint8_t key = KEY_GPIO + ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
-
-  input = INPUT_IMPULSE_COUNTER_PULL_UP;
-  input += nr;
-  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
-
-  input = INPUT_IMPULSE_COUNTER_RAISING_EDGE;
-  input += nr;
-  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
-
-  ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
-  Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
-
-  switch (ConfigManager->save()) {
-    case E_CONFIG_OK:
-      //      Serial.println(F("E_CONFIG_OK: Dane zapisane"));
-      supla_webpage_other(1);
-      break;
-
-    case E_CONFIG_FILE_OPEN:
-      //      Serial.println(F("E_CONFIG_FILE_OPEN: Couldn't open file"));
-      supla_webpage_other(2);
-      break;
-  }
-}
-
-void SuplaWebPageSensor::supla_impulse_counter_set(int save) {
-  String readUrl, nr;
-  uint8_t place, selected, suported;
-
-  String path = PATH_START;
-  path += PATH_IMPULSE_COUNTER_SET;
-  readUrl = WebServer->httpServer.uri();
-
-  place = readUrl.indexOf(path);
-  nr = readUrl.substring(place + path.length(), place + path.length() + 3);
-
-  webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_OTHER);
-  uint8_t relays = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
-  if (nr.toInt() <= relays && ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
-    webContentBuffer += F("<form method='post' action='");
-    webContentBuffer += PATH_SAVE_IMPULSE_COUNTER_SET;
-    webContentBuffer += nr;
-    webContentBuffer += F("'><div class='w'><h3>");
-    webContentBuffer += S_IMPULSE_COUNTER_SETTINGS_NR;
-    webContentBuffer += F(" ");
-    webContentBuffer += nr;
-    webContentBuffer += F("</h3>");
-    webContentBuffer += F("<i><label>");
-    webContentBuffer += S_IMPULSE_COUNTER_PULL_UP;
-    webContentBuffer += F("</label><select name='");
-    webContentBuffer += INPUT_IMPULSE_COUNTER_PULL_UP;
-    webContentBuffer += nr;
-    webContentBuffer += F("'>");
-    selected = ConfigESP->getMemory(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
-    for (suported = 0; suported < 2; suported++) {
-      webContentBuffer += F("<option value='");
-      webContentBuffer += suported;
-      if (selected == suported) {
-        webContentBuffer += F("' selected>");
-      }
-      else
-        webContentBuffer += F("'>");
-      webContentBuffer += PGMT(STATE_P[suported]);
-    }
-    webContentBuffer += F("</select></i>");
-    webContentBuffer += F("<i><label>");
-    webContentBuffer += S_IMPULSE_COUNTER_RAISING_EDGE;
-    webContentBuffer += F("</label><select name='");
-    webContentBuffer += INPUT_IMPULSE_COUNTER_RAISING_EDGE;
-    webContentBuffer += nr;
-    webContentBuffer += F("'>");
-    selected = ConfigESP->getLevel(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
-    for (suported = 0; suported < 2; suported++) {
-      webContentBuffer += F("<option value='");
-      webContentBuffer += suported;
-      if (selected == suported) {
-        webContentBuffer += F("' selected>");
-      }
-      else
-        webContentBuffer += F("'>");
-      webContentBuffer += PGMT(STATE_P[suported]);
-    }
-    webContentBuffer += F("</select></i>");
-    addNumberBox(webContentBuffer, INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, S_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT,
-                 99999999);
-    webContentBuffer += F("<i><label>");
-    webContentBuffer += S_IMPULSE_COUNTER_CHANGE_VALUE;
-    webContentBuffer += F("</label><input name='");
-    webContentBuffer += INPUT_IMPULSE_COUNTER_CHANGE_VALUE;
-    webContentBuffer += F("' type='number' placeholder='0' step='1' min='0' max='");
-    webContentBuffer += 100;
-    webContentBuffer += F("' value='");
-    uint32_t count = Supla::GUI::impulseCounter[nr.toInt() - 1]->getCounter();
-    webContentBuffer += count;
-    webContentBuffer += F("'></i>");
-
-    webContentBuffer += F("</div><button type='submit'>");
-    webContentBuffer += S_SAVE;
-    webContentBuffer += F("</button></form>");
-  }
-  else {
-    webContentBuffer += F("<div class='w'><h3>");
-    webContentBuffer += S_NO_IMPULSE_COUNTER_NR;
-    webContentBuffer += F(" ");
-    webContentBuffer += nr;
-    webContentBuffer += F("</h3>");
-  }
-  webContentBuffer += F("<br>");
-  webContentBuffer += F("<a href='");
-  webContentBuffer += PATH_START;
-  webContentBuffer += PATH_OTHER;
-  webContentBuffer += F("'><button>");
-  webContentBuffer += S_RETURN;
-  webContentBuffer += F("</button></a><br><br>");
-  WebServer->sendContent();
-}
-#endif
-
-#if defined(SUPLA_HLW8012)
-void SuplaWebPageSensor::handleHLW8012Calibrate() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
-  }
-  suplaWebpageHLW8012Calibrate(0);
-}
-
-void SuplaWebPageSensor::handleHLW8012CalibrateSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
-  }
-
-  double calibPower, calibVoltage = 0;
-  String input = INPUT_CALIB_POWER;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    calibPower = WebServer->httpServer.arg(input).toDouble();
-  }
-
-  input = INPUT_CALIB_VOLTAGE;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    calibVoltage = WebServer->httpServer.arg(input).toDouble();
-  }
-
-  if (calibPower && calibVoltage) {
-    Supla::GUI::counterHLW8012->calibrate(calibPower, calibVoltage);
-    suplaWebpageHLW8012Calibrate(1);
-  }
-  else {
-    suplaWebpageHLW8012Calibrate(6);
-  }
-}
-
-void SuplaWebPageSensor::suplaWebpageHLW8012Calibrate(uint8_t save) {
-  webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_HLW8012_CALIBRATE);
-
-  addFormHeader(webContentBuffer);
-  webContentBuffer += F("<p style='color:#000;'>Current Multi: ");
-  webContentBuffer += Supla::GUI::counterHLW8012->getCurrentMultiplier();
-  webContentBuffer += F("<br>Voltage Multi: ");
-  webContentBuffer += Supla::GUI::counterHLW8012->getVoltageMultiplier();
-  webContentBuffer += F("<br>Power Multi: ");
-  webContentBuffer += Supla::GUI::counterHLW8012->getPowerMultiplier();
-  webContentBuffer += F("</p>");
-  addFormHeaderEnd(webContentBuffer);
-
-  addForm(webContentBuffer, F("post"), PATH_SAVE_HLW8012_CALIBRATE);
-  addFormHeader(webContentBuffer, F("Ustawienia kalibracji"));
-  addNumberBox(webContentBuffer, INPUT_CALIB_POWER, F("Moc żarówki [W]"), F("25"), true);
-  addNumberBox(webContentBuffer, INPUT_CALIB_VOLTAGE, F("Napięcie [V]"), F("230"), true);
-  addFormHeaderEnd(webContentBuffer);
-
-  addButtonSubmit(webContentBuffer, F("Kalibracja"));
-  addFormEnd(webContentBuffer);
-
-  addButton(webContentBuffer, S_RETURN, PATH_OTHER);
-  WebServer->sendContent();
-}
 #endif
\ No newline at end of file
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index c539868f..873953e9 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -41,12 +41,6 @@
 #define INPUT_CS_GPIO                          "cs"
 #define INPUT_D0_GPIO                          "d0"
 #define INPUT_MAX6675                          "max6675"
-#define INPUT_IMPULSE_COUNTER_GPIO             "ic"
-#define INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT "icdt"
-#define INPUT_IMPULSE_COUNTER_PULL_UP          "icpu"
-#define INPUT_IMPULSE_COUNTER_RAISING_EDGE     "icre"
-#define INPUT_IMPULSE_COUNTER_CHANGE_VALUE     "iccv"
-#define INPUT_MAX_IMPULSE_COUNTER              "imic"
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MAX6675) || defined(SUPLA_MCP23017)
 enum _sensor
@@ -105,15 +99,6 @@ class SuplaWebPageSensor {
   void handleSpiSave();
 #endif
 
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
-  void handleOther();
-  void handleOtherSave();
-
-  void handleImpulseCounterSet();
-  void handleImpulseCounterSaveSet();
-  void supla_impulse_counter_set(int save);
-#endif
-
  private:
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
   void supla_webpage_1wire(int save);
@@ -125,26 +110,6 @@ class SuplaWebPageSensor {
 #if defined(SUPLA_MAX6675)
   void supla_webpage_spi(int save);
 #endif
-
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
-  void supla_webpage_other(int save);
-#endif
-
-#if defined(SUPLA_HLW8012)
-#define INPUT_CF  "cf"
-#define INPUT_CF1 "cf1"
-#define INPUT_SEL "sel"
-
-#define PATH_HLW8012_CALIBRATE      "calibrate"
-#define PATH_SAVE_HLW8012_CALIBRATE "savecalibrate"
-
-#define INPUT_CALIB_POWER   "power"
-#define INPUT_CALIB_VOLTAGE "voltage"
-
-  void handleHLW8012Calibrate();
-  void handleHLW8012CalibrateSave();
-  void suplaWebpageHLW8012Calibrate(uint8_t save);
-#endif
 };
 
 extern SuplaWebPageSensor* WebPageSensor;
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 62649dff..b50261ff 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -24,6 +24,7 @@
 #include "SuplaCommonPROGMEM.h"
 #include "SuplaTemplateBoard.h"
 #include "Markup.h"
+#include "SuplaWebPageOther.h"
 
 String webContentBuffer;
 
@@ -77,6 +78,7 @@ void SuplaWebServer::createWebServer() {
   createWebUpload();
   createWebTools();
   createWebStatusLed();
+  createWebPageOther();
 }
 
 void SuplaWebServer::handle() {
@@ -287,11 +289,11 @@ void SuplaWebServer::sendContent() {
   //_buffer.reserve(bufferSize);
   // int bufferCounter = 0;
 
-  httpServer.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
-  httpServer.sendHeader("Pragma", "no-cache");
-  httpServer.sendHeader("Expires", "-1");
+  httpServer.sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
+  httpServer.sendHeader(F("Pragma"), F("no-cache"));
+  httpServer.sendHeader(F("Expires"), F("-1"));
   httpServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
-  httpServer.chunkedResponseModeStart(200, "text/html");
+  httpServer.chunkedResponseModeStart(200, F("text/html"));
 
   httpServer.sendContent_P(HTTP_META);
   httpServer.sendContent_P(HTTP_FAVICON);
@@ -300,12 +302,12 @@ void SuplaWebServer::sendContent() {
 
   String summary = FPSTR(HTTP_SUMMARY);
 
-  summary.replace("{h}", ConfigManager->get(KEY_HOST_NAME)->getValue());
-  summary.replace("{s}", ConfigESP->getLastStatusSupla());
-  summary.replace("{v}", Supla::Channel::reg_dev.SoftVer);
-  summary.replace("{g}", ConfigManager->get(KEY_SUPLA_GUID)->getValueHex(SUPLA_GUID_SIZE));
-  summary.replace("{m}", ConfigESP->getMacAddress(true));
-  summary.replace("{f}", String(ESP.getFreeHeap() / 1024.0));
+  summary.replace(F("{h}"), ConfigManager->get(KEY_HOST_NAME)->getValue());
+  summary.replace(F("{s}"), ConfigESP->getLastStatusSupla());
+  summary.replace(F("{v}"), Supla::Channel::reg_dev.SoftVer);
+  summary.replace(F("{g}"), ConfigManager->get(KEY_SUPLA_GUID)->getValueHex(SUPLA_GUID_SIZE));
+  summary.replace(F("{m}"), ConfigESP->getMacAddress(true));
+  summary.replace(F("{f}"), String(ESP.getFreeHeap() / 1024.0));
 
   httpServer.sendContent(summary);
   httpServer.sendContent_P(HTTP_COPYRIGHT);
@@ -343,7 +345,7 @@ void SuplaWebServer::sendContent() {
 
 void SuplaWebServer::handleNotFound() {
   httpServer.sendHeader("Location", "/", true);
-  httpServer.send(302, "text/plane", "");
+  //httpServer.send(302, "text/plane", "");
 
   supla_webpage_reboot();
 }
diff --git a/src/language/pl.h b/src/language/pl.h
index 62eecf04..87d13285 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -30,7 +30,6 @@
 #define S_CFG_MODE                                             "Tryb"
 #define S_QUANTITY                                             "ILOŚĆ"
 #define S_GPIO_SETTINGS_FOR_RELAYS                             "Ustawienie GPIO dla przekaźników"
-#define S_GPIO_SETTINGS_FOR                                    "Ustawienie GPIO dla"
 #define S_RELAY                                                "PRZEKAŹNIK"
 #define S_RELAY_NR_SETTINGS                                    "Ustawienia przekaźnika nr."
 #define S_NO_RELAY_NR                                          "Brak przekaźnika nr."

From b94a634f46b5ebf23a4a1a97f63a5628046f3e0e Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 5 Feb 2021 16:38:17 +0100
Subject: [PATCH 054/165] pushover

---
 platformio.ini             |  3 ++-
 src/GUI-Generic_Config.h   |  1 +
 src/Markup.cpp             |  2 +-
 src/SuplaCommonPROGMEM.h   |  4 ++--
 src/SuplaConfigManager.cpp | 11 ++++++++---
 src/SuplaConfigManager.h   |  5 ++++-
 src/SuplaDeviceGUI.cpp     | 22 ++++++++++++++++++++--
 src/SuplaDeviceGUI.h       |  4 ++++
 src/SuplaWebPageOther.cpp  | 17 +++++++++++++++++
 src/SuplaWebPageOther.h    |  4 ++++
 src/SuplaWebPageRelay.cpp  | 10 ++++++++++
 src/SuplaWebPageRelay.h    | 27 +++++++++++++++------------
 src/SuplaWebServer.cpp     | 13 ++++---------
 13 files changed, 92 insertions(+), 31 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index edc13b3c..16bbe533 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -45,7 +45,8 @@ build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.0"'
                 -D SUPLA_OLED
                 -D SUPLA_HLW8012
                 -D SUPLA_MCP23017
-                -D SUPLA_RGBW             
+                ;-D SUPLA_RGBW  
+                -D SUPLA_PUSHOVER           
 
 [env]
 framework = arduino
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 23c604a7..2dc1365c 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -52,6 +52,7 @@
 #define SUPLA_IMPULSE_COUNTER
 #define SUPLA_HLW8012
 #define SUPLA_RGBW
+#define SUPLA_PUSHOVER
 
 #endif
 #endif  // GUI-Generic_Config_h
diff --git a/src/Markup.cpp b/src/Markup.cpp
index 98f7127f..c8b7be56 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -227,7 +227,7 @@ void addListGPIOLinkBox(String& html, const String& input_id, const String& name
   }
   html += name;
   if (ConfigESP->getGpio(_nr, function) != OFF_GPIO) {
-    html += PGMT(ICON_EDIT);
+    //html += PGMT(ICON_EDIT);
     html += F("</a>");
   }
   html += F("</label>");
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index b0c7e11c..e6b2c272 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -59,14 +59,14 @@ const char HTTP_FAVICON[] PROGMEM = "<link rel='icon' href='data:image/png;base6
 
 const char HTTP_RBT[] PROGMEM = "<form method='post' action='rbt'><button type='submit'>Restart</button></form>";
 
-const char ICON_EDIT[] PROGMEM = 
+/*const char ICON_EDIT[] PROGMEM = 
       "<img "
       "src='data:image/"
       "png;base64,"
       "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAQAAAD8fJRsAAAAB3RJTUUH5AYHChEfgNCVHgAAAAlwSFlzAAAuIwAALiMB"
       "eKU/dgAAAARnQU1BAACxjwv8YQUAAABBSURBVHjaY1BiwA4xhWqU/"
       "gMxAzZhEGRAF2ZQmoGpA6R6BlSaAV34P0QYIYEmDJPAEIZJQFxSg+"
-      "kPDGFsHiQkAQDjTS5MMLyE4wAAAABJRU5ErkJggg=='>";
+      "kPDGFsHiQkAQDjTS5MMLyE4wAAAABJRU5ErkJggg=='>";*/
 
 const char GPIO0[] PROGMEM = "GPIO0-D3";
 const char GPIO1[] PROGMEM = "GPIO1-TX";
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index d5d024a6..6915ee2f 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -23,6 +23,7 @@
 
 #include "FS.h"
 #include "SuplaConfigManager.h"
+#include "SuplaDeviceGUI.h"
 
 ConfigOption::ConfigOption(uint8_t key, const char *value, int maxLength) {
   // size_t size = strlen(key) + 1;
@@ -77,7 +78,7 @@ int ConfigOption::getLength() {
 
 const String ConfigOption::getElement(int index) {
   String data = _value;
- // data.reserve(_maxLength);
+  // data.reserve(_maxLength);
   int found = 0;
   int strIndex[] = {0, -1};
   int maxIndex = data.length() - 1;
@@ -166,7 +167,7 @@ SuplaConfigManager::SuplaConfigManager() {
 
   uint8_t nr, key;
 
-  for (nr = 0; nr <= 17; nr++) {
+  for (nr = 0; nr <= MAX_GPIO; nr++) {
     key = KEY_GPIO + nr;
     this->addKey(key, "", SETTINGSCOUNT * 3);
   }
@@ -181,7 +182,11 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_OLED_BACK_LIGHT_TIME, "5", 2);
   this->addKey(KEY_MAX_RGBW, "0", 2);
 
-  this->load();
+  this->addKey(KEY_PUSHOVER, "", MAX_GPIO * 2);
+  this->addKey(KEY_PUSHOVER_TOKEN, "0", MAX_TOKEN_SIZE);
+  this->addKey(KEY_PUSHOVER_USER, "0", MAX_USER_SIZE);
+
+      this->load();
   //  switch (this->load()) {
   //    case E_CONFIG_OK:
   //      Serial.println(F("Config read"));
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 3cdb2c51..84d89bce 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -77,7 +77,10 @@ enum _key
   KEY_LEVEL_LED = KEY_GPIO + MAX_GPIO + 1,
   KEY_OLED_ANIMATION,
   KEY_OLED_BACK_LIGHT_TIME,
-  KEY_MAX_RGBW
+  KEY_MAX_RGBW,
+  KEY_PUSHOVER,
+  KEY_PUSHOVER_TOKEN,
+  KEY_PUSHOVER_USER,
 };
 
 //#define GPIO      "GPIO"
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index cea01ab6..7d0177e6 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -83,7 +83,7 @@ void addRelayButton(uint8_t nr) {
     }
 
     relay[size]->keepTurnOnDuration();
-        // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
+    // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
     if (pinButton != OFF_GPIO) {
       button.push_back(new Supla::Control::Button(pinButton, true));
@@ -94,6 +94,20 @@ void addRelayButton(uint8_t nr) {
     if (pinLED != OFF_GPIO) {
       new Supla::Control::PinStatusLed(pinRelay, pinLED, !levelLed);
     }
+
+#if defined(SUPLA_PUSHOVER)
+    if (ConfigManager->get(KEY_PUSHOVER)->getElement(size).toInt() && strcmp(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), "") != 0 &&
+        strcmp(ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), "") != 0) {
+      pushover.push_back(
+          new Supla::Control::Pushover(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), true));
+
+      int sizePushover = pushover.size() - 1;
+      Serial.println(pushover.size());
+      pushover[sizePushover]->setTitle(ConfigManager->get(KEY_HOST_NAME)->getValue());
+      pushover[sizePushover]->setMessage(String("Przekaźnik " + String(size + 1) + " - ZAŁĄCZONY").c_str());
+      relay[size]->addAction(Supla::SEND_NOTIF_1, pushover[sizePushover], Supla::ON_TURN_ON);
+    }
+#endif
   }
 }
 #endif
@@ -265,11 +279,15 @@ void addRGBWLeds(uint8_t nr) {
 }
 #endif
 
-#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
+#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_PUSHOVER)
 std::vector<Supla::Control::Relay *> relay;
 std::vector<Supla::Control::Button *> button;
 #endif
 
+#if defined(SUPLA_PUSHOVER)
+std::vector<Supla::Control::Pushover *> pushover;
+#endif
+
 #ifdef SUPLA_DS18B20
 std::vector<DS18B20 *> sensorDS;
 #endif
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 723ed9f4..044b0ccb 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -99,6 +99,10 @@ extern std::vector<Supla::Control::Relay *> relay;
 extern std::vector<Supla::Control::Button *> button;
 #endif
 
+#if defined(SUPLA_PUSHOVER)
+extern std::vector<Supla::Control::Pushover *> pushover;
+#endif
+
 #ifdef SUPLA_DS18B20
 void addDS18B20MultiThermometer(int pinNumber);
 
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index fd1ccf5d..69a64e19 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -86,6 +86,16 @@ void handleOtherSave() {
   }
 #endif
 
+#if defined(SUPLA_PUSHOVER)
+  if (strcmp(WebServer->httpServer.arg(INPUT_PUSHOVER_TOKEN).c_str(), "") != 0) {
+    ConfigManager->set(KEY_PUSHOVER_TOKEN, WebServer->httpServer.arg(INPUT_PUSHOVER_TOKEN).c_str());
+  }
+
+  if (strcmp(WebServer->httpServer.arg(INPUT_PUSHOVER_USER).c_str(), "") != 0) {
+    ConfigManager->set(KEY_PUSHOVER_USER, WebServer->httpServer.arg(INPUT_PUSHOVER_USER).c_str());
+  }
+#endif
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       suplaWebPageOther(1);
@@ -144,6 +154,13 @@ void suplaWebPageOther(int save) {
   addFormHeaderEnd(webContentBuffer);
 #endif
 
+#if defined(SUPLA_PUSHOVER)
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " PUSHOVER");
+  addTextBox(webContentBuffer, INPUT_PUSHOVER_TOKEN, F("Token"), KEY_PUSHOVER_TOKEN, 0, MAX_TOKEN_SIZE, false);
+  addTextBox(webContentBuffer, INPUT_PUSHOVER_USER, F("Users"), KEY_PUSHOVER_USER, 0, MAX_USER_SIZE, false);
+  addFormHeaderEnd(webContentBuffer);
+#endif
+
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
diff --git a/src/SuplaWebPageOther.h b/src/SuplaWebPageOther.h
index a2f0dc34..7f35e0f7 100644
--- a/src/SuplaWebPageOther.h
+++ b/src/SuplaWebPageOther.h
@@ -47,7 +47,11 @@ void suplaWebpageHLW8012Calibrate(uint8_t save);
 #define INPUT_RGBW_BLUE             "rgbwb"
 #define INPUT_RGBW_BRIGHTNESS       "rgbwbr"
 #define INPUT_RGBW_COLOR_BRIGHTNESS "rgbwcb"
+#endif
 
+#ifdef SUPLA_PUSHOVER
+#define INPUT_PUSHOVER_TOKEN "pot"
+#define INPUT_PUSHOVER_USER  "pou"
 #endif
 
 #endif  // SuplaWebPageOther_h
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index d6fc0862..a57c1c0b 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -168,6 +168,11 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
   input += nr_relay;
   ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
 
+#if defined(SUPLA_PUSHOVER)
+  input = INPUT_PUSHOVER;
+  ConfigManager->setElement(KEY_PUSHOVER, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
+#endif
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       supla_webpage_relay(1);
@@ -205,6 +210,11 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save) {
   selected = ConfigESP->getMemory(nr_relay.toInt(), FUNCTION_RELAY);
   addListBox(webContentBuffer, INPUT_RELAY_MEMORY + nr_relay, S_REACTION_AFTER_RESET, MEMORY_P, 3, selected);
 
+#if defined(SUPLA_PUSHOVER)
+  selected = ConfigManager->get(KEY_PUSHOVER)->getElement(nr_relay.toInt() - 1).toInt();
+  addListBox(webContentBuffer, INPUT_PUSHOVER, F("Pushover"), STATE_P, 2, selected);
+#endif
+
   addFormHeaderEnd(webContentBuffer);
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index 19a12401..af1fa83c 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -4,17 +4,21 @@
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 
-#define PATH_RELAY                "relay"
-#define PATH_SAVE_RELAY           "saverelay"
-#define PATH_RELAY_SET            "setrelay"
-#define PATH_SAVE_RELAY_SET       "savesetrelay"
-#define INPUT_MAX_RELAY           "mrl"
-#define INPUT_RELAY_GPIO          "rlg"
-#define INPUT_ADRESS_MCP23017     "iam"
-#define INPUT_RELAY_LEVEL         "irl"
-#define INPUT_RELAY_MEMORY        "irm"
-#define INPUT_RELAY_DURATION      "ird"
-#define INPUT_ROLLERSHUTTER       "irsr"
+#define PATH_RELAY            "relay"
+#define PATH_SAVE_RELAY       "saverelay"
+#define PATH_RELAY_SET        "setrelay"
+#define PATH_SAVE_RELAY_SET   "savesetrelay"
+#define INPUT_MAX_RELAY       "mrl"
+#define INPUT_RELAY_GPIO      "rlg"
+#define INPUT_ADRESS_MCP23017 "iam"
+#define INPUT_RELAY_LEVEL     "irl"
+#define INPUT_RELAY_MEMORY    "irm"
+#define INPUT_RELAY_DURATION  "ird"
+#define INPUT_ROLLERSHUTTER   "irsr"
+
+#if defined(SUPLA_PUSHOVER)
+#define INPUT_PUSHOVER "po"
+#endif
 
 enum _memory_relay
 {
@@ -36,7 +40,6 @@ class SuplaWebPageRelay {
   void handleRelaySaveSetMCP23017();
   void handleRelaySetMCP23017();
 
-
  private:
   void supla_webpage_relay_set(int save);
   void supla_webpage_relay(int save);
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index b50261ff..a6e40e81 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -199,18 +199,13 @@ void SuplaWebServer::deviceSettings(int save) {
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_DEVICE_SETTINGS);
 
-  webContentBuffer += F("<form method='post' action='");
-  webContentBuffer += PATH_SAVE_BOARD;
-  webContentBuffer += F("'>");
-
+  addForm(webContentBuffer, F("post"), PATH_SAVE_BOARD);
   addFormHeader(webContentBuffer, S_TEMPLATE_BOARD);
   uint8_t selected = ConfigManager->get(KEY_BOARD)->getValueInt();
   addListBox(webContentBuffer, INPUT_BOARD, S_TYPE, BOARD_P, MAX_MODULE, selected);
   addFormHeaderEnd(webContentBuffer);
-
-  webContentBuffer += F("<button type='submit'>");
-  webContentBuffer += S_SAVE;
-  webContentBuffer += F("</button></form><br><br>");
+  addButtonSubmit(webContentBuffer, S_SAVE);
+  addFormEnd(webContentBuffer);
 
   addFormHeader(webContentBuffer, S_DEVICE_SETTINGS);
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
@@ -345,7 +340,7 @@ void SuplaWebServer::sendContent() {
 
 void SuplaWebServer::handleNotFound() {
   httpServer.sendHeader("Location", "/", true);
-  //httpServer.send(302, "text/plane", "");
+  // httpServer.send(302, "text/plane", "");
 
   supla_webpage_reboot();
 }

From 77056e3d57d6c0d53bf99913d948fa22abf82a0e Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 5 Feb 2021 16:41:35 +0100
Subject: [PATCH 055/165] aktualizacja biblioteki pushover

---
 .../src/supla/control/pushover.cpp            | 158 ++++++++++++++++++
 lib/SuplaDevice/src/supla/control/pushover.h  |  80 +++++++++
 2 files changed, 238 insertions(+)
 create mode 100644 lib/SuplaDevice/src/supla/control/pushover.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/pushover.h

diff --git a/lib/SuplaDevice/src/supla/control/pushover.cpp b/lib/SuplaDevice/src/supla/control/pushover.cpp
new file mode 100644
index 00000000..750a44b2
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/pushover.cpp
@@ -0,0 +1,158 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "pushover.h"
+
+#include <Arduino.h>
+
+namespace Supla {
+namespace Control {
+
+Pushover::Pushover(const char *token, const char *user, bool isSecured)
+    : lastMsgReceivedMs(0) {
+  setToken(token);
+  setUser(user);
+  _isSecured = isSecured;
+}
+
+Pushover::~Pushover() {
+  delete[] client;
+}
+
+void Pushover::setToken(const char *token) {
+  if (token) {
+    strncpy(_token, token, MAX_TOKEN_SIZE);
+  }
+}
+
+void Pushover::setUser(const char *user) {
+  if (user) {
+    strncpy(_user, user, MAX_TOKEN_SIZE);
+  }
+}
+
+void Pushover::setTitle(const char *title) {
+  if (title) {
+    strncpy(_title, title, MAX_TOKEN_SIZE);
+  }
+}
+
+void Pushover::setMessage(const char *message) {
+  if (message) {
+    strncpy(_message, message, MAX_TOKEN_SIZE);
+  }
+}
+
+bool Pushover::openConnection() {
+  if (!client->connect(host, _isSecured ? 443 : 80)) {
+    return false;
+  }
+  return true;
+}
+
+bool Pushover::closeConnection() {
+  client->stop();
+  return checkConnection();
+}
+
+bool Pushover::checkConnection() {
+  if (client->connected() == 1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+void Pushover::toggleConnection() {
+  if (client == NULL) {
+    if (_isSecured) {
+      client = new WiFiClientSecure();
+      ((WiFiClientSecure *)client)->setInsecure();
+      ((WiFiClientSecure *)client)->setBufferSizes(1024, 1024);
+    } else {
+      client = new WiFiClient();
+    }
+  }
+
+  if (checkConnection()) {
+    closeConnection();
+  } else {
+    openConnection();
+  }
+}
+
+void Pushover::sendRequest() {
+  if (client) {
+    String post = String("token=") + _token + "&user=" + _user +
+                  "&title=" + _title + "&message=" + _message;
+
+    /* String("token=") + _token + "&user=" + _user + "&title=" + _title +
+     "&message=" + _message + "&device=" + _device + "&url=" + _url +
+     "&url_title=" + _url_title + "&priority=" + _priority +
+     "&retry=" + _retry + "&expire=" + _expire + "&sound=" + _sound;*/
+
+    (WiFiClientSecure *)client->print(
+        String("POST ") + path + " HTTP/1.1\r\n" + "host: " + host + "\r\n" +
+        "Content-length: " + String(post.length(), DEC) +
+        "\r\n"
+        "Content-Type: application/x-www-form-urlencoded\r\n" +
+        "Connection: close\r\n\r\n" + post);
+
+    while (client->connected()) {
+      String line = client->readStringUntil('\n');
+      if (line == "\r") {
+        Serial.println(F("Headers received"));
+        break;
+      }
+    }
+
+   /* String line = client->readString();
+    if (line.indexOf("\"status\":1") != -1 || line.indexOf("200 OK") != -1) {
+      Serial.println(F("Alert sent successfully!"));
+    } else {
+      Serial.print(F("Alert failure"));
+      Serial.println(line);
+    }*/
+  }
+}
+
+void Pushover::send() {
+  toggleConnection();
+  sendRequest();
+  toggleConnection();
+
+  if (client) {
+    delete client;
+    client = nullptr;
+  }
+}
+
+void Pushover::iterateAlways() {
+  if (lastMsgReceivedMs != 0 && millis() - lastMsgReceivedMs > 400) {
+    lastMsgReceivedMs = 0;
+    send();
+  }
+}
+
+void Pushover::handleAction(int event, int action) {
+  (void)(event);
+  if (action == SEND_NOTIF_1) {
+    lastMsgReceivedMs = millis();
+  }
+}
+
+};  // namespace Control
+};  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/control/pushover.h b/lib/SuplaDevice/src/supla/control/pushover.h
new file mode 100644
index 00000000..77634c91
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/pushover.h
@@ -0,0 +1,80 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _pushover_h
+#define _pushover_h
+
+#include <Arduino.h>
+#include <WiFiClientSecure.h>
+
+#include "../action_handler.h"
+#include "../actions.h"
+#include "../channel_element.h"
+
+#define MAX_TOKEN_SIZE   32
+#define MAX_USER_SIZE    32
+#define MAX_TITLE_SIZE   32
+#define MAX_MESSAGE_SIZE 64
+
+namespace Supla {
+namespace Control {
+class Pushover : public Element, public ActionHandler {
+ public:
+  Pushover(const char *token = nullptr,
+           const char *user = nullptr,
+           bool isSecured = true);
+  ~Pushover();
+
+  void setToken(const char *token);
+  void setUser(const char *user);
+  void setMessage(const char *message);
+  void setTitle(const char *title);
+
+  void iterateAlways();
+  void handleAction(int event, int action);
+
+  bool checkConnection();
+  void toggleConnection();
+  bool openConnection();
+  bool closeConnection();
+  void sendRequest();
+  void send();
+
+ protected:
+  WiFiClient *client = NULL;
+  const char *host = "api.pushover.net";
+  const char *path = "/1/messages.json";
+  unsigned long lastMsgReceivedMs;
+
+  bool _isSecured;
+  char _token[MAX_TOKEN_SIZE];
+  char _user[MAX_USER_SIZE];
+  char _title[MAX_TITLE_SIZE];
+  char _message[MAX_MESSAGE_SIZE];
+  String _device;
+  String _url;
+  String _url_title;
+  int8_t _priority = 0;
+  uint16_t _retry;
+  uint16_t _expire;
+  uint32_t _timestamp = 0;
+  String _sound;
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif

From 2faee9387286f5a38b7c6b9e5ed09072e395785d Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 7 Feb 2021 19:38:25 +0100
Subject: [PATCH 056/165] aktualizacja SuplaDevice

---
 .../GarageParkingAssistLight.ino              |  94 +++++
 lib/SuplaDevice/extras/test/CMakeLists.txt    |   1 +
 .../channel_element_tests.cpp                 |  27 ++
 .../ChannelTests/channel_extended_tests.cpp   | 128 +++++++
 .../test/ChannelTests/channel_tests.cpp       |   9 -
 .../ConditionTests/on_between_eq_tests.cpp    |  43 +++
 .../test/ConditionTests/on_between_tests.cpp  |  41 +++
 .../test/ConditionTests/on_equal_tests.cpp    |  39 ++
 .../ConditionTests/on_greater_eq_tests.cpp    |  39 ++
 .../test/ConditionTests/on_greater_tests.cpp  |  38 ++
 .../test/ConditionTests/on_less_eq_tests.cpp  |  43 +++
 .../test/ConditionTests/on_less_tests.cpp     | 336 ++++++++++++++++++
 lib/SuplaDevice/src/CMakeLists.txt            |   8 +
 lib/SuplaDevice/src/supla/action_handler.h    |   4 +
 lib/SuplaDevice/src/supla/channel.cpp         |   8 +-
 lib/SuplaDevice/src/supla/channel_element.cpp |  10 +
 lib/SuplaDevice/src/supla/channel_element.h   |   6 +
 lib/SuplaDevice/src/supla/condition.cpp       |  92 +++++
 lib/SuplaDevice/src/supla/condition.h         |  62 ++++
 .../src/supla/conditions/on_between.cpp       |  38 ++
 .../src/supla/conditions/on_between_eq.cpp    |  39 ++
 .../src/supla/conditions/on_equal.cpp         |  36 ++
 .../src/supla/conditions/on_greater.cpp       |  36 ++
 .../src/supla/conditions/on_greater_eq.cpp    |  36 ++
 .../src/supla/conditions/on_less.cpp          |  34 ++
 .../src/supla/conditions/on_less_eq.cpp       |  35 ++
 .../src/supla/control/dimmer_base.cpp         |  44 +++
 .../src/supla/control/dimmer_base.h           |  17 +-
 lib/SuplaDevice/src/supla/control/pushover.h  |   5 +
 lib/SuplaDevice/src/supla/control/rgb_base.h  |   9 +
 .../src/supla/control/rgbw_base.cpp           | 123 ++++++-
 lib/SuplaDevice/src/supla/control/rgbw_base.h |  25 +-
 lib/SuplaDevice/src/supla/events.h            |   3 +-
 lib/SuplaDevice/src/supla/local_action.cpp    |   7 +
 lib/SuplaDevice/src/supla/local_action.h      |   3 +
 lib/SuplaDevice/src/supla/sensor/DS18B20.h    |   5 +
 lib/SuplaDevice/src/supla/sensor/HC_SR04.h    |   4 +-
 lib/SuplaDevice/src/supla/sensor/distance.h   |   2 +-
 .../supla/sensor/therm_hygro_press_meter.cpp  |  22 ++
 .../supla/sensor/therm_hygro_press_meter.h    |   5 +
 40 files changed, 1514 insertions(+), 42 deletions(-)
 create mode 100644 lib/SuplaDevice/examples/GarageParkingAssistLight/GarageParkingAssistLight.ino
 create mode 100644 lib/SuplaDevice/extras/test/ChannelTests/channel_extended_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ConditionTests/on_between_eq_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ConditionTests/on_between_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ConditionTests/on_equal_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ConditionTests/on_greater_eq_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ConditionTests/on_greater_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ConditionTests/on_less_eq_tests.cpp
 create mode 100644 lib/SuplaDevice/extras/test/ConditionTests/on_less_tests.cpp
 create mode 100644 lib/SuplaDevice/src/supla/condition.cpp
 create mode 100644 lib/SuplaDevice/src/supla/condition.h
 create mode 100644 lib/SuplaDevice/src/supla/conditions/on_between.cpp
 create mode 100644 lib/SuplaDevice/src/supla/conditions/on_between_eq.cpp
 create mode 100644 lib/SuplaDevice/src/supla/conditions/on_equal.cpp
 create mode 100644 lib/SuplaDevice/src/supla/conditions/on_greater.cpp
 create mode 100644 lib/SuplaDevice/src/supla/conditions/on_greater_eq.cpp
 create mode 100644 lib/SuplaDevice/src/supla/conditions/on_less.cpp
 create mode 100644 lib/SuplaDevice/src/supla/conditions/on_less_eq.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/dimmer_base.cpp

diff --git a/lib/SuplaDevice/examples/GarageParkingAssistLight/GarageParkingAssistLight.ino b/lib/SuplaDevice/examples/GarageParkingAssistLight/GarageParkingAssistLight.ino
new file mode 100644
index 00000000..76c4e2d8
--- /dev/null
+++ b/lib/SuplaDevice/examples/GarageParkingAssistLight/GarageParkingAssistLight.ino
@@ -0,0 +1,94 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <SuplaDevice.h>
+
+// Add include to HC_SR04 sensor
+#include <supla/sensor/HC_SR04.h>
+#include <supla/control/relay.h>
+#include <supla/condition.h>
+
+// Choose proper network interface for your card:
+#ifdef ARDUINO_ARCH_AVR
+  // Arduino Mega with EthernetShield W5100:
+  #include <supla/network/ethernet_shield.h>
+  // Ethernet MAC address
+  uint8_t mac[6] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+  Supla::EthernetShield ethernet(mac);
+
+  // Arduino Mega with ENC28J60:
+  // #include <supla/network/ENC28J60.h>
+  // Supla::ENC28J60 ethernet(mac);
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  // ESP8266 and ESP32 based board:
+  #include <supla/network/esp_wifi.h>
+  Supla::ESPWifi wifi("your_wifi_ssid", "your_wifi_password");
+#endif
+
+void setup() {
+
+  Serial.begin(115200);
+
+  // Replace the falowing GUID with value that you can retrieve from https://www.supla.org/arduino/get-guid
+  char GUID[SUPLA_GUID_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+  // Replace the following AUTHKEY with value that you can retrieve from: https://www.supla.org/arduino/get-authkey
+  char AUTHKEY[SUPLA_AUTHKEY_SIZE] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+  /*
+   * Having your device already registered at cloud.supla.org,
+   * you want to change CHANNEL sequence or remove any of them,
+   * then you must also remove the device itself from cloud.supla.org.
+   * Otherwise you will get "Channel conflict!" error.
+   */
+
+
+  auto distance = new Supla::Sensor::HC_SR04(12,13);//(trigPin, echoPin)
+
+  auto redLight = new Supla::Control::Relay(22);
+  auto orangeLight = new Supla::Control::Relay(23);
+  auto greenLight = new Supla::Control::Relay(24);
+
+  distance->addAction(Supla::TURN_ON, redLight, OnLess(0.40));
+  distance->addAction(Supla::TURN_ON, orangeLight, OnBetween(0.40, 0.80));
+  distance->addAction(Supla::TURN_ON, greenLight, OnBetween(0.80, 1.50));
+  
+  distance->addAction(Supla::TURN_OFF, orangeLight, OnLess(0.35));
+  distance->addAction(Supla::TURN_OFF, greenLight, OnLess(0.75));
+
+  distance->addAction(Supla::TURN_OFF, redLight, OnGreater(0.45));
+  distance->addAction(Supla::TURN_OFF, orangeLight, OnGreater(0.85));
+  distance->addAction(Supla::TURN_OFF, greenLight, OnGreater(1.55));
+
+  /*
+   * SuplaDevice Initialization.
+   * Server address is available at https://cloud.supla.org 
+   * If you do not have an account, you can create it at https://cloud.supla.org/account/create
+   * SUPLA and SUPLA CLOUD are free of charge
+   * 
+   */
+
+  SuplaDevice.begin(GUID,              // Global Unique Identifier 
+                    "svr1.supla.org",  // SUPLA server address
+                    "email@address",   // Email address used to login to Supla Cloud
+                    AUTHKEY);          // Authorization key
+    
+}
+
+void loop() {
+  SuplaDevice.iterate();
+}
+
diff --git a/lib/SuplaDevice/extras/test/CMakeLists.txt b/lib/SuplaDevice/extras/test/CMakeLists.txt
index 381d42d8..107bf4d8 100644
--- a/lib/SuplaDevice/extras/test/CMakeLists.txt
+++ b/lib/SuplaDevice/extras/test/CMakeLists.txt
@@ -42,6 +42,7 @@ file(GLOB TEST_SRC
   ChannelElementTests/*.cpp
   InternalPinOutputTests/*.cpp
   PinStatusLedTests/*.cpp
+  ConditionTests/*.cpp
   )
 
 file(GLOB DOUBLE_SRC doubles/*.cpp)
diff --git a/lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp b/lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp
index 4cb78137..19e731df 100644
--- a/lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp
+++ b/lib/SuplaDevice/extras/test/ChannelElementTests/channel_element_tests.cpp
@@ -20,6 +20,7 @@
 #include <supla/events.h>
 #include <supla/actions.h>
 #include <supla/action_handler.h>
+#include <supla/condition.h>
 
 
 class ActionHandlerMock : public Supla::ActionHandler {
@@ -29,6 +30,7 @@ class ActionHandlerMock : public Supla::ActionHandler {
 
 
 TEST(ChannelElementTests, ActionDelegationToChannel) {
+  ASSERT_EQ(Supla::LocalAction::getClientListPtr(), nullptr);
   Supla::ChannelElement element;
 
   ActionHandlerMock mock1;
@@ -52,3 +54,28 @@ TEST(ChannelElementTests, ActionDelegationToChannel) {
   element.getChannel()->setNewValue(false);
 }
 
+TEST(ChannelElementTests, ActionDelegationToConditions) {
+  ASSERT_EQ(Supla::LocalAction::getClientListPtr(), nullptr);
+
+  ActionHandlerMock mock1;
+  ActionHandlerMock mock2;
+
+  int action1 = 11;
+
+  EXPECT_CALL(mock1, handleAction(Supla::ON_CHANGE, action1)).Times(1);
+  EXPECT_CALL(mock2, handleAction(Supla::ON_CHANGE, action1)).Times(1);
+
+  Supla::ChannelElement element;
+  auto channel = element.getChannel();
+  channel->setType(SUPLA_CHANNELTYPE_DISTANCESENSOR);
+
+  element.addAction(action1, mock1, OnLess(50));
+  element.addAction(action1, &mock2, OnLess(30));
+
+  channel->setNewValue(60);
+  channel->setNewValue(50);
+  channel->setNewValue(45);
+  channel->setNewValue(25);
+}
+
+
diff --git a/lib/SuplaDevice/extras/test/ChannelTests/channel_extended_tests.cpp b/lib/SuplaDevice/extras/test/ChannelTests/channel_extended_tests.cpp
new file mode 100644
index 00000000..57296822
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ChannelTests/channel_extended_tests.cpp
@@ -0,0 +1,128 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/channel.h>
+#include <supla/channel_extended.h>
+#include <gmock/gmock.h>
+#include <srpc_mock.h>
+#include <supla/events.h>
+#include <supla/actions.h>
+
+
+class ActionHandlerMock : public Supla::ActionHandler {
+ public:
+  MOCK_METHOD(void, handleAction, (int, int), (override));
+};
+
+
+using ::testing::_;
+using ::testing::ElementsAreArray;
+using ::testing::Args;
+using ::testing::ElementsAre;
+
+
+TEST(ChannelExtendedTests, ExtendedChannelMethods) {
+  Supla::ChannelExtended extChannel;
+
+  EXPECT_TRUE(extChannel.isExtended());
+  EXPECT_NE(nullptr, extChannel.getExtValue() );
+  
+}
+
+TEST(ChannelExtendedTests, SetNewValueOnExtChannel) {
+  int number = 0;
+  Supla::ChannelExtended extChannel;
+  TElectricityMeter_ExtendedValue_V2 emVal = {};
+  TElectricityMeter_Value expectedValue = {};
+
+  emVal.m_count = 1;
+  emVal.measured_values |= EM_VAR_FORWARD_ACTIVE_ENERGY;
+  emVal.total_forward_active_energy[0] = 1000;
+  emVal.total_forward_active_energy[1] = 2000;
+  emVal.total_forward_active_energy[2] = 4000;
+
+  expectedValue.total_forward_active_energy = (1000 + 2000 + 4000) / 1000;
+
+  extChannel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(extChannel.isUpdateReady());
+  extChannel.clearUpdateReady();
+
+  emVal.measured_values |= EM_VAR_VOLTAGE;
+  emVal.m[0].voltage[0] = 10; 
+  emVal.m[0].voltage[1] = 0; 
+  emVal.m[0].voltage[2] = 0; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE1_ON;
+
+  extChannel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(extChannel.isUpdateReady());
+  extChannel.clearUpdateReady();
+
+  emVal.m[0].voltage[0] = 0; 
+  emVal.m[0].voltage[1] = 20; 
+  emVal.m[0].voltage[2] = 0; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE2_ON;
+
+  extChannel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(extChannel.isUpdateReady());
+  extChannel.clearUpdateReady();
+
+
+  emVal.m[0].voltage[0] = 0; 
+  emVal.m[0].voltage[1] = 0; 
+  emVal.m[0].voltage[2] = 300; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE3_ON;
+
+  extChannel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(extChannel.isUpdateReady());
+  extChannel.clearUpdateReady();
+
+
+  emVal.m[0].voltage[0] = 10; 
+  emVal.m[0].voltage[1] = 0; 
+  emVal.m[0].voltage[2] = 540; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE1_ON | EM_VALUE_FLAG_PHASE3_ON;
+
+  extChannel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(extChannel.isUpdateReady());
+  extChannel.clearUpdateReady();
+
+  emVal.m[0].voltage[0] = 10; 
+  emVal.m[0].voltage[1] = 230; 
+  emVal.m[0].voltage[2] = 540; 
+
+  expectedValue.flags = 0;
+  expectedValue.flags |= EM_VALUE_FLAG_PHASE1_ON | EM_VALUE_FLAG_PHASE3_ON | EM_VALUE_FLAG_PHASE2_ON;
+
+  extChannel.setNewValue(emVal);
+  EXPECT_TRUE(0 == memcmp(Supla::Channel::reg_dev.channels[number].value, &expectedValue, sizeof(expectedValue)));
+  EXPECT_TRUE(extChannel.isUpdateReady());
+  extChannel.clearUpdateReady();
+}
diff --git a/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp b/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
index 136316dd..09008e7a 100644
--- a/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
+++ b/lib/SuplaDevice/extras/test/ChannelTests/channel_tests.cpp
@@ -17,7 +17,6 @@
 #include <gtest/gtest.h>
 
 #include <supla/channel.h>
-#include <supla/channel_extended.h>
 #include <gmock/gmock.h>
 #include <srpc_mock.h>
 #include <supla/events.h>
@@ -238,14 +237,6 @@ TEST(ChannelTests, SetNewValue) {
   channel.clearUpdateReady();
 }
 
-TEST(ChannelTests, ExtendedChannelMethods) {
-  Supla::ChannelExtended extChannel;
-
-  EXPECT_TRUE(extChannel.isExtended());
-  EXPECT_NE(nullptr, extChannel.getExtValue() );
-  
-}
-
 TEST(ChannelTests, ChannelValueGetters) {
   Supla::Channel channel;
 
diff --git a/lib/SuplaDevice/extras/test/ConditionTests/on_between_eq_tests.cpp b/lib/SuplaDevice/extras/test/ConditionTests/on_between_eq_tests.cpp
new file mode 100644
index 00000000..f3287a2b
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ConditionTests/on_between_eq_tests.cpp
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/condition.h>
+
+TEST(OnBetweenEqTests, OnBetweenEqConditionTests) {
+  auto cond = OnBetweenEq(20, 30);
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(15));
+
+  EXPECT_TRUE(cond->checkConditionFor(20));
+  EXPECT_FALSE(cond->checkConditionFor(20.001));
+  EXPECT_FALSE(cond->checkConditionFor(25));
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  EXPECT_FALSE(cond->checkConditionFor(50));
+  EXPECT_TRUE(cond->checkConditionFor(30));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  EXPECT_TRUE(cond->checkConditionFor(24));
+}
+
+
+
diff --git a/lib/SuplaDevice/extras/test/ConditionTests/on_between_tests.cpp b/lib/SuplaDevice/extras/test/ConditionTests/on_between_tests.cpp
new file mode 100644
index 00000000..63314db8
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ConditionTests/on_between_tests.cpp
@@ -0,0 +1,41 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/condition.h>
+
+TEST(OnBetweenTests, OnBetweenConditionTests) {
+  auto cond = OnBetween(20, 30);
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(15));
+
+  EXPECT_FALSE(cond->checkConditionFor(20));
+  EXPECT_TRUE(cond->checkConditionFor(20.001));
+  EXPECT_FALSE(cond->checkConditionFor(25));
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  EXPECT_FALSE(cond->checkConditionFor(50));
+  EXPECT_TRUE(cond->checkConditionFor(29));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+}
+
+
diff --git a/lib/SuplaDevice/extras/test/ConditionTests/on_equal_tests.cpp b/lib/SuplaDevice/extras/test/ConditionTests/on_equal_tests.cpp
new file mode 100644
index 00000000..c48cc0ed
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ConditionTests/on_equal_tests.cpp
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/condition.h>
+
+TEST(OnEqualTests, OnEqualConditionTests) {
+  auto cond = OnEqual(3.1415);
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(15));
+
+  EXPECT_TRUE(cond->checkConditionFor(3.1415));
+  EXPECT_FALSE(cond->checkConditionFor(20.001));
+  EXPECT_FALSE(cond->checkConditionFor(25));
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  EXPECT_FALSE(cond->checkConditionFor(50));
+  EXPECT_TRUE(cond->checkConditionFor(3.1415));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+}
diff --git a/lib/SuplaDevice/extras/test/ConditionTests/on_greater_eq_tests.cpp b/lib/SuplaDevice/extras/test/ConditionTests/on_greater_eq_tests.cpp
new file mode 100644
index 00000000..5022c061
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ConditionTests/on_greater_eq_tests.cpp
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/condition.h>
+
+TEST(OnGreaterEqTests, OnGreaterEqConditionTests) {
+  auto cond = OnGreaterEq(20);
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(15));
+
+  EXPECT_TRUE(cond->checkConditionFor(20));
+  EXPECT_FALSE(cond->checkConditionFor(20.001));
+  EXPECT_FALSE(cond->checkConditionFor(25));
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  EXPECT_TRUE(cond->checkConditionFor(50));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+}
+
diff --git a/lib/SuplaDevice/extras/test/ConditionTests/on_greater_tests.cpp b/lib/SuplaDevice/extras/test/ConditionTests/on_greater_tests.cpp
new file mode 100644
index 00000000..c51459ab
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ConditionTests/on_greater_tests.cpp
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/condition.h>
+
+TEST(OnGreaterTests, OnGreaterConditionTests) {
+  auto cond = OnGreater(20);
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(15));
+
+  EXPECT_FALSE(cond->checkConditionFor(20));
+  EXPECT_TRUE(cond->checkConditionFor(20.001));
+  EXPECT_FALSE(cond->checkConditionFor(25));
+
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  EXPECT_TRUE(cond->checkConditionFor(50));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+}
diff --git a/lib/SuplaDevice/extras/test/ConditionTests/on_less_eq_tests.cpp b/lib/SuplaDevice/extras/test/ConditionTests/on_less_eq_tests.cpp
new file mode 100644
index 00000000..f9de0634
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ConditionTests/on_less_eq_tests.cpp
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+
+#include <supla/condition.h>
+
+TEST(OnEqualEqTests, OnLessEqConditionTests) {
+  auto cond = OnLessEq(10);
+
+  EXPECT_TRUE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(15));
+
+  EXPECT_TRUE(cond->checkConditionFor(10));
+  EXPECT_FALSE(cond->checkConditionFor(9.9999));
+
+  // "On" conditions should fire actions only on transition to meet condition.
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  // Going back above threshold value, should reset expectation and it should return
+  // true on next call with met condition
+  EXPECT_FALSE(cond->checkConditionFor(50));
+  EXPECT_TRUE(cond->checkConditionFor(5));
+
+}
+
+
+
diff --git a/lib/SuplaDevice/extras/test/ConditionTests/on_less_tests.cpp b/lib/SuplaDevice/extras/test/ConditionTests/on_less_tests.cpp
new file mode 100644
index 00000000..aee77b1b
--- /dev/null
+++ b/lib/SuplaDevice/extras/test/ConditionTests/on_less_tests.cpp
@@ -0,0 +1,336 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <supla/condition.h>
+#include <supla/channel_element.h>
+#include <supla/events.h>
+#include <supla/actions.h>
+
+
+class ActionHandlerMock : public Supla::ActionHandler {
+ public:
+  MOCK_METHOD(void, handleAction, (int, int), (override));
+};
+
+
+using ::testing::_;
+using ::testing::ElementsAreArray;
+using ::testing::Args;
+using ::testing::ElementsAre;
+
+TEST(ConditionTests, handleActionTestsForDouble) {
+  ActionHandlerMock ahMock;
+  const int action1 = 15;
+  const int action2 = 16;
+  const int action3 = 17;
+
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action1)).Times(4);
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action3)).Times(4);
+
+  Supla::ChannelElement channelElement;
+  auto channel = channelElement.getChannel();
+
+  auto cond = OnLess(15.1);
+  cond->setSource(channelElement);
+  cond->setClient(ahMock);
+
+
+  // DISTANCE sensor use int type on channel value
+  channel->setType(SUPLA_CHANNELTYPE_WINDSENSOR);
+
+  channel->setNewValue(0.0);
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(100.0);
+  
+  // 100 is not less than 15.1, so nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.0);
+  // 15 is less than 15.1
+  cond->handleAction(Supla::ON_CHANGE, action3);
+
+  // nothing should happen
+  channel->setNewValue(25.0);
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  // PRESSURE sensor use int type on channel value
+  channel->setType(SUPLA_CHANNELTYPE_PRESSURESENSOR);
+
+  channel->setNewValue(0.0);
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(100.0);
+  
+  // 100 is not less than 15.1, so nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.0);
+  // 15 is less than 15.1
+  cond->handleAction(Supla::ON_CHANGE, action3);
+
+  // nothing should happen
+  channel->setNewValue(25.0);
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  // RAIN sensor use int type on channel value
+  channel->setType(SUPLA_CHANNELTYPE_RAINSENSOR);
+
+  channel->setNewValue(0.0);
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(100.0);
+  
+  // 100 is not less than 15.1, so nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.0);
+  // 15 is less than 15.1
+  cond->handleAction(Supla::ON_CHANGE, action3);
+
+  // nothing should happen
+  channel->setNewValue(25.0);
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+
+  // WEIGHT sensor use int type on channel value
+  channel->setType(SUPLA_CHANNELTYPE_WEIGHTSENSOR);
+
+  channel->setNewValue(0.0);
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(100.0);
+  
+  // 100 is not less than 15.1, so nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.0);
+  // 15 is less than 15.1
+  cond->handleAction(Supla::ON_CHANGE, action3);
+
+}
+
+TEST(ConditionTests, handleActionTestsForInt64) {
+  ActionHandlerMock ahMock;
+  const int action1 = 15;
+  const int action2 = 16;
+  const int action3 = 17;
+
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action3));
+
+  Supla::ChannelElement channelElement;
+  auto channel = channelElement.getChannel();
+
+  auto cond = OnLess(15.1);
+  cond->setSource(channelElement);
+  cond->setClient(ahMock);
+
+  // DISTANCE sensor use int type on channel value
+  channel->setType(SUPLA_CHANNELTYPE_IMPULSE_COUNTER);
+
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  _supla_int64_t newValue = 10000344422234; 
+  channel->setNewValue(newValue);
+  
+  // newValue is not less than 15.1, so nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  newValue = 2;
+  channel->setNewValue(newValue);
+  // newValue is less than 15.1
+  cond->handleAction(Supla::ON_CHANGE, action3);
+}
+
+TEST(ConditionTests, handleActionTestsForDouble2) {
+  ActionHandlerMock ahMock;
+  const int action1 = 15;
+  const int action2 = 16;
+  const int action3 = 17;
+
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action3));
+
+  Supla::ChannelElement channelElement;
+  auto channel = channelElement.getChannel();
+
+  auto cond = OnLess(15.1);
+  cond->setSource(channelElement);
+  cond->setClient(ahMock);
+
+  channel->setType(SUPLA_CHANNELTYPE_THERMOMETER);
+
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(15.1);
+  
+  // 15.1 is not less than 15.1, so nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.01);
+  cond->handleAction(Supla::ON_CHANGE, action3);
+
+  // DISTANCE sensor use double type on channel value
+  channel->setType(SUPLA_CHANNELTYPE_DISTANCESENSOR);
+
+  channel->setNewValue(100);
+  
+  // 100 is not less than 15.1, so nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15);
+  // 15 is less than 15.1
+  cond->handleAction(Supla::ON_CHANGE, action3);
+
+  // nothing should happen
+  channel->setNewValue(25);
+  cond->handleAction(Supla::ON_CHANGE, action1);
+}
+
+TEST(ConditionTests, handleActionTestsForNotSupportedChannel) {
+  ActionHandlerMock ahMock;
+  const int action1 = 15;
+  const int action2 = 16;
+  const int action3 = 17;
+
+  EXPECT_CALL(ahMock, handleAction).Times(0);
+
+  Supla::ChannelElement channelElement;
+  auto channel = channelElement.getChannel();
+
+  auto cond = OnLess(15.1);
+  cond->setSource(channelElement);
+  cond->setClient(ahMock);
+
+  // this channel type is not used in library. DS18B20 uses standard THERMOMETER channel
+  channel->setType(SUPLA_CHANNELTYPE_THERMOMETERDS18B20);
+
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(15.1);
+  
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.01);
+  cond->handleAction(Supla::ON_CHANGE, action3);
+}
+
+TEST(ConditionTests, handleActionTestsForFirstDouble) {
+  ActionHandlerMock ahMock;
+  const int action1 = 15;
+  const int action2 = 16;
+  const int action3 = 17;
+
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action3));
+
+  Supla::ChannelElement channelElement;
+  auto channel = channelElement.getChannel();
+
+  auto cond = OnLess(15.1);
+  cond->setSource(channelElement);
+  cond->setClient(ahMock);
+
+  channel->setType(SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR);
+
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(15.1, 10.5);
+  
+  // nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.1, 100.5);
+  
+  // nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+
+  // ahMock should be called
+  channel->setNewValue(15.01, 25.1);
+  cond->handleAction(Supla::ON_CHANGE, action3);
+}
+
+TEST(ConditionTests, handleActionTestsForSecondDouble) {
+  ActionHandlerMock ahMock;
+  const int action1 = 15;
+  const int action2 = 16;
+  const int action3 = 17;
+
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action1));
+  EXPECT_CALL(ahMock, handleAction(Supla::ON_CHANGE, action3));
+
+  Supla::ChannelElement channelElement;
+  auto channel = channelElement.getChannel();
+
+  // second parameter indicates that we should check alternative channel value (pressure/second float)
+  auto cond = OnLess(15.1, true);
+  cond->setSource(channelElement);
+  cond->setClient(ahMock);
+
+  channel->setType(SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR);
+
+  // channel should be initialized to 0, so condition should be met
+  cond->handleAction(Supla::ON_CHANGE, action1);
+
+  channel->setNewValue(0.1, 15.1);
+  
+  // nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+  channel->setNewValue(15.1, 100.5);
+  
+  // nothing should happen
+  cond->handleAction(Supla::ON_CHANGE, action2);
+
+
+  // ahMock should be called
+  channel->setNewValue(16.01, 5.1);
+  cond->handleAction(Supla::ON_CHANGE, action3);
+}
+
+TEST(OnLessTests, OnLessConditionTests) {
+  auto cond = OnLess(10);
+
+  EXPECT_TRUE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(15));
+  EXPECT_FALSE(cond->checkConditionFor(10));
+  EXPECT_TRUE(cond->checkConditionFor(9.9999));
+
+  // "On" conditions should fire actions only on transition to meet condition.
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+  EXPECT_FALSE(cond->checkConditionFor(5));
+
+  // Going back above threshold value, should reset expectation and it should return
+  // true on next call with met condition
+  EXPECT_FALSE(cond->checkConditionFor(50));
+  EXPECT_TRUE(cond->checkConditionFor(5));
+
+}
+
+
diff --git a/lib/SuplaDevice/src/CMakeLists.txt b/lib/SuplaDevice/src/CMakeLists.txt
index 0a9d65ff..24760701 100644
--- a/lib/SuplaDevice/src/CMakeLists.txt
+++ b/lib/SuplaDevice/src/CMakeLists.txt
@@ -9,6 +9,14 @@ set(SRCS
   supla/channel_element.cpp
   supla/control/internal_pin_output.cpp
   supla/control/pin_status_led.cpp
+  supla/condition.cpp
+  supla/conditions/on_less.cpp
+  supla/conditions/on_less_eq.cpp
+  supla/conditions/on_greater.cpp
+  supla/conditions/on_greater_eq.cpp
+  supla/conditions/on_between.cpp
+  supla/conditions/on_between_eq.cpp
+  supla/conditions/on_equal.cpp
 )
 
 add_library(supladevicelib SHARED ${SRCS})
diff --git a/lib/SuplaDevice/src/supla/action_handler.h b/lib/SuplaDevice/src/supla/action_handler.h
index b0e38d63..b057371f 100644
--- a/lib/SuplaDevice/src/supla/action_handler.h
+++ b/lib/SuplaDevice/src/supla/action_handler.h
@@ -20,7 +20,11 @@
 namespace Supla {
 class ActionHandler {
  public:
+  virtual ~ActionHandler() {};
   virtual void handleAction(int event, int action) = 0;
+  virtual bool deleteClient() {
+    return false;
+  }
 };
 
 };
diff --git a/lib/SuplaDevice/src/supla/channel.cpp b/lib/SuplaDevice/src/supla/channel.cpp
index 005d8dfa..65a3ea03 100644
--- a/lib/SuplaDevice/src/supla/channel.cpp
+++ b/lib/SuplaDevice/src/supla/channel.cpp
@@ -57,7 +57,8 @@ void Channel::setNewValue(double dbl) {
   }
   if (setNewValue(newValue)) {
     runAction(ON_CHANGE);
-    supla_log(LOG_DEBUG, "Channel(%d) value changed to %f", channelNumber, dbl);
+    runAction(ON_SECONDARY_CHANNEL_CHANGE);
+    supla_log(LOG_DEBUG, "Channel(%d) value changed to %d.%d", channelNumber, static_cast<int>(dbl), static_cast<int>(dbl*100)%100);
   }
 }
 
@@ -71,6 +72,7 @@ void Channel::setNewValue(double temp, double humi) {
 
   if (setNewValue(newValue)) {
     runAction(ON_CHANGE);
+    runAction(ON_SECONDARY_CHANNEL_CHANGE);
     supla_log(LOG_DEBUG,
               "Channel(%d) value changed to temp(%f), humi(%f)",
               channelNumber,
@@ -87,6 +89,7 @@ void Channel::setNewValue(_supla_int64_t value) {
   memcpy(newValue, &value, sizeof(_supla_int64_t));
   if (setNewValue(newValue)) {
     runAction(ON_CHANGE);
+    runAction(ON_SECONDARY_CHANNEL_CHANGE);
     supla_log(
         LOG_DEBUG, "Channel(%d) value changed to %d", channelNumber, static_cast<int>(value));
   }
@@ -100,6 +103,7 @@ void Channel::setNewValue(_supla_int_t value) {
   memcpy(newValue, &value, sizeof(value));
   if (setNewValue(newValue)) {
     runAction(ON_CHANGE);
+    runAction(ON_SECONDARY_CHANNEL_CHANGE);
     supla_log(
         LOG_DEBUG, "Channel(%d) value changed to %d", channelNumber, value);
   }
@@ -118,6 +122,7 @@ void Channel::setNewValue(bool value) {
       runAction(Supla::ON_TURN_OFF);
     }
     runAction(Supla::ON_CHANGE);
+    runAction(ON_SECONDARY_CHANNEL_CHANGE);
 
     supla_log(
         LOG_DEBUG, "Channel(%d) value changed to %d", channelNumber, value);
@@ -250,6 +255,7 @@ void Channel::setNewValue(uint8_t red,
   newValue[4] = red;
   if (setNewValue(newValue)) {
     runAction(ON_CHANGE);
+    runAction(ON_SECONDARY_CHANNEL_CHANGE);
     supla_log(LOG_DEBUG, "Channel(%d) value changed to RGB(%d, %d, %d), colBr(%d), bright(%d)", channelNumber, red, green, blue, colorBrightness, brightness);
   }
 }
diff --git a/lib/SuplaDevice/src/supla/channel_element.cpp b/lib/SuplaDevice/src/supla/channel_element.cpp
index 2a5da7b8..f9853a62 100644
--- a/lib/SuplaDevice/src/supla/channel_element.cpp
+++ b/lib/SuplaDevice/src/supla/channel_element.cpp
@@ -15,6 +15,7 @@
 */
 
 #include "channel_element.h"
+#include "events.h"
 
 Supla::Channel *Supla::ChannelElement::getChannel() {
   return &channel;
@@ -28,4 +29,13 @@ void Supla::ChannelElement::addAction(int action, ActionHandler *client, int eve
   addAction(action, *client, event);
 }
 
+void Supla::ChannelElement::addAction(int action, ActionHandler &client, Supla::Condition *condition) {
+  condition->setClient(client);
+  condition->setSource(this);
+  channel.addAction(action, condition, Supla::ON_CHANGE);
+}
+
+void Supla::ChannelElement::addAction(int action, ActionHandler *client, Supla::Condition *condition) {
+  addAction(action, *client, condition);
+}
 
diff --git a/lib/SuplaDevice/src/supla/channel_element.h b/lib/SuplaDevice/src/supla/channel_element.h
index 372a72f0..ae4b0256 100644
--- a/lib/SuplaDevice/src/supla/channel_element.h
+++ b/lib/SuplaDevice/src/supla/channel_element.h
@@ -21,9 +21,12 @@
 #include "channel.h"
 #include "local_action.h"
 #include "action_handler.h"
+#include "condition.h"
 
 namespace Supla {
 
+class Condition;
+
 class ChannelElement : public Element, public LocalAction {
   public:
   
@@ -33,6 +36,9 @@ class ChannelElement : public Element, public LocalAction {
   void addAction(int action, ActionHandler &client, int event);
   void addAction(int action, ActionHandler *client, int event);
 
+  virtual void addAction(int action, ActionHandler &client, Supla::Condition *condition);
+  virtual void addAction(int action, ActionHandler *client, Supla::Condition *condition);
+
   protected:
     Channel channel;
 };
diff --git a/lib/SuplaDevice/src/supla/condition.cpp b/lib/SuplaDevice/src/supla/condition.cpp
new file mode 100644
index 00000000..b7a04e5a
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/condition.cpp
@@ -0,0 +1,92 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "condition.h"
+#include "events.h"
+
+Supla::Condition::Condition(double threshold, bool useAlternativeMeasurement)
+    : threshold(threshold),
+      useAlternativeMeasurement(useAlternativeMeasurement),
+      alreadyFired(false) {
+}
+
+Supla::Condition::~Condition() {
+}
+
+void Supla::Condition::handleAction(int event, int action) {
+  if (event == Supla::ON_CHANGE ||
+      event == Supla::ON_SECONDARY_CHANNEL_CHANGE) {
+    int channelType = source->getChannel()->getChannelType();
+    double value = 0;
+    switch (channelType) {
+      case SUPLA_CHANNELTYPE_DISTANCESENSOR:
+      case SUPLA_CHANNELTYPE_THERMOMETER:
+      case SUPLA_CHANNELTYPE_WINDSENSOR:
+      case SUPLA_CHANNELTYPE_PRESSURESENSOR:
+      case SUPLA_CHANNELTYPE_RAINSENSOR:
+      case SUPLA_CHANNELTYPE_WEIGHTSENSOR:
+        value = source->getChannel()->getValueDouble();
+        break;
+      case SUPLA_CHANNELTYPE_IMPULSE_COUNTER:
+        value = source->getChannel()->getValueInt64();
+        break;
+      case SUPLA_CHANNELTYPE_HUMIDITYANDTEMPSENSOR:
+        value = useAlternativeMeasurement
+                    ? source->getChannel()->getValueDoubleSecond()
+                    : source->getChannel()->getValueDoubleFirst();
+        break;
+      default:
+        return;
+    }
+    if (checkConditionFor(value)) {
+      client->handleAction(event, action);
+    }
+  }
+}
+
+// Condition objects will be deleted during ActionHandlerClient list cleanup
+bool Supla::Condition::deleteClient() {
+  return true;
+}
+
+bool Supla::Condition::checkConditionFor(double val) {
+  if (!alreadyFired && condition(val)) {
+    alreadyFired = true;
+    return true;
+  }
+  if (alreadyFired) {
+    if (!condition(val)) {
+      alreadyFired = false;
+    }
+  }
+  return false;
+}
+
+void Supla::Condition::setSource(Supla::ChannelElement *src) {
+  source = src;
+}
+
+void Supla::Condition::setClient(Supla::ActionHandler *clientPtr) {
+  client = clientPtr;
+}
+
+void Supla::Condition::setSource(Supla::ChannelElement &src) {
+  setSource(&src);
+}
+
+void Supla::Condition::setClient(Supla::ActionHandler &clientPtr) {
+  setClient(&clientPtr);
+}
diff --git a/lib/SuplaDevice/src/supla/condition.h b/lib/SuplaDevice/src/supla/condition.h
new file mode 100644
index 00000000..d5d31f90
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/condition.h
@@ -0,0 +1,62 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _condition_h
+#define _condition_h
+
+#include "action_handler.h"
+#include "channel_element.h"
+
+
+namespace Supla {
+
+class ChannelElement;
+ 
+class Condition : public ActionHandler {
+ public:
+  Condition(double threshold, bool useAlternativeMeasurement);
+  virtual ~Condition();
+  void setSource(ChannelElement *src);
+  void setClient(ActionHandler *clientPtr);
+  void setSource(ChannelElement &src);
+  void setClient(ActionHandler &clientPtr);
+
+  void handleAction(int event, int action);
+  bool deleteClient();
+  virtual bool checkConditionFor(double val);
+
+ protected:
+  virtual bool condition(double val) = 0;
+
+  double threshold;
+  bool alreadyFired;
+  bool useAlternativeMeasurement;
+  Supla::ChannelElement *source;
+  Supla::ActionHandler *client;
+
+};
+
+};
+
+Supla::Condition *OnLess(double threshold, bool useAlternativeMeasurement = false);
+Supla::Condition *OnLessEq(double threshold, bool useAlternativeMeasurement = false);
+Supla::Condition *OnGreater(double threshold, bool useAlternativeMeasurement = false);
+Supla::Condition *OnGreaterEq(double threshold, bool useAlternativeMeasurement = false);
+Supla::Condition *OnBetween(double threshold1, double threshold2, bool useAlternativeMeasurement = false);
+Supla::Condition *OnBetweenEq(double threshold1, double threshold2, bool useAlternativeMeasurement = false);
+Supla::Condition *OnEqual(double threshold, bool useAlternativeMeasurement = false);
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/conditions/on_between.cpp b/lib/SuplaDevice/src/supla/conditions/on_between.cpp
new file mode 100644
index 00000000..9a1ef83e
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/conditions/on_between.cpp
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "../condition.h"
+
+class OnBetweenCond : public Supla::Condition {
+ public:
+  OnBetweenCond(double threshold1, double threshold2, bool useAlternativeMeasurement)
+      : Supla::Condition(threshold1, useAlternativeMeasurement), threshold2(threshold2) {
+  }
+
+  bool condition(double val) {
+    return val > threshold && val < threshold2;
+  }
+
+  double threshold2;
+};
+
+
+Supla::Condition *OnBetween(double threshold1, double threshold2, bool useAlternativeMeasurement) {
+  return new OnBetweenCond(threshold1, threshold2, useAlternativeMeasurement);
+}
+
+
+
diff --git a/lib/SuplaDevice/src/supla/conditions/on_between_eq.cpp b/lib/SuplaDevice/src/supla/conditions/on_between_eq.cpp
new file mode 100644
index 00000000..8e535db1
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/conditions/on_between_eq.cpp
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "../condition.h"
+
+class OnBetweenEqCond : public Supla::Condition {
+ public:
+  OnBetweenEqCond(double threshold1, double threshold2, bool useAlternativeMeasurement)
+      : Supla::Condition(threshold1, useAlternativeMeasurement), threshold2(threshold2) {
+  }
+
+  bool condition(double val) {
+    return val >= threshold && val <= threshold2;
+  }
+
+  double threshold2;
+};
+
+
+Supla::Condition *OnBetweenEq(double threshold1, double threshold2, bool useAlternativeMeasurement) {
+  return new OnBetweenEqCond(threshold1, threshold2, useAlternativeMeasurement);
+}
+
+
+
+
diff --git a/lib/SuplaDevice/src/supla/conditions/on_equal.cpp b/lib/SuplaDevice/src/supla/conditions/on_equal.cpp
new file mode 100644
index 00000000..1d7e6d25
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/conditions/on_equal.cpp
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "../condition.h"
+
+class OnEqualCond : public Supla::Condition {
+ public:
+  OnEqualCond(double threshold, bool useAlternativeMeasurement)
+      : Supla::Condition(threshold, useAlternativeMeasurement) {
+  }
+
+  bool condition(double val) {
+    return val == threshold;
+  }
+};
+
+
+Supla::Condition *OnEqual(double threshold, bool useAlternativeMeasurement) {
+  return new OnEqualCond(threshold, useAlternativeMeasurement);
+}
+
+
+
diff --git a/lib/SuplaDevice/src/supla/conditions/on_greater.cpp b/lib/SuplaDevice/src/supla/conditions/on_greater.cpp
new file mode 100644
index 00000000..675a667f
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/conditions/on_greater.cpp
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "../condition.h"
+
+class OnGreaterCond : public Supla::Condition {
+ public:
+  OnGreaterCond(double threshold, bool useAlternativeMeasurement)
+      : Supla::Condition(threshold, useAlternativeMeasurement) {
+  }
+
+  bool condition(double val) {
+    return val > threshold;
+  }
+};
+
+
+Supla::Condition *OnGreater(double threshold, bool useAlternativeMeasurement) {
+  return new OnGreaterCond(threshold, useAlternativeMeasurement);
+}
+
+
+
diff --git a/lib/SuplaDevice/src/supla/conditions/on_greater_eq.cpp b/lib/SuplaDevice/src/supla/conditions/on_greater_eq.cpp
new file mode 100644
index 00000000..37aaf920
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/conditions/on_greater_eq.cpp
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "../condition.h"
+
+class OnGreaterEqCond : public Supla::Condition {
+ public:
+  OnGreaterEqCond(double threshold, bool useAlternativeMeasurement)
+      : Supla::Condition(threshold, useAlternativeMeasurement) {
+  }
+
+  bool condition(double val) {
+    return val >= threshold;
+  }
+};
+
+
+Supla::Condition *OnGreaterEq(double threshold, bool useAlternativeMeasurement) {
+  return new OnGreaterEqCond(threshold, useAlternativeMeasurement);
+}
+
+
+
diff --git a/lib/SuplaDevice/src/supla/conditions/on_less.cpp b/lib/SuplaDevice/src/supla/conditions/on_less.cpp
new file mode 100644
index 00000000..37541f52
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/conditions/on_less.cpp
@@ -0,0 +1,34 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "../condition.h"
+
+class OnLessCond : public Supla::Condition {
+ public:
+  OnLessCond(double threshold, bool useAlternativeMeasurement)
+      : Supla::Condition(threshold, useAlternativeMeasurement) {
+  }
+
+  bool condition(double val) {
+    return val < threshold;
+  }
+};
+
+
+Supla::Condition *OnLess(double threshold, bool useAlternativeMeasurement) {
+  return new OnLessCond(threshold, useAlternativeMeasurement);
+}
+
diff --git a/lib/SuplaDevice/src/supla/conditions/on_less_eq.cpp b/lib/SuplaDevice/src/supla/conditions/on_less_eq.cpp
new file mode 100644
index 00000000..359e8058
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/conditions/on_less_eq.cpp
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "../condition.h"
+
+class OnLessEqCond : public Supla::Condition {
+ public:
+  OnLessEqCond(double threshold, bool useAlternativeMeasurement)
+      : Supla::Condition(threshold, useAlternativeMeasurement) {
+  }
+
+  bool condition(double val) {
+    return val <= threshold;
+  }
+};
+
+
+Supla::Condition *OnLessEq(double threshold, bool useAlternativeMeasurement) {
+  return new OnLessEqCond(threshold, useAlternativeMeasurement);
+}
+
+
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_base.cpp b/lib/SuplaDevice/src/supla/control/dimmer_base.cpp
new file mode 100644
index 00000000..5c01e57b
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/dimmer_base.cpp
@@ -0,0 +1,44 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "dimmer_base.h"
+#include "../storage/storage.h"
+
+Supla::Control::DimmerBase::DimmerBase() {
+  channel.setType(SUPLA_CHANNELTYPE_DIMMER);
+  channel.setDefault(SUPLA_CHANNELFNC_DIMMER);
+}
+
+void Supla::Control::DimmerBase::setRGBW(int red,
+                                         int green,
+                                         int blue,
+                                         int colorBrightness,
+                                         int brightness,
+                                         bool toggle) {
+  Supla::Control::RGBWBase::setRGBW(0, 0, 0, 0, brightness, toggle);
+}
+
+void Supla::Control::DimmerBase::onLoadState() {
+  Supla::Storage::ReadState((unsigned char *)&curBrightness,
+                             sizeof(curBrightness));
+  Supla::Storage::ReadState((unsigned char *)&lastBrightness, sizeof(lastBrightness));
+}
+
+void Supla::Control::DimmerBase::onSaveState() {
+  Supla::Storage::WriteState((unsigned char *)&curBrightness,
+                             sizeof(curBrightness));
+  Supla::Storage::WriteState((unsigned char *)&lastBrightness, sizeof(lastBrightness));
+}
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_base.h b/lib/SuplaDevice/src/supla/control/dimmer_base.h
index cd88b026..5f6f5814 100644
--- a/lib/SuplaDevice/src/supla/control/dimmer_base.h
+++ b/lib/SuplaDevice/src/supla/control/dimmer_base.h
@@ -24,11 +24,18 @@ namespace Supla {
 namespace Control {
 class DimmerBase : public RGBWBase {
  public:
-  DimmerBase() {
-    channel.setType(SUPLA_CHANNELTYPE_DIMMER);
-    channel.setDefault(SUPLA_CHANNELFNC_DIMMER);
-  }
-
+  DimmerBase();
+
+  void setRGBW(int red,
+               int green,
+               int blue,
+               int colorBrightness,
+               int brightness,
+               bool toggle);
+
+  void onLoadState();
+  void onSaveState();
+  
 };
 
 };  // namespace Control
diff --git a/lib/SuplaDevice/src/supla/control/pushover.h b/lib/SuplaDevice/src/supla/control/pushover.h
index 77634c91..c93a0d06 100644
--- a/lib/SuplaDevice/src/supla/control/pushover.h
+++ b/lib/SuplaDevice/src/supla/control/pushover.h
@@ -29,8 +29,13 @@
 #define MAX_TITLE_SIZE   32
 #define MAX_MESSAGE_SIZE 64
 
+namespace Supla {
+enum Pushover { SEND_NOTIF_1 };
+}  // namespace Supla
+
 namespace Supla {
 namespace Control {
+
 class Pushover : public Element, public ActionHandler {
  public:
   Pushover(const char *token = nullptr,
diff --git a/lib/SuplaDevice/src/supla/control/rgb_base.h b/lib/SuplaDevice/src/supla/control/rgb_base.h
index 7bcc3936..75afb29e 100644
--- a/lib/SuplaDevice/src/supla/control/rgb_base.h
+++ b/lib/SuplaDevice/src/supla/control/rgb_base.h
@@ -28,6 +28,15 @@ class RGBBase : public RGBWBase {
     channel.setDefault(SUPLA_CHANNELFNC_RGBLIGHTING);
   }
 
+  void setRGBW(int red,
+               int green,
+               int blue,
+               int colorBrightness,
+               int brightness,
+               bool toggle) {
+    RGBWBase::setRGBW(red, green, blue, colorBrightness, 0, toggle);
+  }
+
 };
 
 };  // namespace Control
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
index e43cb80a..4f2845ff 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
@@ -17,8 +17,13 @@
 #include <Arduino.h>
 #include <stdint.h>
 
+#include "../storage/storage.h"
 #include "rgbw_base.h"
 
+#define RGBW_STATE_ON_INIT_RESTORE -1
+#define RGBW_STATE_ON_INIT_OFF 0
+#define RGBW_STATE_ON_INIT_ON 1
+
 namespace Supla {
 namespace Control {
 
@@ -36,23 +41,38 @@ RGBWBase::RGBWBase()
       iterationDelayCounter(0),
       fadeEffect(1000),
       hwRed(0),
-      hwGreen(255),
+      hwGreen(0),
       hwBlue(0),
       hwColorBrightness(0),
       hwBrightness(0),
-      lastTick(0) {
+      lastTick(0),
+      lastMsgReceivedMs(0),
+      stateOnInit(RGBW_STATE_ON_INIT_OFF) {
   channel.setType(SUPLA_CHANNELTYPE_DIMMERANDRGBLED);
   channel.setDefault(SUPLA_CHANNELFNC_DIMMERANDRGBLIGHTING);
 }
 
+void RGBWBase::setRGBW(int red,
+                       int green,
+                       int blue,
+                       int colorBrightness,
+                       int brightness,
+                       bool toggle = false) {
+  if (toggle) {
+    lastMsgReceivedMs = 1;
+  } else {
+    lastMsgReceivedMs = millis();
+  }
 
-void RGBWBase::setRGBW(
-    int red, int green, int blue, int colorBrightness, int brightness) {
   // Store last non 0 brightness for turn on/toggle operations
-  if (colorBrightness > 0) {
+  if (toggle && colorBrightness == 100 && curColorBrightness == 0) {
+    colorBrightness = lastColorBrightness;
+  } else if (colorBrightness > 0) {
     lastColorBrightness = colorBrightness;
   }
-  if (brightness > 0) {
+  if (toggle && brightness == 100 && curBrightness == 0) {
+    brightness = lastBrightness;
+  } else if (brightness > 0) {
     lastBrightness = brightness;
   }
 
@@ -79,19 +99,28 @@ void RGBWBase::setRGBW(
         curRed, curGreen, curBlue, curColorBrightness, curBrightness);
   }
 
-  // Send to Supla server new values
-  channel.setNewValue(
-      curRed, curGreen, curBlue, curColorBrightness, curBrightness);
+  // Schedule save in 5 s after state change
+  Supla::Storage::ScheduleSave(5000);
+}
+
+void RGBWBase::iterateAlways() {
+  if (lastMsgReceivedMs != 0 && millis() - lastMsgReceivedMs > 400) {
+    lastMsgReceivedMs = 0;
+    // Send to Supla server new values
+    channel.setNewValue(
+        curRed, curGreen, curBlue, curColorBrightness, curBrightness);
+  }
 }
 
 int RGBWBase::handleNewValueFromServer(TSD_SuplaChannelNewValue *newValue) {
+  uint8_t toggle = static_cast<uint8_t>(newValue->value[5]);
   uint8_t red = static_cast<uint8_t>(newValue->value[4]);
   uint8_t green = static_cast<uint8_t>(newValue->value[3]);
   uint8_t blue = static_cast<uint8_t>(newValue->value[2]);
   uint8_t colorBrightness = static_cast<uint8_t>(newValue->value[1]);
   uint8_t brightness = static_cast<uint8_t>(newValue->value[0]);
 
-  setRGBW(red, green, blue, colorBrightness, brightness);
+  setRGBW(red, green, blue, colorBrightness, brightness, toggle == 1);
 
   return -1;
 }
@@ -302,10 +331,10 @@ void RGBWBase::iterateDimmerRGBW(int rgbStep, int wStep) {
   }
 
   setRGBW(-1,
-      -1,
-      -1,
-      addWithLimit(curColorBrightness, rgbStep, 100),
-      addWithLimit(curBrightness, wStep, 100));
+          -1,
+          -1,
+          addWithLimit(curColorBrightness, rgbStep, 100),
+          addWithLimit(curBrightness, wStep, 100));
 }
 
 void RGBWBase::setStep(int step) {
@@ -415,10 +444,74 @@ void RGBWBase::onTimer() {
     }
 
     if (valueChanged) {
-      setRGBWValueOnDevice(hwRed, hwGreen, hwBlue, hwColorBrightness, hwBrightness);
+      setRGBWValueOnDevice(
+          hwRed, hwGreen, hwBlue, hwColorBrightness, hwBrightness);
     }
   }
 }
 
+void RGBWBase::onInit() {
+  if (stateOnInit == RGBW_STATE_ON_INIT_ON) {
+    curColorBrightness = 100;
+    curBrightness = 100;
+  } else if (stateOnInit == RGBW_STATE_ON_INIT_OFF) {
+    curColorBrightness = 0;
+    curBrightness = 0;
+  }
+
+  setRGBW(curRed, curGreen, curBlue, curColorBrightness, curBrightness);
+}
+
+void RGBWBase::onSaveState() {
+  /*
+  uint8_t curRed;                   // 0 - 255
+  uint8_t curGreen;                 // 0 - 255
+  uint8_t curBlue;                  // 0 - 255
+  uint8_t curColorBrightness;       // 0 - 100
+  uint8_t curBrightness;            // 0 - 100
+  uint8_t lastColorBrightness;      // 0 - 100
+  uint8_t lastBrightness;           // 0 - 100
+  */
+  Supla::Storage::WriteState((unsigned char *)&curRed, sizeof(curRed));
+  Supla::Storage::WriteState((unsigned char *)&curGreen, sizeof(curGreen));
+  Supla::Storage::WriteState((unsigned char *)&curBlue, sizeof(curBlue));
+  Supla::Storage::WriteState((unsigned char *)&curColorBrightness,
+                             sizeof(curColorBrightness));
+  Supla::Storage::WriteState((unsigned char *)&curBrightness,
+                             sizeof(curBrightness));
+  Supla::Storage::WriteState((unsigned char *)&lastColorBrightness,
+                             sizeof(lastColorBrightness));
+  Supla::Storage::WriteState((unsigned char *)&lastBrightness, sizeof(lastBrightness));
+}
+
+void RGBWBase::onLoadState() {
+  Supla::Storage::ReadState((unsigned char *)&curRed, sizeof(curRed));
+  Supla::Storage::ReadState((unsigned char *)&curGreen, sizeof(curGreen));
+  Supla::Storage::ReadState((unsigned char *)&curBlue, sizeof(curBlue));
+  Supla::Storage::ReadState((unsigned char *)&curColorBrightness,
+                             sizeof(curColorBrightness));
+  Supla::Storage::ReadState((unsigned char *)&curBrightness,
+                             sizeof(curBrightness));
+  Supla::Storage::ReadState((unsigned char *)&lastColorBrightness,
+                             sizeof(lastColorBrightness));
+  Supla::Storage::ReadState((unsigned char *)&lastBrightness, sizeof(lastBrightness));
+
+}
+
+RGBWBase &RGBWBase::setDefaultStateOn() {
+  stateOnInit = RGBW_STATE_ON_INIT_ON;
+  return *this;
+}
+
+RGBWBase &RGBWBase::setDefaultStateOff() {
+  stateOnInit = RGBW_STATE_ON_INIT_OFF;
+  return *this;
+}
+
+RGBWBase &RGBWBase::setDefaultStateRestore() {
+  stateOnInit = RGBW_STATE_ON_INIT_RESTORE;
+  return *this;
+}
+
 };  // namespace Control
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.h b/lib/SuplaDevice/src/supla/control/rgbw_base.h
index 58b9d487..5ab19fd7 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.h
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.h
@@ -20,9 +20,9 @@
 #include <Arduino.h>
 #include <stdint.h>
 
+#include "../action_handler.h"
 #include "../actions.h"
 #include "../channel_element.h"
-#include "../action_handler.h"
 
 namespace Supla {
 namespace Control {
@@ -36,8 +36,12 @@ class RGBWBase : public ChannelElement, public ActionHandler {
                                     uint8_t colorBrightness,
                                     uint8_t brightness) = 0;
 
-  virtual void setRGBW(
-      int red, int green, int blue, int colorBrightness, int brightness);
+  virtual void setRGBW(int red,
+                       int green,
+                       int blue,
+                       int colorBrightness,
+                       int brightness,
+                       bool toggle);
 
   int handleNewValueFromServer(TSD_SuplaChannelNewValue *newValue);
   virtual void turnOn();
@@ -48,12 +52,15 @@ class RGBWBase : public ChannelElement, public ActionHandler {
   void setDefaultDimmedBrightness(int dimmedBrightness);
   void setFadeEffectTime(int timeMs);
   void onTimer();
+  void iterateAlways();
+
+  void onInit();
+  void onLoadState();
+  void onSaveState();
 
-  void onInit() {
-    // Send to Supla server new values
-    channel.setNewValue(
-        curRed, curGreen, curBlue, curColorBrightness, curBrightness);
-  }
+  virtual RGBWBase &setDefaultStateOn();
+  virtual RGBWBase &setDefaultStateOff();
+  virtual RGBWBase &setDefaultStateRestore();
 
  protected:
   uint8_t addWithLimit(int value, int addition, int limit = 255);
@@ -77,6 +84,8 @@ class RGBWBase : public ChannelElement, public ActionHandler {
   int hwColorBrightness;  // 0 - 100
   int hwBrightness;       // 0 - 100
   unsigned long lastTick;
+  unsigned long lastMsgReceivedMs;
+  int8_t stateOnInit;
 };
 
 };  // namespace Control
diff --git a/lib/SuplaDevice/src/supla/events.h b/lib/SuplaDevice/src/supla/events.h
index 7bda4e79..a65b0a4c 100644
--- a/lib/SuplaDevice/src/supla/events.h
+++ b/lib/SuplaDevice/src/supla/events.h
@@ -39,7 +39,8 @@ enum Event {
   ON_SEQUENCE_MATCH,        // triggered by SequenceButton 
   ON_SEQUENCE_DOESNT_MATCH,  // triggered by SequenceButton
   ON_TURN_ON,
-  ON_TURN_OFF
+  ON_TURN_OFF,
+  ON_SECONDARY_CHANNEL_CHANGE
 };
 
 };
diff --git a/lib/SuplaDevice/src/supla/local_action.cpp b/lib/SuplaDevice/src/supla/local_action.cpp
index c7c70076..478c4bd9 100644
--- a/lib/SuplaDevice/src/supla/local_action.cpp
+++ b/lib/SuplaDevice/src/supla/local_action.cpp
@@ -69,6 +69,9 @@ LocalAction::~LocalAction() {
     if (ptr->trigger == this) {
       auto tbdptr = ptr;
       ptr = ptr->next;
+      if (tbdptr->client->deleteClient()) {
+        delete tbdptr->client;
+      }
       delete tbdptr;
     } else {
       ptr = ptr->next;
@@ -98,4 +101,8 @@ void LocalAction::runAction(int event) {
   }
 }
 
+ActionHandlerClient *LocalAction::getClientListPtr() {
+  return ActionHandlerClient::begin;
+}
+
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/local_action.h b/lib/SuplaDevice/src/supla/local_action.h
index 1d5ff129..33a91adf 100644
--- a/lib/SuplaDevice/src/supla/local_action.h
+++ b/lib/SuplaDevice/src/supla/local_action.h
@@ -22,6 +22,8 @@
 
 namespace Supla {
 
+class ActionHandlerClient;
+
 class LocalAction {
  public:
   virtual ~LocalAction();
@@ -30,6 +32,7 @@ class LocalAction {
 
   virtual void runAction(int event);
 
+  static ActionHandlerClient *getClientListPtr();
 };
 
 };  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/sensor/DS18B20.h b/lib/SuplaDevice/src/supla/sensor/DS18B20.h
index 7b27d211..8e0b1e58 100644
--- a/lib/SuplaDevice/src/supla/sensor/DS18B20.h
+++ b/lib/SuplaDevice/src/supla/sensor/DS18B20.h
@@ -182,6 +182,11 @@ class DS18B20 : public Thermometer {
     channel.setNewValue(getValue());
   }
 
+
+  DallasTemperature &getHwSensors() {
+    return myBus->sensors;
+  }
+
  protected:
   static OneWireBus *oneWireBus;
   OneWireBus *myBus;
diff --git a/lib/SuplaDevice/src/supla/sensor/HC_SR04.h b/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
index 780aad11..ecd9ea1f 100644
--- a/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
+++ b/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
@@ -59,14 +59,14 @@ class HC_SR04 : public Distance {
       failCount++;
     }
 
-    long distance = (duration / 2) / 29.1;
+    long distance = (duration / 2.0) / 29.1;
     long value = map(distance, _minIn, _maxIn, _minOut, _maxOut);
     if (_minOut < _maxOut) {
       value = constrain(value, _minOut, _maxOut);
     } else {
       value = constrain(value, _maxOut, _minOut);
     }
-    return failCount <= 3 ? (float)value / 100 : DISTANCE_NOT_AVAILABLE;
+    return failCount <= 3 ? (float)value / 100.0 : DISTANCE_NOT_AVAILABLE;
   }
 
   void setMinMaxIn(int16_t minIn, int16_t maxIn) {
diff --git a/lib/SuplaDevice/src/supla/sensor/distance.h b/lib/SuplaDevice/src/supla/sensor/distance.h
index 29488800..ae13d184 100644
--- a/lib/SuplaDevice/src/supla/sensor/distance.h
+++ b/lib/SuplaDevice/src/supla/sensor/distance.h
@@ -36,7 +36,7 @@ class Distance : public ChannelElement {
   }
 
   void iterateAlways() {
-    if (lastReadTime + 500 < millis()) {
+    if (lastReadTime + 100 < millis()) {
       lastReadTime = millis();
       channel.setNewValue(getValue());
     }
diff --git a/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp
index 409fc14c..4e93b638 100644
--- a/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.cpp
@@ -14,6 +14,8 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#include <supla/events.h>
+
 #include "therm_hygro_press_meter.h"
 
 Supla::Sensor::ThermHygroPressMeter::ThermHygroPressMeter() {
@@ -55,3 +57,23 @@ Supla::Element &Supla::Sensor::ThermHygroPressMeter::disableChannelState() {
 Supla::Channel *Supla::Sensor::ThermHygroPressMeter::getSecondaryChannel() {
   return &pressureChannel;
 }
+
+void Supla::Sensor::ThermHygroPressMeter::addAction(int action,
+                                            ActionHandler &client,
+                                            int event) {
+  // delegate secondary channel event registration to secondary channel
+  switch (event) {
+    case Supla::ON_SECONDARY_CHANNEL_CHANGE: {
+      getSecondaryChannel()->addAction(action, client, event);
+      return;
+    }
+  }
+  // delegate all other events to primary channel
+  channel.addAction(action, client, event);
+}
+
+void Supla::Sensor::ThermHygroPressMeter::addAction(int action,
+                                            ActionHandler *client,
+                                            int event) {
+  addAction(action, *client, event);
+}
diff --git a/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h
index 77d1156a..a75fcbd7 100644
--- a/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h
+++ b/lib/SuplaDevice/src/supla/sensor/therm_hygro_press_meter.h
@@ -32,6 +32,11 @@ class ThermHygroPressMeter : public ThermHygroMeter {
   Element &disableChannelState();
   Channel *getSecondaryChannel();
 
+  // Override local action methods in order to delegate execution to Channel and
+  // Secondary Channel
+  void addAction(int action, ActionHandler &client, int event);
+  void addAction(int action, ActionHandler *client, int event);
+
  protected:
   Channel pressureChannel;
 };

From 90d0e99062513f4f67ba0020da8f4ffb5cbd5b27 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 8 Feb 2021 10:20:15 +0100
Subject: [PATCH 057/165] warunkowanie

---
 platformio.ini              |   2 +-
 src/GUI-Generic.ino         |  91 +++++++++++++++---------
 src/GUI-Generic_Config.h    |   2 +-
 src/Markup.cpp              |   4 +-
 src/SuplaCommonPROGMEM.h    |  60 +++++++++++++++-
 src/SuplaConfigESP.cpp      |  13 ++--
 src/SuplaConfigManager.cpp  |   7 +-
 src/SuplaConfigManager.h    |   4 ++
 src/SuplaDeviceGUI.cpp      | 134 ++++++++++++++++++++++++------------
 src/SuplaDeviceGUI.h        |  12 +---
 src/SuplaOled.cpp           |   2 +-
 src/SuplaTemplateBoard.cpp  |   1 +
 src/SuplaWebPageControl.cpp |  14 ++--
 src/SuplaWebPageRelay.cpp   |  59 ++++++++++++----
 src/SuplaWebPageRelay.h     |  14 +++-
 src/SuplaWebPageSensor.cpp  |  28 ++++----
 src/SuplaWebPageSensor.h    |  60 ++++++++--------
 17 files changed, 345 insertions(+), 162 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 16bbe533..8b4eec9c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.0"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.2"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 09c3b128..7708704a 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -83,7 +83,12 @@ void setup() {
 #ifdef SUPLA_DHT11
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT11)->getValueInt(); nr++) {
     if (ConfigESP->getGpio(nr, FUNCTION_DHT11) != OFF_GPIO) {
-      new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT11), DHT11);
+      auto dht11 = new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT11), DHT11);
+
+      if (nr == 1) {
+        Supla::GUI::addConditionsTurnON(SENSOR_DHT11, dht11);
+        Supla::GUI::addConditionsTurnOFF(SENSOR_DHT11, dht11);
+      }
     }
   }
 #endif
@@ -91,26 +96,37 @@ void setup() {
 #ifdef SUPLA_DHT22
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
     if (ConfigESP->getGpio(nr, FUNCTION_DHT22) != OFF_GPIO) {
-      new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT22), DHT22);
+      auto dht22 = new Supla::Sensor::DHT(ConfigESP->getGpio(nr, FUNCTION_DHT22), DHT22);
+
+      if (nr == 1) {
+        Supla::GUI::addConditionsTurnON(SENSOR_DHT22, dht22);
+        Supla::GUI::addConditionsTurnOFF(SENSOR_DHT22, dht22);
+      }
     }
   }
 #endif
 
 #ifdef SUPLA_SI7021_SONOFF
   if (ConfigESP->getGpio(FUNCTION_SI7021_SONOFF) != OFF_GPIO) {
-    new Supla::Sensor::Si7021Sonoff(ConfigESP->getGpio(FUNCTION_SI7021_SONOFF));
+    auto si7021sonoff = new Supla::Sensor::Si7021Sonoff(ConfigESP->getGpio(FUNCTION_SI7021_SONOFF));
+    Supla::GUI::addConditionsTurnON(SENSOR_SI7021_SONOFF, si7021sonoff);
+    Supla::GUI::addConditionsTurnOFF(SENSOR_SI7021_SONOFF, si7021sonoff);
   }
 #endif
 
 #ifdef SUPLA_HC_SR04
   if (ConfigESP->getGpio(FUNCTION_TRIG) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_ECHO) != OFF_GPIO) {
-    new Supla::Sensor::HC_SR04(ConfigESP->getGpio(FUNCTION_TRIG), ConfigESP->getGpio(FUNCTION_ECHO));
+    auto hcsr04 = new Supla::Sensor::HC_SR04(ConfigESP->getGpio(FUNCTION_TRIG), ConfigESP->getGpio(FUNCTION_ECHO));
+    Supla::GUI::addConditionsTurnON(SENSOR_HC_SR04, hcsr04);
+    Supla::GUI::addConditionsTurnOFF(SENSOR_HC_SR04, hcsr04);
   }
 #endif
 
 #ifdef SUPLA_MAX6675
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
-    new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
+    auto max6675 = new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
+    Supla::GUI::addConditionsTurnON(SENSOR_MAX6675, max6675);
+    Supla::GUI::addConditionsTurnOFF(SENSOR_MAX6675, max6675);
   }
 #endif
 
@@ -139,43 +155,56 @@ void setup() {
     Wire.begin(ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL));
 
 #ifdef SUPLA_BME280
-    switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt()) {
-      case BME280_ADDRESS_0X76:
-        new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
-        break;
-      case BME280_ADDRESS_0X77:
-        new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
-        break;
-      case BME280_ADDRESS_0X76_AND_0X77:
-        new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
-        new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
-        break;
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_BME280).toInt()) {
+      Supla::Sensor::BME280 *bme280;
+      switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_BME280).toInt()) {
+        case BME280_ADDRESS_0X76:
+          bme280 = new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+          break;
+        case BME280_ADDRESS_0X77:
+          bme280 = new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+          break;
+        case BME280_ADDRESS_0X76_AND_0X77:
+          bme280 = new Supla::Sensor::BME280(0x76, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+          new Supla::Sensor::BME280(0x77, ConfigManager->get(KEY_ALTITUDE_BME280)->getValueInt());
+          break;
+      }
+      Supla::GUI::addConditionsTurnON(SENSOR_BME280, bme280);
+      Supla::GUI::addConditionsTurnOFF(SENSOR_BME280, bme280);
     }
 #endif
 
 #ifdef SUPLA_SHT3x
-    switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SHT3x).toInt()) {
-      case SHT3x_ADDRESS_0X44:
-        new Supla::Sensor::SHT3x(0x44);
-        break;
-      case SHT3x_ADDRESS_0X45:
-        new Supla::Sensor::SHT3x(0x45);
-        break;
-      case SHT3x_ADDRESS_0X44_AND_0X45:
-        new Supla::Sensor::SHT3x(0x44);
-        new Supla::Sensor::SHT3x(0x45);
-        break;
+
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_SHT3x).toInt()) {
+      Supla::Sensor::SHT3x *sht3x;
+      switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_SHT3x).toInt()) {
+        case SHT3x_ADDRESS_0X44:
+          sht3x = new Supla::Sensor::SHT3x(0x44);
+          break;
+        case SHT3x_ADDRESS_0X45:
+          sht3x = new Supla::Sensor::SHT3x(0x45);
+          break;
+        case SHT3x_ADDRESS_0X44_AND_0X45:
+          sht3x = new Supla::Sensor::SHT3x(0x44);
+          new Supla::Sensor::SHT3x(0x45);
+          break;
+      }
+      Supla::GUI::addConditionsTurnON(SENSOR_SHT3x, sht3x);
+      Supla::GUI::addConditionsTurnOFF(SENSOR_SHT3x, sht3x);
     }
 #endif
 
 #ifdef SUPLA_SI7021
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SI7021).toInt()) {
-      new Supla::Sensor::Si7021();
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_SI7021).toInt()) {
+      auto si7021 = new Supla::Sensor::Si7021();
+      Supla::GUI::addConditionsTurnON(SENSOR_SI7021, si7021);
+      Supla::GUI::addConditionsTurnOFF(SENSOR_SI7021, si7021);
     }
 #endif
 
 #ifdef SUPLA_MCP23017
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       if (!mcp1.begin(0))
         Serial.println(F("MCP23017 1 not found!"));  // begin(uint8_t address)  "Pin 100 - 115"
       if (!mcp2.begin(1))
@@ -188,7 +217,7 @@ void setup() {
 #endif
 
 #ifdef SUPLA_OLED
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_OLED).toInt()) {
       SuplaOled *oled = new SuplaOled();
       oled->addButtonOled(ConfigESP->getGpio(FUNCTION_CFG_BUTTON));
     }
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 2dc1365c..eed3e7b0 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -51,7 +51,7 @@
 #define SUPLA_HC_SR04
 #define SUPLA_IMPULSE_COUNTER
 #define SUPLA_HLW8012
-#define SUPLA_RGBW
+//#define SUPLA_RGBW
 #define SUPLA_PUSHOVER
 
 #endif
diff --git a/src/Markup.cpp b/src/Markup.cpp
index c8b7be56..2088206c 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -122,7 +122,7 @@ void addNumberBox(String& html, const String& input_id, const String& name, cons
     html += F("' placeholder='");
     html += placeholder;
   }
-  html += F("' step='1' min='0' value='");
+  html += F("' step='0.01' value='");
   html += value;
   html += F("'");
 
@@ -227,7 +227,7 @@ void addListGPIOLinkBox(String& html, const String& input_id, const String& name
   }
   html += name;
   if (ConfigESP->getGpio(_nr, function) != OFF_GPIO) {
-    //html += PGMT(ICON_EDIT);
+    // html += PGMT(ICON_EDIT);
     html += F("</a>");
   }
   html += F("</label>");
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index e6b2c272..138b473d 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -50,16 +50,25 @@ const char HTTP_LOGO[] PROGMEM =
     "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}<br>Free Mem: {f}KB</span>\n";
+const char HTTP_SUMMARY[] PROGMEM =
+    "<h1>{h}</h1><span>LAST STATE: {s}<br>Firmware: SuplaDevice {v}<br>GUID: {g}<br>MAC: {m}<br>Free Mem: {f}KB</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_FAVICON[] PROGMEM = "<link rel='icon' href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAB3RJTUUH5AUUCCQbIwTFfgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAARnQU1BAACxjwv8YQUAAAAwUExURf7nNZuNIOvWMci2KWRbFJGEHnRpFy8rCdrGLSAdBgwLAod6G7inJkI8DVJLEKeYIg6cTsoAAAGUSURBVHjaY2CAAFUGNLCF4QAyl4mhmP8BB4LPcWtdAe+BEBiX9QD77Kzl24GKHCAC/OVZH5hkVyUCFQlCRJhnKjAwLVlVb8lQDOY/ZFrG8FDVQbVqbU8BWODc3BX8dbMMGJhfrUyAaOla+/dAP8jyncsbgJTKgVP/b+pOAUudegAkGMsrGZhE1EFyDGwLwNaucmZyl1TgKTdg4JvAwMBzn3txeKWrMwP7wQcMWiAtf2c9YDjUfYBJapsDw66bm4AiUesOnJty0/O9iwLDPI5EhhCD6/q3Chk4dgCleJYpAEOmfCkDB+sbsK1886YBRfgWMTBwbi896wR04YZuAyAH6OmzDCbr3RgYsj6A1HEBPXCfgWHONgaG6eUBII0LFTiA7jn+iIF/MbMTyEu3lphtAJtpvl4BTLPNWgVSySA+y28aWIDdyGtVBgNH5psshVawwHGGO+arLr7MYFoJjZr/zBPYj85a1sC4ulwAIsIdcJzh2qt1WReYBWBR48gxgd1ziQIi6hTYEsxR45pZwRU9+oWgNAB1F3c/H6bYqgAAAABJRU5ErkJggg==' type='image/x-png' />\n";
+const char HTTP_FAVICON[] PROGMEM =
+    "<link rel='icon' "
+    "href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAB3RJTUUH5AUUCCQbIwTFfgAAAAlwSFlzAAALEgAACxIB0t1+/"
+    "AAAAARnQU1BAACxjwv8YQUAAAAwUExURf7nNZuNIOvWMci2KWRbFJGEHnRpFy8rCdrGLSAdBgwLAod6G7inJkI8DVJLEKeYIg6cTsoAAAGUSURBVHjaY2CAAFUGNLCF4QAyl4mhmP8BB4LPc"
+    "WtdAe+BEBiX9QD77Kzl24GKHCAC/OVZH5hkVyUCFQlCRJhnKjAwLVlVb8lQDOY/ZFrG8FDVQbVqbU8BWODc3BX8dbMMGJhfrUyAaOla+/dAP8jyncsbgJTKgVP/"
+    "b+pOAUudegAkGMsrGZhE1EFyDGwLwNaucmZyl1TgKTdg4JvAwMBzn3txeKWrMwP7wQcMWiAtf2c9YDjUfYBJapsDw66bm4AiUesOnJty0/O9iwLDPI5EhhCD6/"
+    "q3Chk4dgCleJYpAEOmfCkDB+sbsK1886YBRfgWMTBwbi896wR04YZuAyAH6OmzDCbr3RgYsj6A1HEBPXCfgWHONgaG6eUBII0LFTiA7jn+iIF/"
+    "MbMTyEu3lphtAJtpvl4BTLPNWgVSySA+y28aWIDdyGtVBgNH5psshVawwHGGO+arLr7MYFoJjZr/"
+    "zBPYj85a1sC4ulwAIsIdcJzh2qt1WReYBWBR48gxgd1ziQIi6hTYEsxR45pZwRU9+oWgNAB1F3c/H6bYqgAAAABJRU5ErkJggg==' type='image/x-png' />\n";
 
 const char HTTP_RBT[] PROGMEM = "<form method='post' action='rbt'><button type='submit'>Restart</button></form>";
 
-/*const char ICON_EDIT[] PROGMEM = 
+/*const char ICON_EDIT[] PROGMEM =
       "<img "
       "src='data:image/"
       "png;base64,"
@@ -157,4 +166,49 @@ const char CONTROLL_MANUAL[] PROGMEM = "RĘCZNE";
 const char* const OLED_CONTROLL_P[] PROGMEM = {CONTROLL_NORMAL, CONTROLL_SLOW, CONTROLL_MANUAL};
 #endif
 
+enum conditioningType
+{
+  HEATING,
+  COOLING,
+  MOISTURIZING,
+  DRAINGE
+};
+
+/*const char CONDITIONING__HEATING[] PROGMEM = "Temperatura - ogrzewanie";
+const char CONDITIONING__COOLING[] PROGMEM = "Temperatura - chłodzenie";
+const char CONDITIONING__MOISTURIZING[] PROGMEM = "Wilgotność - nawilżanie";
+const char CONDITIONING__DRAINGE[] PROGMEM = "Wilgotność - osuszanie";*/
+const char CONDITIONING__HEATING[] PROGMEM = "ON < wartość kanału > OFF";
+const char CONDITIONING__COOLING[] PROGMEM = "ON > wartość kanału < OFF";
+const char CONDITIONING__MOISTURIZING[] PROGMEM = "ON < wartość kanału wilgotność > OFF";
+const char CONDITIONING__DRAINGE[] PROGMEM = "ON > wartość kanału wilgotność < OFF";
+const char* const CONDITIONS_TYPE_P[] PROGMEM = {CONDITIONING__HEATING, CONDITIONING__COOLING, CONDITIONING__MOISTURIZING, CONDITIONING__DRAINGE};
+
+enum sensorList
+{
+  SENSOR_DS18B20 = 1,
+  SENSOR_DHT11,
+  SENSOR_DHT22,
+  SENSOR_SI7021_SONOFF,
+  SENSOR_HC_SR04,
+  SENSOR_BME280,
+  SENSOR_SHT3x,
+  SENSOR_SI7021,
+  SENSOR_MAX6675,
+  COUNT_SENSOR_LIST
+};
+
+const char NAME_DS18B20[] PROGMEM = "DS18B20";
+const char NAME_DHT11[] PROGMEM = "DHT11";
+const char NAME_DHT22[] PROGMEM = "DHT22";
+const char NAME_SI7021_SONOFF[] PROGMEM = "SI7021 SONOFF";
+const char NAME_HC_SR04[] PROGMEM = "HC-SR04";
+const char NAME_BME280[] PROGMEM = "BME280";
+const char NAME_SHT3x[] PROGMEM = "SHT3x";
+const char NAME_SI7021[] PROGMEM = "SI7021";
+const char NAME_MAX6675[] PROGMEM = "MAX6675";
+
+const char* const SENSOR_LIST_P[] PROGMEM = {OFF,          NAME_DS18B20, NAME_DHT11, NAME_DHT22,  NAME_SI7021_SONOFF,
+                                             NAME_HC_SR04, NAME_BME280,  NAME_SHT3x, NAME_SI7021, NAME_MAX6675};
+
 #endif  // SuplaCommonPROGMEM_h
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 6722db57..9c15989d 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -252,7 +252,7 @@ int SuplaConfigESP::getGpio(int nr, int function) {
     // return OFF_GPIO;
     //"Pin 100 - 115"
     // Pin 116 - 131"
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function &&
@@ -287,7 +287,7 @@ int SuplaConfigESP::getLevel(int nr, int function) {
       }
     }
 
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
@@ -346,7 +346,7 @@ int SuplaConfigESP::getMemory(int nr, int function) {
       }
     }
 
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
@@ -388,7 +388,7 @@ int SuplaConfigESP::getAction(int nr, int function) {
       }
     }
 
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
@@ -702,6 +702,11 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
     ConfigManager->set(KEY_ADDR_DS18B20, "");
     ConfigManager->set(KEY_NAME_SENSOR, "");
 
+    ConfigManager->set(KEY_CONDITIONS_SENSOR_TYPE, "");
+    ConfigManager->set(KEY_CONDITIONS_TYPE, "");
+    ConfigManager->set(KEY_CONDITIONS_MIN, "");
+    ConfigManager->set(KEY_CONDITIONS_MAX, "");
+
     ConfigManager->save();
 
     if (!forceReset) {
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 6915ee2f..e78cf203 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -186,7 +186,12 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_PUSHOVER_TOKEN, "0", MAX_TOKEN_SIZE);
   this->addKey(KEY_PUSHOVER_USER, "0", MAX_USER_SIZE);
 
-      this->load();
+  this->addKey(KEY_CONDITIONS_SENSOR_TYPE, "", MAX_GPIO * 2);
+  this->addKey(KEY_CONDITIONS_TYPE, "", MAX_GPIO * 1);
+  this->addKey(KEY_CONDITIONS_MIN, "", MAX_GPIO * 4);
+  this->addKey(KEY_CONDITIONS_MAX, "", MAX_GPIO * 4);
+
+  this->load();
   //  switch (this->load()) {
   //    case E_CONFIG_OK:
   //      Serial.println(F("Config read"));
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 84d89bce..ca76176a 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -81,6 +81,10 @@ enum _key
   KEY_PUSHOVER,
   KEY_PUSHOVER_TOKEN,
   KEY_PUSHOVER_USER,
+  KEY_CONDITIONS_SENSOR_TYPE,
+  KEY_CONDITIONS_TYPE,
+  KEY_CONDITIONS_MIN,
+  KEY_CONDITIONS_MAX
 };
 
 //#define GPIO      "GPIO"
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 7d0177e6..b9d8fa6f 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -86,9 +86,9 @@ void addRelayButton(uint8_t nr) {
     // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
     if (pinButton != OFF_GPIO) {
-      button.push_back(new Supla::Control::Button(pinButton, true));
-      button[size]->addAction(ConfigESP->getAction(size + 1, FUNCTION_BUTTON), *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
-      button[size]->setSwNoiseFilterDelay(50);
+      auto button = new Supla::Control::Button(pinButton, true);
+      button->addAction(ConfigESP->getAction(size + 1, FUNCTION_BUTTON), *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
+      button->setSwNoiseFilterDelay(50);
     }
 
     if (pinLED != OFF_GPIO) {
@@ -98,14 +98,11 @@ void addRelayButton(uint8_t nr) {
 #if defined(SUPLA_PUSHOVER)
     if (ConfigManager->get(KEY_PUSHOVER)->getElement(size).toInt() && strcmp(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), "") != 0 &&
         strcmp(ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), "") != 0) {
-      pushover.push_back(
-          new Supla::Control::Pushover(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), true));
-
-      int sizePushover = pushover.size() - 1;
-      Serial.println(pushover.size());
-      pushover[sizePushover]->setTitle(ConfigManager->get(KEY_HOST_NAME)->getValue());
-      pushover[sizePushover]->setMessage(String("Przekaźnik " + String(size + 1) + " - ZAŁĄCZONY").c_str());
-      relay[size]->addAction(Supla::SEND_NOTIF_1, pushover[sizePushover], Supla::ON_TURN_ON);
+      auto pushover =
+          new Supla::Control::Pushover(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), true);
+      pushover->setTitle(ConfigManager->get(KEY_HOST_NAME)->getValue());
+      pushover->setMessage(String("Przekaźnik " + String(size + 1) + " - ZAŁĄCZONY").c_str());
+      relay[size]->addAction(Pushover::SEND_NOTIF_1, pushover, Supla::ON_TURN_ON);
     }
 #endif
   }
@@ -123,6 +120,9 @@ void addDS18B20MultiThermometer(int pinNumber) {
   else {
     sensorDS.push_back(new DS18B20(ConfigESP->getGpio(FUNCTION_DS18B20)));
   }
+
+  Supla::GUI::addConditionsTurnON(SENSOR_DS18B20, sensorDS[0]);
+  Supla::GUI::addConditionsTurnOFF(SENSOR_DS18B20, sensorDS[0]);
 }
 #endif
 
@@ -133,10 +133,6 @@ void addConfigESP(int pinNumberConfig, int pinLedConfig, int modeConfigButton, b
 #endif
 
 #ifdef SUPLA_ROLLERSHUTTER
-std::vector<Supla::Control::RollerShutter *> RollerShutterRelay;
-std::vector<Supla::Control::Button *> RollerShutterButtonOpen;
-std::vector<Supla::Control::Button *> RollerShutterButtonClose;
-
 void addRolleShutter(uint8_t nr) {
   int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinLedUP, pinLedDown;
   bool highIsOn, levelLed;
@@ -151,18 +147,17 @@ void addRolleShutter(uint8_t nr) {
   highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
   levelLed = ConfigManager->get(KEY_LEVEL_LED)->getValueInt();
 
-  RollerShutterRelay.push_back(new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn));
-  if (pinButtonUp != OFF_GPIO)
-    RollerShutterButtonOpen.push_back(new Supla::Control::Button(pinButtonUp, true, true));
-  if (pinButtonDown != OFF_GPIO)
-    RollerShutterButtonClose.push_back(new Supla::Control::Button(pinButtonDown, true, true));
-  int size = RollerShutterRelay.size() - 1;
+  auto RollerShutterRelay = new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn);
+
   if (pinButtonUp != OFF_GPIO && pinButtonDown != OFF_GPIO) {
-    RollerShutterButtonOpen[size]->addAction(Supla::OPEN_OR_STOP, *RollerShutterRelay[size], Supla::ON_PRESS);
-    RollerShutterButtonClose[size]->addAction(Supla::CLOSE_OR_STOP, *RollerShutterRelay[size], Supla::ON_PRESS);
+    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, true, true);
+    auto RollerShutterButtonClose = new Supla::Control::Button(pinButtonDown, true, true);
+    RollerShutterButtonOpen->addAction(Supla::OPEN_OR_STOP, RollerShutterRelay, Supla::ON_PRESS);
+    RollerShutterButtonClose->addAction(Supla::CLOSE_OR_STOP, RollerShutterRelay, Supla::ON_PRESS);
   }
   else if ((pinButtonUp == OFF_GPIO && pinButtonDown != OFF_GPIO) || (pinButtonUp != OFF_GPIO && pinButtonDown == OFF_GPIO)) {
-    RollerShutterButtonOpen[size]->addAction(Supla::STEP_BY_STEP, *RollerShutterRelay[size], Supla::ON_PRESS);
+    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, true, true);
+    RollerShutterButtonOpen->addAction(Supla::STEP_BY_STEP, RollerShutterRelay, Supla::ON_PRESS);
   }
   // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
@@ -188,18 +183,16 @@ void addRolleShutterMomentary(uint8_t nr) {
   highIsOn = ConfigESP->getLevel(nr, FUNCTION_RELAY);
   levelLed = ConfigManager->get(KEY_LEVEL_LED)->getValueInt();
 
-  RollerShutterRelay.push_back(new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn));
-  if (pinButtonUp != OFF_GPIO)
-    RollerShutterButtonOpen.push_back(new Supla::Control::Button(pinButtonUp, true, true));
-  if (pinButtonDown != OFF_GPIO)
-    RollerShutterButtonClose.push_back(new Supla::Control::Button(pinButtonDown, true, true));
-  int size = RollerShutterRelay.size() - 1;
+  auto RollerShutterRelay = new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn);
+
   if (pinButtonUp != OFF_GPIO && pinButtonDown != OFF_GPIO) {
-    RollerShutterButtonOpen[size]->addAction(Supla::OPEN, *RollerShutterRelay[size], Supla::ON_PRESS);
-    RollerShutterButtonOpen[size]->addAction(Supla::STOP, *RollerShutterRelay[size], Supla::ON_RELEASE);
+    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, true, true);
+    auto RollerShutterButtonClose = new Supla::Control::Button(pinButtonDown, true, true);
+    RollerShutterButtonOpen->addAction(Supla::OPEN, RollerShutterRelay, Supla::ON_PRESS);
+    RollerShutterButtonOpen->addAction(Supla::STOP, RollerShutterRelay, Supla::ON_RELEASE);
 
-    RollerShutterButtonClose[size]->addAction(Supla::CLOSE, *RollerShutterRelay[size], Supla::ON_PRESS);
-    RollerShutterButtonClose[size]->addAction(Supla::STOP, *RollerShutterRelay[size], Supla::ON_RELEASE);
+    RollerShutterButtonClose->addAction(Supla::CLOSE, RollerShutterRelay, Supla::ON_PRESS);
+    RollerShutterButtonClose->addAction(Supla::STOP, RollerShutterRelay, Supla::ON_RELEASE);
   }
   // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
@@ -231,8 +224,6 @@ void addRGBWLeds(uint8_t nr) {
   int buttonPin = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
 
   if (redPin != OFF_GPIO && greenPin != OFF_GPIO && bluePin != OFF_GPIO && colorBrightnessPin != OFF_GPIO && brightnessPin != OFF_GPIO) {
-    Serial.println("---------------------------------------");
-
     Serial.println(redPin);
     Serial.println(greenPin);
     Serial.println(bluePin);
@@ -281,11 +272,6 @@ void addRGBWLeds(uint8_t nr) {
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_PUSHOVER)
 std::vector<Supla::Control::Relay *> relay;
-std::vector<Supla::Control::Button *> button;
-#endif
-
-#if defined(SUPLA_PUSHOVER)
-std::vector<Supla::Control::Pushover *> pushover;
 #endif
 
 #ifdef SUPLA_DS18B20
@@ -293,13 +279,75 @@ std::vector<DS18B20 *> sensorDS;
 #endif
 
 #ifdef SUPLA_HLW8012
-Supla::Sensor::HJ101 *counterHLW8012;
+Supla::Sensor::HJ101 *counterHLW8012 = nullptr;
 
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
-  counterHLW8012 = new Supla::Sensor::HJ101(pinCF, pinCF1, pinSEL);
+  if (counterHLW8012 == NULL) {
+    counterHLW8012 = new Supla::Sensor::HJ101(pinCF, pinCF1, pinSEL);
+  }
   eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_IMPULSE_COUNTER_SEK * 1000);
 }
 #endif
+void addConditionsTurnON(int function, Supla::ChannelElement *client) {
+  if (Supla::GUI::relay.size() == 0)
+    return;
+
+  for (uint8_t nr = 0; nr <= OFF_GPIO; nr++) {
+    if (ConfigManager->get(KEY_CONDITIONS_SENSOR_TYPE)->getElement(nr).toInt() == function &&
+        strcmp(ConfigManager->get(KEY_CONDITIONS_MIN)->getElement(nr).c_str(), "") != 0) {
+      double threshold = ConfigManager->get(KEY_CONDITIONS_MIN)->getElement(nr).toDouble();
+
+      switch (ConfigManager->get(KEY_CONDITIONS_TYPE)->getElement(nr).toInt()) {
+        case HEATING:
+          client->addAction(Supla::TURN_ON, Supla::GUI::relay[nr], OnLess(threshold));
+          break;
+
+        case COOLING:
+          client->addAction(Supla::TURN_ON, Supla::GUI::relay[nr], OnGreater(threshold));
+          break;
+
+        case MOISTURIZING:
+          client->addAction(Supla::TURN_ON, Supla::GUI::relay[nr], OnLess(threshold, true));
+          break;
+
+        case DRAINGE:
+          client->addAction(Supla::TURN_ON, Supla::GUI::relay[nr], OnGreater(threshold, true));
+          break;
+      }
+    }
+  }
+}
+
+void addConditionsTurnOFF(int function, Supla::ChannelElement *client) {
+  if (Supla::GUI::relay.size() == 0)
+    return;
+
+  for (uint8_t nr = 0; nr <= OFF_GPIO; nr++) {
+    if (ConfigManager->get(KEY_CONDITIONS_SENSOR_TYPE)->getElement(nr).toInt() == function &&
+        strcmp(ConfigManager->get(KEY_CONDITIONS_MAX)->getElement(nr).c_str(), "") != 0) {
+      double threshold = ConfigManager->get(KEY_CONDITIONS_MAX)->getElement(nr).toDouble();
+
+      switch (ConfigManager->get(KEY_CONDITIONS_TYPE)->getElement(nr).toInt()) {
+        case HEATING:
+          client->addAction(Supla::TURN_OFF, Supla::GUI::relay[nr], OnGreater(threshold));
+          break;
+
+        case COOLING:
+          client->addAction(Supla::TURN_OFF, Supla::GUI::relay[nr], OnLess(threshold));
+          break;
+
+        case MOISTURIZING:
+          client->addAction(Supla::TURN_OFF, Supla::GUI::relay[nr], OnGreater(threshold, true));
+          break;
+
+        case DRAINGE:
+          client->addAction(Supla::TURN_OFF, Supla::GUI::relay[nr], OnLess(threshold, true));
+          break;
+      }
+    }
+  }
+}
+
 }  // namespace GUI
 }  // namespace Supla
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 044b0ccb..b1d03f88 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -96,11 +96,6 @@ void begin();
 void addRelayButton(uint8_t nr);
 
 extern std::vector<Supla::Control::Relay *> relay;
-extern std::vector<Supla::Control::Button *> button;
-#endif
-
-#if defined(SUPLA_PUSHOVER)
-extern std::vector<Supla::Control::Pushover *> pushover;
 #endif
 
 #ifdef SUPLA_DS18B20
@@ -116,10 +111,6 @@ void addConfigESP(int pinNumberConfig, int pinLedConfig, int modeConfigButton, b
 #ifdef SUPLA_ROLLERSHUTTER
 void addRolleShutter(uint8_t nr);
 void addRolleShutterMomentary(uint8_t nr);
-
-extern std::vector<Supla::Control::RollerShutter *> RollerShutterRelay;
-extern std::vector<Supla::Control::Button *> RollerShutterButtonOpen;
-extern std::vector<Supla::Control::Button *> RollerShutterButtonClose;
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
@@ -136,6 +127,9 @@ extern Supla::Sensor::HJ101 *counterHLW8012;
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
 #endif
 
+void addConditionsTurnON(int function, Supla::ChannelElement *client);
+void addConditionsTurnOFF(int function, Supla::ChannelElement *client);
+
 };  // namespace GUI
 };  // namespace Supla
 
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 32f41628..35599844 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -278,7 +278,7 @@ void displayPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x,
 
 SuplaOled::SuplaOled() {
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
-    switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+    switch (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_OLED).toInt()) {
       case OLED_SSD1306_0_96:
         display = new SSD1306Wire(0x3c, ConfigESP->getGpio(FUNCTION_SDA), ConfigESP->getGpio(FUNCTION_SCL), GEOMETRY_128_64, I2C_ONE, -1);
         break;
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index d75cf194..6e1eaf8e 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -221,6 +221,7 @@ void chooseTemplateBoard(uint8_t board) {
       Supla::GUI::counterHLW8012->setCurrentMultiplier(18388);
       Supla::GUI::counterHLW8012->setVoltageMultiplier(247704);
       Supla::GUI::counterHLW8012->setPowerMultiplier(2586583);
+      Supla::Storage::ScheduleSave(2000);
 #endif
       break;
     case BOARD_DIMMER_LUKASZH:
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index b188a0bf..ac11b769 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -16,7 +16,7 @@ void SuplaWebPageControl::createWebPageControl() {
   WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleControlSave, this));
 
 #ifdef SUPLA_BUTTON
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     path = PATH_START;
     path += PATH_BUTTON_SET;
     WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageControl::handleButtonSetMCP23017, this));
@@ -70,7 +70,7 @@ void SuplaWebPageControl::handleControlSave() {
 #ifdef SUPLA_BUTTON
   last_value = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
       if (!WebServer->saveGpioMCP23017(INPUT_BUTTON_GPIO, FUNCTION_BUTTON, nr, INPUT_MAX_BUTTON)) {
         supla_webpage_control(6);
         return;
@@ -109,7 +109,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_BUTTONS));
 
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     countFreeGpio = 16;
   }
   else {
@@ -119,7 +119,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
   addNumberBox(webContentBuffer, INPUT_MAX_BUTTON, S_QUANTITY, KEY_MAX_BUTTON, countFreeGpio);
 
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_BUTTON)->getValueInt(); nr++) {
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
       addListMCP23017GPIOLinkBox(webContentBuffer, INPUT_BUTTON_GPIO, S_BUTTON, FUNCTION_BUTTON, PATH_BUTTON_SET, nr);
     }
     else {
@@ -243,7 +243,7 @@ void SuplaWebPageControl::handleLimitSwitchSave() {
 
   last_value = ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
       if (!WebServer->saveGpioMCP23017(INPUT_LIMIT_SWITCH_GPIO, FUNCTION_LIMIT_SWITCH, nr, INPUT_MAX_LIMIT_SWITCH)) {
         suplaWebpageLimitSwitch(6);
         return;
@@ -280,7 +280,7 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
 
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
 
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     countFreeGpio = 16;
   }
   else {
@@ -290,7 +290,7 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
   addNumberBox(webContentBuffer, INPUT_MAX_LIMIT_SWITCH, S_QUANTITY, KEY_MAX_LIMIT_SWITCH, countFreeGpio);
 
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt(); nr++) {
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
       addListMCP23017GPIOBox(webContentBuffer, INPUT_LIMIT_SWITCH_GPIO, S_LIMIT_SWITCH, FUNCTION_LIMIT_SWITCH, nr);
     }
     else {
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index a57c1c0b..e9c6f2a3 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -23,7 +23,7 @@ void SuplaWebPageRelay::createWebPageRelay() {
   path += PATH_SAVE_RELAY;
   WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySave, this));
 
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     path = PATH_START;
     path += PATH_RELAY_SET;
     WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySetMCP23017, this));
@@ -65,7 +65,7 @@ void SuplaWebPageRelay::handleRelaySave() {
 
   last_value = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
       if (!WebServer->saveGpioMCP23017(INPUT_RELAY_GPIO, FUNCTION_RELAY, nr, INPUT_MAX_RELAY)) {
         supla_webpage_relay(6);
         return;
@@ -102,7 +102,7 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
   addForm(webContentBuffer, F("post"), PATH_SAVE_RELAY);
   addFormHeader(webContentBuffer, S_GPIO_SETTINGS_FOR_RELAYS);
 
-  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+  if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     countFreeGpio = 16;
   }
   else {
@@ -112,7 +112,7 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
   addNumberBox(webContentBuffer, INPUT_MAX_RELAY, S_QUANTITY, KEY_MAX_RELAY, countFreeGpio);
 
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt() != FUNCTION_OFF) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
       addListMCP23017GPIOLinkBox(webContentBuffer, INPUT_RELAY_GPIO, S_RELAY, FUNCTION_RELAY, PATH_RELAY_SET, nr);
     }
     else {
@@ -173,17 +173,28 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
   ConfigManager->setElement(KEY_PUSHOVER, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
 #endif
 
+  input = INPUT_CONDITIONS_SENSOR_TYPE;
+  ConfigManager->setElement(KEY_CONDITIONS_SENSOR_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
+  input = INPUT_CONDITIONS_TYPE;
+  ConfigManager->setElement(KEY_CONDITIONS_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
+  input = INPUT_CONDITIONS_MIN;
+  Serial.println(WebServer->httpServer.arg(input).toDouble());
+  ConfigManager->setElement(KEY_CONDITIONS_MIN, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+  input = INPUT_CONDITIONS_MAX;
+  Serial.println(WebServer->httpServer.arg(input).toDouble());
+  ConfigManager->setElement(KEY_CONDITIONS_MAX, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      supla_webpage_relay(1);
+      supla_webpage_relay_set(1, nr_relay.toInt());
       break;
     case E_CONFIG_FILE_OPEN:
-      supla_webpage_relay(2);
+      supla_webpage_relay_set(2, nr_relay.toInt());
       break;
   }
 }
 
-void SuplaWebPageRelay::supla_webpage_relay_set(int save) {
+void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   String path, readUrl, nr_relay;
   uint8_t place, selected;
 
@@ -191,15 +202,21 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save) {
   readUrl.reserve(11);
   nr_relay.reserve(2);
 
-  path = PATH_START;
-  path += PATH_RELAY_SET;
-  readUrl = WebServer->httpServer.uri();
+  webContentBuffer += SuplaSaveResult(save);
 
-  place = readUrl.indexOf(path);
-  nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
+  if (nr != 0) {
+    webContentBuffer += SuplaJavaScript(PATH_RELAY_SET + String(nr));
+    nr_relay = nr;
+  }
+  else {
+    path = PATH_START;
+    path += PATH_RELAY_SET;
+    readUrl = WebServer->httpServer.uri();
 
-  webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_RELAY);
+    place = readUrl.indexOf(path);
+    nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
+    webContentBuffer += SuplaJavaScript(String(PATH_RELAY_SET + nr_relay));
+  }
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_RELAY_SET + nr_relay);
   addFormHeader(webContentBuffer, S_RELAY_NR_SETTINGS + nr_relay);
@@ -214,8 +231,22 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save) {
   selected = ConfigManager->get(KEY_PUSHOVER)->getElement(nr_relay.toInt() - 1).toInt();
   addListBox(webContentBuffer, INPUT_PUSHOVER, F("Pushover"), STATE_P, 2, selected);
 #endif
+  addFormHeaderEnd(webContentBuffer);
+
+  addFormHeader(webContentBuffer, F("Warunkowanie"));
+
+  selected = ConfigManager->get(KEY_CONDITIONS_SENSOR_TYPE)->getElement(nr_relay.toInt() - 1).toInt();
+  addListBox(webContentBuffer, INPUT_CONDITIONS_SENSOR_TYPE, "Sensor", SENSOR_LIST_P, COUNT_SENSOR_LIST, selected);
 
+  selected = ConfigManager->get(KEY_CONDITIONS_TYPE)->getElement(nr_relay.toInt() - 1).toInt();
+  addListBox(webContentBuffer, INPUT_CONDITIONS_TYPE, "Warunek", CONDITIONS_TYPE_P, 4, selected);
+
+  String value = ConfigManager->get(KEY_CONDITIONS_MIN)->getElement(nr_relay.toInt() - 1);
+  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MIN, "ON", "wartość włączenia", false, value);
+  value = ConfigManager->get(KEY_CONDITIONS_MAX)->getElement(nr_relay.toInt() - 1);
+  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MAX, "OFF", "wartość wyłączenia", false, value);
   addFormHeaderEnd(webContentBuffer);
+
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_RELAY);
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index af1fa83c..4e14a789 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -16,6 +16,11 @@
 #define INPUT_RELAY_DURATION  "ird"
 #define INPUT_ROLLERSHUTTER   "irsr"
 
+#define INPUT_CONDITIONS_SENSOR_TYPE "cst"
+#define INPUT_CONDITIONS_TYPE        "ct"
+#define INPUT_CONDITIONS_MIN         "cmi"
+#define INPUT_CONDITIONS_MAX         "cma"
+
 #if defined(SUPLA_PUSHOVER)
 #define INPUT_PUSHOVER "po"
 #endif
@@ -27,6 +32,13 @@ enum _memory_relay
   MEMORY_RELAY_RESTORE
 };
 
+enum _conditions
+{
+  CONDITIONS_DS18B20 = 1,
+  CONDITIONS_DHT_TEMP,
+  CONDITIONS_DHT_HUMI,
+};
+
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 
 class SuplaWebPageRelay {
@@ -41,7 +53,7 @@ class SuplaWebPageRelay {
   void handleRelaySetMCP23017();
 
  private:
-  void supla_webpage_relay_set(int save);
+  void supla_webpage_relay_set(int save, int nr = 0);
   void supla_webpage_relay(int save);
   void supla_webpage_relay_set_MCP23017(int save);
 };
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 3fc5fbeb..a8ade5e3 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -386,7 +386,7 @@ void SuplaWebPageSensor::handlei2cSave() {
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_BME280;
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_BME280, WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_BME280, WebServer->httpServer.arg(input).toInt());
   }
 
   key = KEY_ALTITUDE_BME280;
@@ -400,7 +400,7 @@ void SuplaWebPageSensor::handlei2cSave() {
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_SHT3x;
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_SHT3x, WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_SHT3x, WebServer->httpServer.arg(input).toInt());
   }
 #endif
 
@@ -408,7 +408,7 @@ void SuplaWebPageSensor::handlei2cSave() {
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_SI7021;
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_SI7021, WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_SI7021, WebServer->httpServer.arg(input).toInt());
   }
 #endif
 
@@ -416,7 +416,7 @@ void SuplaWebPageSensor::handlei2cSave() {
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_OLED;
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_OLED, WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_OLED, WebServer->httpServer.arg(input).toInt());
   }
 
   if (!WebServer->saveGPIO(INPUT_BUTTON_GPIO, FUNCTION_CFG_BUTTON)) {
@@ -442,9 +442,9 @@ void SuplaWebPageSensor::handlei2cSave() {
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_MCP23017;
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_MCP23017, WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_MCP23017, WebServer->httpServer.arg(input).toInt());
 
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       ConfigESP->clearFunctionGpio(FUNCTION_RELAY);
       ConfigESP->clearFunctionGpio(FUNCTION_BUTTON);
     }
@@ -476,7 +476,7 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
 #ifdef SUPLA_BME280
-    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_BME280).toInt();
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_BME280).toInt();
     addFormHeader(webContentBuffer);
     addListBox(webContentBuffer, INPUT_BME280, F("BME280 adres"), BME280_P, 4, selected);
     addNumberBox(webContentBuffer, INPUT_ALTITUDE_BME280, S_ALTITUDE_ABOVE_SEA_LEVEL, KEY_ALTITUDE_BME280, 1500);
@@ -484,14 +484,14 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #endif
 
 #ifdef SUPLA_SHT3x
-    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SHT3x).toInt();
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_SHT3x).toInt();
     addFormHeader(webContentBuffer);
     addListBox(webContentBuffer, INPUT_SHT3x, F("SHT3x"), SHT3x_P, 4, selected);
     addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_SI7021
-    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_SI7021).toInt();
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_SI7021).toInt();
     addFormHeader(webContentBuffer);
     addListBox(webContentBuffer, INPUT_SI7021, F("SI7021"), STATE_P, 2, selected);
     addFormHeaderEnd(webContentBuffer);
@@ -500,10 +500,10 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #ifdef SUPLA_OLED
     addFormHeader(webContentBuffer);
 
-    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt();
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_OLED).toInt();
     addListBox(webContentBuffer, INPUT_OLED, F("OLED"), OLED_P, 4, selected);
 
-    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_OLED).toInt()) {
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_OLED).toInt()) {
       String name, sensorName, input;
 
       addListGPIOBox(webContentBuffer, INPUT_BUTTON_GPIO, F("PRZYCISK OLED"), FUNCTION_CFG_BUTTON);
@@ -524,7 +524,7 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #endif
 
 #ifdef SUPLA_MCP23017
-    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MCP23017).toInt();
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt();
     addFormHeader(webContentBuffer);
     addListBox(webContentBuffer, INPUT_MCP23017, F("MCP23017"), STATE_P, 2, selected);
     addFormHeaderEnd(webContentBuffer);
@@ -576,7 +576,7 @@ void SuplaWebPageSensor::handleSpiSave() {
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_MAX6675;
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_MAX6675, WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_MAX6675, WebServer->httpServer.arg(input).toInt());
   }
 #endif
 
@@ -607,7 +607,7 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
   addListGPIOBox(webContentBuffer, INPUT_D0_GPIO, F("D0"), FUNCTION_D0);
 
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
-    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_MAX6675).toInt();
+    selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MAX6675).toInt();
     addListBox(webContentBuffer, INPUT_MAX6675, F("MAX6675"), STATE_P, 2, selected);
   }
   addFormHeaderEnd(webContentBuffer);
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 873953e9..547ac488 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -18,39 +18,39 @@
 #define PATH_IMPULSE_COUNTER_SET      "setimpulsecounter"
 #define PATH_SAVE_IMPULSE_COUNTER_SET "savesetimpulsecounter"
 
-#define INPUT_MULTI_DS_GPIO                    "mdsg"
-#define INPUT_DHT11_GPIO                       "dht11"
-#define INPUT_DHT22_GPIO                       "dht22"
-#define INPUT_SDA_GPIO                         "sdag"
-#define INPUT_SCL_GPIO                         "sclg"
-#define INPUT_BME280                           "bme280"
-#define INPUT_ALTITUDE_BME280                  "abme280"
-#define INPUT_SHT3x                            "sht30"
-#define INPUT_SI7021                           "si7021"
-#define INPUT_OLED                             "oled"
-#define INPUT_OLED_ANIMATION                   "oleda"
-#define INPUT_OLED_BRIGHTNESS                  "oledb"
-#define INPUT_MCP23017                         "mcp"
-#define INPUT_SI7021_SONOFF                    "si7021sonoff"
-#define INPUT_TRIG_GPIO                        "trig"
-#define INPUT_ECHO_GPIO                        "echo"
-#define INPUT_MAX_DHT11                        "mdht11"
-#define INPUT_MAX_DHT22                        "mdht22"
-#define INPUT_MAX_DS18B20                      "maxds"
-#define INPUT_CLK_GPIO                         "clk"
-#define INPUT_CS_GPIO                          "cs"
-#define INPUT_D0_GPIO                          "d0"
-#define INPUT_MAX6675                          "max6675"
+#define INPUT_MULTI_DS_GPIO   "mdsg"
+#define INPUT_DHT11_GPIO      "dht11"
+#define INPUT_DHT22_GPIO      "dht22"
+#define INPUT_SDA_GPIO        "sdag"
+#define INPUT_SCL_GPIO        "sclg"
+#define INPUT_BME280          "bme280"
+#define INPUT_ALTITUDE_BME280 "abme280"
+#define INPUT_SHT3x           "sht30"
+#define INPUT_SI7021          "si7021"
+#define INPUT_OLED            "oled"
+#define INPUT_OLED_ANIMATION  "oleda"
+#define INPUT_OLED_BRIGHTNESS "oledb"
+#define INPUT_MCP23017        "mcp"
+#define INPUT_SI7021_SONOFF   "si7021sonoff"
+#define INPUT_TRIG_GPIO       "trig"
+#define INPUT_ECHO_GPIO       "echo"
+#define INPUT_MAX_DHT11       "mdht11"
+#define INPUT_MAX_DHT22       "mdht22"
+#define INPUT_MAX_DS18B20     "maxds"
+#define INPUT_CLK_GPIO        "clk"
+#define INPUT_CS_GPIO         "cs"
+#define INPUT_D0_GPIO         "d0"
+#define INPUT_MAX6675         "max6675"
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MAX6675) || defined(SUPLA_MCP23017)
-enum _sensor
+enum _sensorI2C
 {
-  SENSOR_BME280,
-  SENSOR_SHT3x,
-  SENSOR_SI7021,
-  SENSOR_MAX6675,
-  SENSOR_OLED,
-  SENSOR_MCP23017
+  SENSOR_I2C_BME280,
+  SENSOR_I2C_SHT3x,
+  SENSOR_I2C_SI7021,
+  SENSOR_I2C_MAX6675,
+  SENSOR_I2C_OLED,
+  SENSOR_I2C_MCP23017
 };
 #endif
 

From f0d3ee94a3ae31b3ce42131e28502fd3713039ab Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 8 Feb 2021 10:20:33 +0100
Subject: [PATCH 058/165] poprawa dla HJ101

---
 lib/SuplaDevice/src/supla/sensor/HJ101.cpp | 81 ++++++++++++++++------
 lib/SuplaDevice/src/supla/sensor/HJ101.h   | 34 +++------
 2 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
index 37217aa1..80253563 100644
--- a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
@@ -3,8 +3,16 @@
 namespace Supla {
 namespace Sensor {
 
-HJ101::HJ101(int8_t pinCF, int8_t pinCF1, int8_t pinSEL, bool currentWhen, bool use_interrupts)
-    : pinCF(pinCF), pinCF1(pinCF1), pinSEL(pinSEL), currentWhen(currentWhen), use_interrupts(use_interrupts) {
+HJ101::HJ101(int8_t pinCF,
+             int8_t pinCF1,
+             int8_t pinSEL,
+             bool currentWhen,
+             bool use_interrupts)
+    : pinCF(pinCF),
+      pinCF1(pinCF1),
+      pinSEL(pinSEL),
+      currentWhen(currentWhen),
+      use_interrupts(use_interrupts) {
   hj101 = new HLW8012();
   hj101->begin(pinCF, pinCF1, pinSEL, currentWhen, use_interrupts);
 
@@ -18,7 +26,9 @@ void HJ101::onInit() {
 }
 
 void HJ101::readValuesFromDevice() {
-  energy = _energy + (hj101->getEnergy() / 36);  // ----------  current energy value = value at start + (hj101->getEnergy() / 36) ----
+  energy = _energy +
+           (hj101->getEnergy() / 36);  // current energy value = value at start
+
   unsigned int _reactive = 0;
   double _pf = 0;
   double _current = hj101->getCurrent();
@@ -27,8 +37,7 @@ void HJ101::readValuesFromDevice() {
   unsigned int _apparent = _voltage * _current;
   if (_apparent > _active) {
     _reactive = sqrt(_apparent * _apparent - _active * _active);
-  }
-  else {
+  } else {
     _reactive = 0;
   }
   if (_active > _apparent) {
@@ -36,8 +45,7 @@ void HJ101::readValuesFromDevice() {
   }
   if (_apparent == 0) {
     _pf = 0;
-  }
-  else {
+  } else {
     _pf = (double)_active / _apparent;
   }
   setVoltage(0, _voltage * 100);            // voltage in 0.01 V
@@ -50,46 +58,73 @@ void HJ101::readValuesFromDevice() {
 }
 
 void HJ101::onSaveState() {
-  //double current_multiplier = getCurrentMultiplier();
-  //double voltage_multiplier = getVoltageMultiplier();
-  //double power_multiplier = getPowerMultiplier();
+  double current_multiplier = getCurrentMultiplier();
+  double voltage_multiplier = getVoltageMultiplier();
+  double power_multiplier = getPowerMultiplier();
 
   Supla::Storage::WriteState((unsigned char *)&energy, sizeof(energy));
-  //Supla::Storage::WriteState((unsigned char *)&current_multiplier, sizeof(current_multiplier));
-  //Supla::Storage::WriteState((unsigned char *)&voltage_multiplier, sizeof(voltage_multiplier));
-  //Supla::Storage::WriteState((unsigned char *)&power_multiplier, sizeof(power_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&current_multiplier,
+                             sizeof(current_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&voltage_multiplier,
+                             sizeof(voltage_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&power_multiplier,
+                             sizeof(power_multiplier));
 }
 
 void HJ101::onLoadState() {
-  _supla_int64_t data;
   double current_multiplier;
   double voltage_multiplier;
   double power_multiplier;
 
-  if (Supla::Storage::ReadState((unsigned char *)&data, sizeof(data))) {
-    setCounter(data);
+  if (Supla::Storage::ReadState((unsigned char *)&energy, sizeof(energy))) {
+    setCounter(energy);
   }
 
-  if (Supla::Storage::ReadState((unsigned char *)&current_multiplier, sizeof(current_multiplier))) {
+  if (Supla::Storage::ReadState((unsigned char *)&current_multiplier,
+                                sizeof(current_multiplier))) {
     setCurrentMultiplier(current_multiplier);
   }
 
-  if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier, sizeof(voltage_multiplier))) {
+  if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier,
+                                sizeof(voltage_multiplier))) {
     setVoltageMultiplier(voltage_multiplier);
   }
 
-  if (Supla::Storage::ReadState((unsigned char *)&power_multiplier, sizeof(power_multiplier))) {
+  if (Supla::Storage::ReadState((unsigned char *)&power_multiplier,
+                                sizeof(power_multiplier))) {
     setPowerMultiplier(power_multiplier);
   }
 }
 
+double HJ101::getCurrentMultiplier() {
+  return hj101->getCurrentMultiplier();
+};
+
+double HJ101::getVoltageMultiplier() {
+  return hj101->getVoltageMultiplier();
+};
+
+double HJ101::getPowerMultiplier() {
+  return hj101->getPowerMultiplier();
+};
+
 _supla_int64_t HJ101::getCounter() {
   return energy;
 }
 
-void HJ101::setCounter(_supla_int64_t value) {
-  _energy = value;  // ----------  energy value read from memory at startup ----
-  setFwdActEnergy(0, value);
+void HJ101::setCurrentMultiplier(double current_multiplier) {
+  hj101->setCurrentMultiplier(current_multiplier);
+};
+void HJ101::setVoltageMultiplier(double voltage_multiplier) {
+  hj101->setVoltageMultiplier(voltage_multiplier);
+};
+void HJ101::setPowerMultiplier(double power_multiplier) {
+  hj101->setPowerMultiplier(power_multiplier);
+};
+
+void HJ101::setCounter(_supla_int64_t energy) {
+  _energy = energy;  // ------- energy value read from memory at startup
+  setFwdActEnergy(0, energy);
 }
 
 // When using interrupts we have to call the library entry point
@@ -134,7 +169,7 @@ void HJ101::calibrate(double calibPower, double calibVoltage) {
   Serial.println(voltage_multi);
   Serial.print(F("[HLW] New power multiplier   : "));
   Serial.println(power_multi);
-  Supla::Storage::ScheduleSave(1000);
+  Supla::Storage::ScheduleSave(2000);
   yield();
 }
 
diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.h b/lib/SuplaDevice/src/supla/sensor/HJ101.h
index 5ccd921d..ad392868 100644
--- a/lib/SuplaDevice/src/supla/sensor/HJ101.h
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.h
@@ -26,35 +26,21 @@ class HJ101 : public OnePhaseElectricityMeter, public Element {
   void readValuesFromDevice();
   void onSaveState();
   void onLoadState();
+
+  double getCurrentMultiplier();
+  double getVoltageMultiplier();
+  double getPowerMultiplier();
   _supla_int64_t getCounter();
-  void setCounter(_supla_int64_t value);
+
+  void setCurrentMultiplier(double current_multiplier);
+  void setVoltageMultiplier(double voltage_multiplier);
+  void setPowerMultiplier(double power_multiplier);
+  void setCounter(_supla_int64_t energy);
+
   static void ICACHE_RAM_ATTR hjl01_cf1_interrupt();
   static void ICACHE_RAM_ATTR hjl01_cf_interrupt();
   void calibrate(double calibPower, double calibVoltage);
 
-  double getCurrentMultiplier() {
-    return hj101->getCurrentMultiplier();
-  };
-  double getVoltageMultiplier() {
-    return hj101->getVoltageMultiplier();
-  };
-  double getPowerMultiplier() {
-    return hj101->getPowerMultiplier();
-  };
-
-  void setCurrentMultiplier(double current_multiplier) {
-    hj101->setCurrentMultiplier(current_multiplier);
-    Supla::Storage::ScheduleSave(1000);
-  };
-  void setVoltageMultiplier(double voltage_multiplier) {
-    hj101->setVoltageMultiplier(voltage_multiplier);
-    Supla::Storage::ScheduleSave(1000);
-  };
-  void setPowerMultiplier(double power_multiplier) {
-    hj101->setPowerMultiplier(power_multiplier);
-    Supla::Storage::ScheduleSave(1000);
-  };
-
  protected:
   static HLW8012 *hj101;
   int8_t pinCF;

From 9fe802bd4fe13228282326a948030cb444a7e5e7 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 8 Feb 2021 16:36:06 +0100
Subject: [PATCH 059/165] =?UTF-8?q?odliczanie=20od=20ty=C5=82u=20HC=5FSR04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GUI-Generic.ino        | 11 ++++++++++-
 src/SuplaConfigManager.cpp |  6 ++----
 src/SuplaConfigManager.h   |  4 ++--
 src/SuplaWebPageOther.cpp  |  3 +++
 src/SuplaWebPageOther.h    |  6 ++++++
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 7708704a..18068b12 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -116,7 +116,16 @@ void setup() {
 
 #ifdef SUPLA_HC_SR04
   if (ConfigESP->getGpio(FUNCTION_TRIG) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_ECHO) != OFF_GPIO) {
-    auto hcsr04 = new Supla::Sensor::HC_SR04(ConfigESP->getGpio(FUNCTION_TRIG), ConfigESP->getGpio(FUNCTION_ECHO));
+    Supla::Sensor::HC_SR04 *hcsr04;
+    if (strcmp(ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValue(), "") != 0) {
+      hcsr04 = new Supla::Sensor::HC_SR04(ConfigESP->getGpio(FUNCTION_TRIG), ConfigESP->getGpio(FUNCTION_ECHO), 0,
+                                          ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValueInt(),
+                                          ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValueInt(), 0);
+    }
+    else {
+      hcsr04 = new Supla::Sensor::HC_SR04(ConfigESP->getGpio(FUNCTION_TRIG), ConfigESP->getGpio(FUNCTION_ECHO));
+    }
+
     Supla::GUI::addConditionsTurnON(SENSOR_HC_SR04, hcsr04);
     Supla::GUI::addConditionsTurnOFF(SENSOR_HC_SR04, hcsr04);
   }
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index e78cf203..c7b802de 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -191,6 +191,8 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_CONDITIONS_MIN, "", MAX_GPIO * 4);
   this->addKey(KEY_CONDITIONS_MAX, "", MAX_GPIO * 4);
 
+  this->addKey(KEY_HC_SR04_MAX_SENSOR_READ, "", 3);
+
   this->load();
   //  switch (this->load()) {
   //    case E_CONFIG_OK:
@@ -427,10 +429,6 @@ bool SuplaConfigManager::setElement(uint8_t key, int index, const char *newvalue
 }
 
 void SuplaConfigManager::setGUIDandAUTHKEY() {
-  if (strcmp(this->get(KEY_SUPLA_GUID)->getValue(), "") != 0 || strcmp(this->get(KEY_SUPLA_AUTHKEY)->getValue(), "") != 0) {
-    return;
-  }
-
   char mac[6];
   int a;
 
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index ca76176a..a575c3c0 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -84,7 +84,8 @@ enum _key
   KEY_CONDITIONS_SENSOR_TYPE,
   KEY_CONDITIONS_TYPE,
   KEY_CONDITIONS_MIN,
-  KEY_CONDITIONS_MAX
+  KEY_CONDITIONS_MAX,
+  KEY_HC_SR04_MAX_SENSOR_READ
 };
 
 //#define GPIO      "GPIO"
@@ -139,7 +140,6 @@ enum _function
   FUNCTION_RGBW_GREEN,
   FUNCTION_RGBW_BLUE,
   FUNCTION_RGBW_BRIGHTNESS,
-  FUNCTION_RGBW_COLOR_BRIGHTNESS
 };
 
 enum _e_onfig
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 69a64e19..843a3a3b 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -47,6 +47,7 @@ void handleOtherSave() {
     suplaWebPageOther(6);
     return;
   }
+  ConfigManager->set(KEY_HC_SR04_MAX_SENSOR_READ, WebServer->httpServer.arg(INPUT_HC_SR04_MAX_SENSOR_READ).c_str());
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
@@ -118,6 +119,8 @@ void suplaWebPageOther(int save) {
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
   addListGPIOBox(webContentBuffer, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
   addListGPIOBox(webContentBuffer, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
+  addNumberBox(webContentBuffer, INPUT_HC_SR04_MAX_SENSOR_READ, F("Odległość[cm]"), F("maksymalna odległość odczytu czujnika"), false,
+               ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValue());
   addFormHeaderEnd(webContentBuffer);
 #endif
 
diff --git a/src/SuplaWebPageOther.h b/src/SuplaWebPageOther.h
index 7f35e0f7..f1d00670 100644
--- a/src/SuplaWebPageOther.h
+++ b/src/SuplaWebPageOther.h
@@ -54,4 +54,10 @@ void suplaWebpageHLW8012Calibrate(uint8_t save);
 #define INPUT_PUSHOVER_USER  "pou"
 #endif
 
+#ifdef SUPLA_HC_SR04
+#define INPUT_TRIG_GPIO               "trig"
+#define INPUT_ECHO_GPIO               "echo"
+#define INPUT_HC_SR04_MAX_SENSOR_READ "hsm"
+#endif
+
 #endif  // SuplaWebPageOther_h

From ae51eb7886e6dacb7df33886fd3f09fb240946d4 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 8 Feb 2021 16:37:05 +0100
Subject: [PATCH 060/165] F

---
 src/SuplaConfigESP.cpp    | 17 +++++++++++------
 src/SuplaWebPageRelay.cpp |  8 ++++----
 src/SuplaWebPageSensor.h  |  2 --
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 9c15989d..f61d3020 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -26,20 +26,25 @@ SuplaConfigESP::SuplaConfigESP() {
   configModeESP = NORMAL_MODE;
 
   if (ConfigManager->isDeviceConfigured()) {
-    ConfigManager->setGUIDandAUTHKEY();
-    if (String(ConfigManager->get(KEY_LOGIN)->getValue()) == 0) {
+    if (strcmp(ConfigManager->get(KEY_SUPLA_GUID)->getValue(), "") == 0 || strcmp(ConfigManager->get(KEY_SUPLA_AUTHKEY)->getValue(), "") == 0) {
+      ConfigManager->setGUIDandAUTHKEY();
+    }
+    if (strcmp(ConfigManager->get(KEY_LOGIN)->getValue(), "") == 0) {
+      ConfigManager->set(KEY_LOGIN, DEFAULT_LOGIN);
+    }
+    if (strcmp(ConfigManager->get(KEY_LOGIN)->getValue(), "") == 0) {
       ConfigManager->set(KEY_LOGIN, DEFAULT_LOGIN);
     }
-    if (String(ConfigManager->get(KEY_LOGIN_PASS)->getValue()) == 0) {
+    if (strcmp(ConfigManager->get(KEY_LOGIN_PASS)->getValue(), "") == 0) {
       ConfigManager->set(KEY_LOGIN_PASS, DEFAULT_LOGIN_PASS);
     }
-    if (String(ConfigManager->get(KEY_HOST_NAME)->getValue()) == 0) {
+    if (strcmp(ConfigManager->get(KEY_HOST_NAME)->getValue(), "") == 0) {
       ConfigManager->set(KEY_HOST_NAME, DEFAULT_HOSTNAME);
     }
-    if (String(ConfigManager->get(KEY_SUPLA_SERVER)->getValue()) == 0) {
+    if (strcmp(ConfigManager->get(KEY_SUPLA_SERVER)->getValue(), "") == 0) {
       ConfigManager->set(KEY_SUPLA_SERVER, DEFAULT_SERVER);
     }
-    if (String(ConfigManager->get(KEY_SUPLA_EMAIL)->getValue()) == 0) {
+    if (strcmp(ConfigManager->get(KEY_SUPLA_EMAIL)->getValue(), "") == 0) {
       ConfigManager->set(KEY_SUPLA_EMAIL, DEFAULT_EMAIL);
     }
     ConfigManager->save();
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index e9c6f2a3..3f5c93ef 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -236,15 +236,15 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   addFormHeader(webContentBuffer, F("Warunkowanie"));
 
   selected = ConfigManager->get(KEY_CONDITIONS_SENSOR_TYPE)->getElement(nr_relay.toInt() - 1).toInt();
-  addListBox(webContentBuffer, INPUT_CONDITIONS_SENSOR_TYPE, "Sensor", SENSOR_LIST_P, COUNT_SENSOR_LIST, selected);
+  addListBox(webContentBuffer, INPUT_CONDITIONS_SENSOR_TYPE, F("Sensor"), SENSOR_LIST_P, COUNT_SENSOR_LIST, selected);
 
   selected = ConfigManager->get(KEY_CONDITIONS_TYPE)->getElement(nr_relay.toInt() - 1).toInt();
-  addListBox(webContentBuffer, INPUT_CONDITIONS_TYPE, "Warunek", CONDITIONS_TYPE_P, 4, selected);
+  addListBox(webContentBuffer, INPUT_CONDITIONS_TYPE, F("Warunek"), CONDITIONS_TYPE_P, 4, selected);
 
   String value = ConfigManager->get(KEY_CONDITIONS_MIN)->getElement(nr_relay.toInt() - 1);
-  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MIN, "ON", "wartość włączenia", false, value);
+  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MIN, F("ON"), F("wartość włączenia"), false, value);
   value = ConfigManager->get(KEY_CONDITIONS_MAX)->getElement(nr_relay.toInt() - 1);
-  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MAX, "OFF", "wartość wyłączenia", false, value);
+  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MAX, F("OFF"), F("wartość wyłączenia"), false, value);
   addFormHeaderEnd(webContentBuffer);
 
   addButtonSubmit(webContentBuffer, S_SAVE);
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 547ac488..c0ce222a 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -32,8 +32,6 @@
 #define INPUT_OLED_BRIGHTNESS "oledb"
 #define INPUT_MCP23017        "mcp"
 #define INPUT_SI7021_SONOFF   "si7021sonoff"
-#define INPUT_TRIG_GPIO       "trig"
-#define INPUT_ECHO_GPIO       "echo"
 #define INPUT_MAX_DHT11       "mdht11"
 #define INPUT_MAX_DHT22       "mdht22"
 #define INPUT_MAX_DS18B20     "maxds"

From f2e78894b8a492322b0293a5b2ed5b2fa8ca0854 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 9 Feb 2021 18:08:13 +0100
Subject: [PATCH 061/165] generowanie GUID & AUTHKEY przy wczytywaniu
 konfiguracji

---
 src/SuplaWebPageTools.cpp  |  8 ++++----
 src/SuplaWebPageUpload.cpp | 18 ++++++++++++++----
 src/SuplaWebServer.cpp     |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index 4cd9173a..63306719 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -22,17 +22,17 @@ void handleTools() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  addFormHeader(webContentBuffer, F("Tools"));
+  addFormHeader(webContentBuffer, F("Narzędzia"));
   //#ifdef SUPLA_BUTTON
-  addButton(webContentBuffer, F("Save config"), PATH_DOWNLOAD);
+  addButton(webContentBuffer, F("Zapisz konfigurację"), PATH_DOWNLOAD);
   //#endif
   //#ifdef SUPLA_BUTTON
-  addButton(webContentBuffer, F("Load config"), PATH_UPLOAD);
+  addButton(webContentBuffer, F("Wczytaj konfigurację"), PATH_UPLOAD);
   //#endif
 #ifdef SUPLA_OTA
   addButton(webContentBuffer, S_UPDATE, PATH_UPDATE_HENDLE);
 #endif
-  addButton(webContentBuffer, F("Factory reset"), PATH_FACTORY_RESET);
+  addButton(webContentBuffer, F("Przywróć ustawienia fabryczne"), PATH_FACTORY_RESET);
   addFormHeaderEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, "");
 
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index c05e6f74..73b0cb10 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -3,8 +3,8 @@
 
 static const char uploadIndex[] PROGMEM =
     R"(<form class="formcenter" method="POST" action="/upload" enctype="multipart/form-data">
-         <input type="file" accept=".dat" name="config">
-         </br>
+         <input type="file" accept=".dat" name="config"></br>
+         <input type="checkbox" name='generateGUIDandAUTHKEY' value='1'>Generuj GUID & AUTHKEY</br></br>
          <input type="submit" value="Upload">
      </form>)";
 
@@ -15,7 +15,17 @@ void createWebUpload() {
   WebServer->httpServer.on(getURL(PATH_UPLOAD), HTTP_GET, []() { handleUpload(); });
   // WebServer->httpServer.on(F("/upload"), HTTP_POST, handleFileUpload);
   WebServer->httpServer.on(
-      getURL(PATH_UPLOAD), HTTP_POST, []() { WebServer->httpServer.send(200); }, handleFileUpload);
+      getURL(PATH_UPLOAD), HTTP_POST,
+      []() {
+        if (WebServer->httpServer.hasArg("generateGUIDandAUTHKEY")) {
+          if (WebServer->httpServer.arg("generateGUIDandAUTHKEY") == "1") {
+            ConfigManager->setGUIDandAUTHKEY();
+            ConfigManager->save();
+          }
+        }
+        WebServer->httpServer.send(200);
+      },
+      handleFileUpload);
 }
 
 void handleUpload(int save) {
@@ -25,7 +35,7 @@ void handleUpload(int save) {
   }
 
   webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript();
+  webContentBuffer += SuplaJavaScript(PATH_UPLOAD);
   webContentBuffer += F("<div class='w'>");
   webContentBuffer += F("<h3>");
   webContentBuffer += F("Wgraj konfiguracje");
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index a6e40e81..706c8fd6 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -181,7 +181,7 @@ void SuplaWebServer::supla_webpage_start(int save) {
   addFormEnd(webContentBuffer);
 
   addButton(webContentBuffer, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
-  addButton(webContentBuffer, F("Tools"), PATH_TOOLS);
+  addButton(webContentBuffer, F("Narzędzia"), PATH_TOOLS);
 
   WebServer->sendContent();
 }

From 88a938a3298a030e25810c88e8cb045eb9993d40 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 9 Feb 2021 18:09:20 +0100
Subject: [PATCH 062/165] =?UTF-8?q?mo=C5=BCliwo=C5=9B=C4=87=20okre=C5=9Ble?=
 =?UTF-8?q?nia=20wiadomo=C5=9Bci=20dla=20pushover?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaConfigManager.cpp |  1 +
 src/SuplaWebPageRelay.cpp  | 11 +++++++++--
 src/SuplaWebPageRelay.h    |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index c7b802de..af595843 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -185,6 +185,7 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_PUSHOVER, "", MAX_GPIO * 2);
   this->addKey(KEY_PUSHOVER_TOKEN, "0", MAX_TOKEN_SIZE);
   this->addKey(KEY_PUSHOVER_USER, "0", MAX_USER_SIZE);
+  this->addKey(KEY_PUSHOVER_MASSAGE, "", 16 * MAX_PUSHOVER_MESSAGE);
 
   this->addKey(KEY_CONDITIONS_SENSOR_TYPE, "", MAX_GPIO * 2);
   this->addKey(KEY_CONDITIONS_TYPE, "", MAX_GPIO * 1);
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 3f5c93ef..e60a5dbc 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -178,11 +178,13 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
   input = INPUT_CONDITIONS_TYPE;
   ConfigManager->setElement(KEY_CONDITIONS_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
   input = INPUT_CONDITIONS_MIN;
-  Serial.println(WebServer->httpServer.arg(input).toDouble());
   ConfigManager->setElement(KEY_CONDITIONS_MIN, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
   input = INPUT_CONDITIONS_MAX;
-  Serial.println(WebServer->httpServer.arg(input).toDouble());
   ConfigManager->setElement(KEY_CONDITIONS_MAX, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+  if (nr_relay.toInt() <= MAX_PUSHOVER_MESSAGE) {
+    input = INPUT_PUSHOVER_MESSAGE;
+    ConfigManager->setElement(KEY_PUSHOVER_MASSAGE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+  }
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
@@ -230,6 +232,11 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
 #if defined(SUPLA_PUSHOVER)
   selected = ConfigManager->get(KEY_PUSHOVER)->getElement(nr_relay.toInt() - 1).toInt();
   addListBox(webContentBuffer, INPUT_PUSHOVER, F("Pushover"), STATE_P, 2, selected);
+
+  if (nr_relay.toInt() <= MAX_PUSHOVER_MESSAGE) {
+    String pushoverMassage = ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(nr_relay.toInt() - 1).c_str();
+    addTextBox(webContentBuffer, INPUT_PUSHOVER_MESSAGE, "Wiadomość", pushoverMassage, 0, 16, false);
+  }
 #endif
   addFormHeaderEnd(webContentBuffer);
 
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index 4e14a789..e70f919f 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -22,7 +22,8 @@
 #define INPUT_CONDITIONS_MAX         "cma"
 
 #if defined(SUPLA_PUSHOVER)
-#define INPUT_PUSHOVER "po"
+#define INPUT_PUSHOVER         "po"
+#define INPUT_PUSHOVER_MESSAGE "pm"
 #endif
 
 enum _memory_relay

From a8a8a5d3a76079a1807238f2c6182cde0f2ca0f8 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 9 Feb 2021 18:09:58 +0100
Subject: [PATCH 063/165] wsparcie dla RGBW, RGB oraz DIMMERA

---
 platformio.ini             |  4 ++--
 src/Markup.cpp             |  2 +-
 src/SuplaCommonPROGMEM.h   | 12 ++++++------
 src/SuplaConfigESP.cpp     |  1 +
 src/SuplaConfigManager.h   |  8 +++++---
 src/SuplaDeviceGUI.cpp     | 22 +++++++++++-----------
 src/SuplaTemplateBoard.cpp |  5 ++---
 src/SuplaTemplateBoard.h   |  2 +-
 src/SuplaWebPageOther.cpp  |  6 ++----
 src/language/pl.h          |  1 +
 10 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 8b4eec9c..f77ac537 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.2"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.3"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
@@ -45,7 +45,7 @@ build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.2"'
                 -D SUPLA_OLED
                 -D SUPLA_HLW8012
                 -D SUPLA_MCP23017
-                ;-D SUPLA_RGBW  
+                -D SUPLA_RGBW  
                 -D SUPLA_PUSHOVER           
 
 [env]
diff --git a/src/Markup.cpp b/src/Markup.cpp
index 2088206c..ffe6a30a 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -55,7 +55,7 @@ void addTextBox(String& html,
     html += F("'");
   }
   if (maxlength > 0) {
-    html += F("' length='");
+    html += F("' maxlength='");
     html += maxlength;
     html += F("'");
   }
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 138b473d..19246c94 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -83,8 +83,8 @@ const char GPIO2[] PROGMEM = "GPIO2-D4";
 const char GPIO3[] PROGMEM = "GPIO3-RX";
 const char GPIO4[] PROGMEM = "GPIO4-D2";
 const char GPIO5[] PROGMEM = "GPIO5-D1";
-const char GPIO9[] PROGMEM = "GPIO9-D11";
-const char GPIO10[] PROGMEM = "GPIO10-D12";
+const char GPIO9[] PROGMEM = "GPIO9-FL ESP8285";
+const char GPIO10[] PROGMEM = "GPIO10-FL ESP8285";
 const char GPIO12[] PROGMEM = "GPIO12-D6";
 const char GPIO13[] PROGMEM = "GPIO13-D7";
 const char GPIO14[] PROGMEM = "GPIO14-D5";
@@ -178,10 +178,10 @@ enum conditioningType
 const char CONDITIONING__COOLING[] PROGMEM = "Temperatura - chłodzenie";
 const char CONDITIONING__MOISTURIZING[] PROGMEM = "Wilgotność - nawilżanie";
 const char CONDITIONING__DRAINGE[] PROGMEM = "Wilgotność - osuszanie";*/
-const char CONDITIONING__HEATING[] PROGMEM = "ON < wartość kanału > OFF";
-const char CONDITIONING__COOLING[] PROGMEM = "ON > wartość kanału < OFF";
-const char CONDITIONING__MOISTURIZING[] PROGMEM = "ON < wartość kanału wilgotność > OFF";
-const char CONDITIONING__DRAINGE[] PROGMEM = "ON > wartość kanału wilgotność < OFF";
+const char CONDITIONING__HEATING[] PROGMEM = "ON < wartość kanału > OFF - ogrzewanie";
+const char CONDITIONING__COOLING[] PROGMEM = "ON > wartość kanału < OFF - chłodzenie";
+const char CONDITIONING__MOISTURIZING[] PROGMEM = "ON < 2 wartość kanału > OFF - nawilżanie";
+const char CONDITIONING__DRAINGE[] PROGMEM = "ON > 2 wartość kanału < OFF - osuszanie";
 const char* const CONDITIONS_TYPE_P[] PROGMEM = {CONDITIONING__HEATING, CONDITIONING__COOLING, CONDITIONING__MOISTURIZING, CONDITIONING__DRAINGE};
 
 enum sensorList
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index f61d3020..e48dd8a1 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -712,6 +712,7 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
     ConfigManager->set(KEY_CONDITIONS_MIN, "");
     ConfigManager->set(KEY_CONDITIONS_MAX, "");
 
+    ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
     ConfigManager->save();
 
     if (!forceReset) {
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index a575c3c0..32bd5571 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -44,8 +44,9 @@
 #define MAX_MONOSTABLE_TRIGGER  1
 #define MAX_FUNCTION            1
 
-#define MAX_DS18B20 20
-#define MAX_GPIO    17
+#define MAX_DS18B20          20
+#define MAX_GPIO             17
+#define MAX_PUSHOVER_MESSAGE 2
 
 enum _key
 {
@@ -81,6 +82,7 @@ enum _key
   KEY_PUSHOVER,
   KEY_PUSHOVER_TOKEN,
   KEY_PUSHOVER_USER,
+  KEY_PUSHOVER_MASSAGE,
   KEY_CONDITIONS_SENSOR_TYPE,
   KEY_CONDITIONS_TYPE,
   KEY_CONDITIONS_MIN,
@@ -139,7 +141,7 @@ enum _function
   FUNCTION_RGBW_RED,
   FUNCTION_RGBW_GREEN,
   FUNCTION_RGBW_BLUE,
-  FUNCTION_RGBW_BRIGHTNESS,
+  FUNCTION_RGBW_BRIGHTNESS
 };
 
 enum _e_onfig
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index b9d8fa6f..bb1c8f91 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -101,7 +101,13 @@ void addRelayButton(uint8_t nr) {
       auto pushover =
           new Supla::Control::Pushover(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), true);
       pushover->setTitle(ConfigManager->get(KEY_HOST_NAME)->getValue());
-      pushover->setMessage(String("Przekaźnik " + String(size + 1) + " - ZAŁĄCZONY").c_str());
+
+      if (size <= MAX_PUSHOVER_MESSAGE) {
+        pushover->setMessage(ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(size).c_str());
+      }
+      else {
+        pushover->setMessage(String("Przekaźnik " + String(size + 1) + " - ZAŁĄCZONY").c_str());
+      }
       relay[size]->addAction(Pushover::SEND_NOTIF_1, pushover, Supla::ON_TURN_ON);
     }
 #endif
@@ -219,17 +225,11 @@ void addRGBWLeds(uint8_t nr) {
   int redPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_RED);
   int greenPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_GREEN);
   int bluePin = ConfigESP->getGpio(nr, FUNCTION_RGBW_BLUE);
-  int colorBrightnessPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_COLOR_BRIGHTNESS);
   int brightnessPin = ConfigESP->getGpio(nr, FUNCTION_RGBW_BRIGHTNESS);
   int buttonPin = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
 
-  if (redPin != OFF_GPIO && greenPin != OFF_GPIO && bluePin != OFF_GPIO && colorBrightnessPin != OFF_GPIO && brightnessPin != OFF_GPIO) {
-    Serial.println(redPin);
-    Serial.println(greenPin);
-    Serial.println(bluePin);
-    Serial.println(colorBrightnessPin);
-    Serial.println(colorBrightnessPin);
-    auto rgbw = new Supla::Control::RGBWLeds(redPin, greenPin, bluePin, colorBrightnessPin, brightnessPin);
+  if (redPin != OFF_GPIO && greenPin != OFF_GPIO && bluePin != OFF_GPIO && brightnessPin != OFF_GPIO) {
+    auto rgbw = new Supla::Control::RGBWLeds(redPin, greenPin, bluePin, brightnessPin);
 
     if (buttonPin != OFF_GPIO) {
       auto button = new Supla::Control::Button(buttonPin, true, true);
@@ -241,8 +241,8 @@ void addRGBWLeds(uint8_t nr) {
       button->addAction(Supla::TOGGLE, rgbw, Supla::ON_CLICK_1);
     }
   }
-  else if (redPin != OFF_GPIO && greenPin != OFF_GPIO && bluePin != OFF_GPIO && colorBrightnessPin != OFF_GPIO) {
-    auto rgbw = new Supla::Control::RGBLeds(redPin, greenPin, bluePin, colorBrightnessPin);
+  else if (redPin != OFF_GPIO && greenPin != OFF_GPIO && bluePin != OFF_GPIO) {
+    auto rgbw = new Supla::Control::RGBLeds(redPin, greenPin, bluePin);
 
     if (buttonPin != OFF_GPIO) {
       auto button = new Supla::Control::Button(buttonPin, true, true);
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 6e1eaf8e..4c81bc2b 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -45,19 +45,18 @@ void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
 }
 #endif
 
-void addRGBW(int8_t redPin, int8_t greenPin, int8_t bluePin, int8_t colorBrightnessPin, int8_t brightnessPin) {
+void addRGBW(int8_t redPin, int8_t greenPin, int8_t bluePin, int8_t brightnessPin) {
   uint8_t nr = ConfigManager->get(KEY_MAX_RGBW)->getValueInt();
   nr++;
   ConfigESP->setGpio(redPin, nr, FUNCTION_RGBW_RED, 0);
   ConfigESP->setGpio(greenPin, nr, FUNCTION_RGBW_GREEN, 0);
   ConfigESP->setGpio(bluePin, nr, FUNCTION_RGBW_BLUE, 0);
-  ConfigESP->setGpio(colorBrightnessPin, nr, FUNCTION_RGBW_COLOR_BRIGHTNESS, 0);
   ConfigESP->setGpio(brightnessPin, nr, FUNCTION_RGBW_BRIGHTNESS, 0);
   ConfigManager->set(KEY_MAX_RGBW, nr++);
 }
 
 void addDimmer(int8_t brightnessPin) {
-  addRGBW(OFF_GPIO, OFF_GPIO, OFF_GPIO, OFF_GPIO, brightnessPin);
+  addRGBW(OFF_GPIO, OFF_GPIO, OFF_GPIO, brightnessPin);
 }
 
 void chooseTemplateBoard(uint8_t board) {
diff --git a/src/SuplaTemplateBoard.h b/src/SuplaTemplateBoard.h
index 13615782..0868b8c1 100644
--- a/src/SuplaTemplateBoard.h
+++ b/src/SuplaTemplateBoard.h
@@ -12,7 +12,7 @@ void addLedCFG(uint8_t gpio, uint8_t level = HIGH);
 void addLed(uint8_t gpio);
 void addButtonCFG(uint8_t gpio);
 void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL);
-void addRGBW(int8_t redPin, int8_t greenPin, int8_t bluePin, int8_t colorBrightnessPin, int8_t brightnessPin);
+void addRGBW(int8_t redPin, int8_t greenPin, int8_t bluePin, int8_t brightnessPin);
 void addDimmer(int8_t brightnessPin);
 
 enum _board
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 843a3a3b..64b5c9f0 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -71,8 +71,7 @@ void handleOtherSave() {
     if (!WebServer->saveGPIO(INPUT_RGBW_RED, FUNCTION_RGBW_RED, nr, INPUT_RGBW_MAX) ||
         !WebServer->saveGPIO(INPUT_RGBW_GREEN, FUNCTION_RGBW_GREEN, nr, INPUT_RGBW_MAX) ||
         !WebServer->saveGPIO(INPUT_RGBW_BLUE, FUNCTION_RGBW_BLUE, nr, INPUT_RGBW_MAX) ||
-        !WebServer->saveGPIO(INPUT_RGBW_BRIGHTNESS, FUNCTION_RGBW_BRIGHTNESS, nr, INPUT_RGBW_MAX) ||
-        !WebServer->saveGPIO(INPUT_RGBW_COLOR_BRIGHTNESS, FUNCTION_RGBW_COLOR_BRIGHTNESS, nr, INPUT_RGBW_MAX)) {
+        !WebServer->saveGPIO(INPUT_RGBW_BRIGHTNESS, FUNCTION_RGBW_BRIGHTNESS, nr, INPUT_RGBW_MAX)) {
       suplaWebPageOther(6);
       return;
     }
@@ -152,13 +151,12 @@ void suplaWebPageOther(int save) {
     addListGPIOBox(webContentBuffer, INPUT_RGBW_GREEN, F("GREEN"), FUNCTION_RGBW_GREEN, nr, false);
     addListGPIOBox(webContentBuffer, INPUT_RGBW_BLUE, F("BLUE"), FUNCTION_RGBW_BLUE, nr, false);
     addListGPIOBox(webContentBuffer, INPUT_RGBW_BRIGHTNESS, F("WHITE / DIMMER"), FUNCTION_RGBW_BRIGHTNESS, nr, false);
-    addListGPIOBox(webContentBuffer, INPUT_RGBW_COLOR_BRIGHTNESS, F("BRIGHTNESS"), FUNCTION_RGBW_COLOR_BRIGHTNESS, nr);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #if defined(SUPLA_PUSHOVER)
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " PUSHOVER");
+  addFormHeader(webContentBuffer, String(S_SETTING_FOR) + " PUSHOVER");
   addTextBox(webContentBuffer, INPUT_PUSHOVER_TOKEN, F("Token"), KEY_PUSHOVER_TOKEN, 0, MAX_TOKEN_SIZE, false);
   addTextBox(webContentBuffer, INPUT_PUSHOVER_USER, F("Users"), KEY_PUSHOVER_USER, 0, MAX_USER_SIZE, false);
   addFormHeaderEnd(webContentBuffer);
diff --git a/src/language/pl.h b/src/language/pl.h
index 87d13285..c82bea30 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -2,6 +2,7 @@
 #ifndef _LANGUAGE_PL_S_H_
 #define _LANGUAGE_PL_S_H_
 
+#define S_SETTING_FOR                                          "Ustawienia dla"
 #define S_SETTING_WIFI_SSID                                    "Ustawienia WIFI"
 #define S_WIFI_SSID                                            "Nazwa sieci"
 #define S_WIFI_PASS                                            "Hasło"

From 3bfbeffbcd136f303717752c43e67fcc564f0a65 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 10 Feb 2021 07:12:21 +0100
Subject: [PATCH 064/165] aktualizacja SuplaDevice

---
 lib/SuplaDevice/src/supla/control/button.cpp  |  16 ++-
 lib/SuplaDevice/src/supla/control/button.h    |   4 +-
 .../src/supla/control/dimmer_base.cpp         |   4 +
 .../src/supla/control/dimmer_base.h           |   5 +-
 .../src/supla/control/dimmer_leds.cpp         |  70 ++++++++++++
 .../src/supla/control/dimmer_leds.h           |  44 ++++++++
 .../src/supla/control/rgb_base.cpp            |  61 ++++++++++
 lib/SuplaDevice/src/supla/control/rgb_base.h  |  12 +-
 .../src/supla/control/rgb_leds.cpp            |  95 ++++++++++++++++
 lib/SuplaDevice/src/supla/control/rgb_leds.h  |  45 ++++++++
 .../src/supla/control/rgbw_base.cpp           |  13 ++-
 lib/SuplaDevice/src/supla/control/rgbw_base.h |   8 +-
 .../src/supla/control/rgbw_leds.cpp           | 105 ++++++++++++++++++
 lib/SuplaDevice/src/supla/control/rgbw_leds.h |  49 ++++++++
 .../src/supla/control/roller_shutter.cpp      |   4 +-
 15 files changed, 509 insertions(+), 26 deletions(-)
 create mode 100644 lib/SuplaDevice/src/supla/control/dimmer_leds.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/dimmer_leds.h
 create mode 100644 lib/SuplaDevice/src/supla/control/rgb_base.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/rgb_leds.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/rgb_leds.h
 create mode 100644 lib/SuplaDevice/src/supla/control/rgbw_leds.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/rgbw_leds.h

diff --git a/lib/SuplaDevice/src/supla/control/button.cpp b/lib/SuplaDevice/src/supla/control/button.cpp
index 8fcb294e..9971de8c 100644
--- a/lib/SuplaDevice/src/supla/control/button.cpp
+++ b/lib/SuplaDevice/src/supla/control/button.cpp
@@ -20,10 +20,11 @@
 Supla::Control::Button::Button(int pin, bool pullUp, bool invertLogic)
     : SimpleButton(pin, pullUp, invertLogic),
       holdTimeMs(0),
+      repeatOnHoldMs(0),
       multiclickTimeMs(0),
       lastStateChangeMs(0),
       clickCounter(0),
-      holdSend(false),
+      holdSend(0),
       bistable(false) {
 }
 
@@ -50,17 +51,17 @@ void Supla::Control::Button::onTimer() {
 
   if (!stateChanged) {
     if (!bistable && stateResult == PRESSED) {
-      if (clickCounter <= 1 && holdTimeMs > 0 && timeDelta > holdTimeMs && !holdSend) {
+      if (clickCounter <= 1 && holdTimeMs > 0 && timeDelta > (holdTimeMs + holdSend*repeatOnHoldMs) && (repeatOnHoldMs == 0 ? !holdSend : true)) {
         runAction(ON_HOLD);
-        holdSend = true;
+        ++holdSend;
       }
     } else if (clickCounter > 0 && (bistable || stateResult == RELEASED)) {
       if (multiclickTimeMs == 0) {
-        holdSend = false;
+        holdSend = 0;
         clickCounter = 0;
       }
       if (multiclickTimeMs > 0 && timeDelta > multiclickTimeMs) {
-        if (!holdSend) {
+        if (holdSend == 0) {
           switch (clickCounter) {
             case 1:
               runAction(ON_CLICK_1);
@@ -97,7 +98,7 @@ void Supla::Control::Button::onTimer() {
             runAction(ON_CRAZY_CLICKER);
           }
         } 
-        holdSend = false;
+        holdSend = 0;
         clickCounter = 0;
       }
     }
@@ -119,3 +120,6 @@ void Supla::Control::Button::setMulticlickTime(unsigned int timeMs, bool bistabl
   }
 }
 
+void Supla::Control::Button::repeatOnHoldEvery(unsigned int timeMs) {
+  repeatOnHoldMs = timeMs;
+}
diff --git a/lib/SuplaDevice/src/supla/control/button.h b/lib/SuplaDevice/src/supla/control/button.h
index a48328d5..ba31ab58 100644
--- a/lib/SuplaDevice/src/supla/control/button.h
+++ b/lib/SuplaDevice/src/supla/control/button.h
@@ -29,14 +29,16 @@ class Button : public SimpleButton {
 
   void onTimer();
   void setHoldTime(unsigned int timeMs);
+  void repeatOnHoldEvery(unsigned int timeMs);
   void setMulticlickTime(unsigned int timeMs, bool bistableButton = false);
 
  protected:
   unsigned int holdTimeMs;
+  unsigned int repeatOnHoldMs;
   unsigned int multiclickTimeMs;
   unsigned long lastStateChangeMs;
   uint8_t clickCounter;
-  bool holdSend;
+  unsigned int holdSend;
   bool bistable;
 };
 
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_base.cpp b/lib/SuplaDevice/src/supla/control/dimmer_base.cpp
index 5c01e57b..88f6f1e6 100644
--- a/lib/SuplaDevice/src/supla/control/dimmer_base.cpp
+++ b/lib/SuplaDevice/src/supla/control/dimmer_base.cpp
@@ -42,3 +42,7 @@ void Supla::Control::DimmerBase::onSaveState() {
                              sizeof(curBrightness));
   Supla::Storage::WriteState((unsigned char *)&lastBrightness, sizeof(lastBrightness));
 }
+
+void Supla::Control::DimmerBase::iterateDimmerRGBW(int rgbStep, int wStep) {
+  Supla::Control::RGBWBase::iterateDimmerRGBW(0, wStep);
+}
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_base.h b/lib/SuplaDevice/src/supla/control/dimmer_base.h
index 5f6f5814..29b665c0 100644
--- a/lib/SuplaDevice/src/supla/control/dimmer_base.h
+++ b/lib/SuplaDevice/src/supla/control/dimmer_base.h
@@ -31,11 +31,14 @@ class DimmerBase : public RGBWBase {
                int blue,
                int colorBrightness,
                int brightness,
-               bool toggle);
+               bool toggle = false);
 
   void onLoadState();
   void onSaveState();
   
+ protected:
+  virtual void iterateDimmerRGBW(int rgbStep, int wStep);
+
 };
 
 };  // namespace Control
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_leds.cpp b/lib/SuplaDevice/src/supla/control/dimmer_leds.cpp
new file mode 100644
index 00000000..13781eb1
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/dimmer_leds.cpp
@@ -0,0 +1,70 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "dimmer_leds.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+extern int esp32PwmChannelCouner;
+#endif
+
+Supla::Control::DimmerLeds::DimmerLeds(int brightnessPin)
+    : brightnessPin(brightnessPin) {
+}
+
+void Supla::Control::DimmerLeds::setRGBWValueOnDevice(uint8_t red,
+                                                      uint8_t green,
+                                                      uint8_t blue,
+                                                      uint8_t colorBrightness,
+                                                      uint8_t brightness) {
+  int multiplier = 1;
+#ifdef ARDUINO_ARCH_ESP8266
+  multiplier = 4;
+#endif
+#ifdef ARDUINO_ARCH_ESP32
+  multiplier = 4;
+#endif
+
+  int brightnessAdj = brightness * multiplier * 255 / 100;
+#ifdef ARDUINO_ARCH_ESP32
+  ledcWrite(brightnessPin, brightnessAdj);
+#else
+  analogWrite(brightnessPin, brightnessAdj);
+#endif
+}
+
+void Supla::Control::DimmerLeds::onInit() {
+#ifdef ARDUINO_ARCH_ESP32
+  Serial.print(F("Dimmer: attaching pin "));
+  Serial.print(brightnessPin);
+  Serial.print(F(" to PWM channel: "));
+  Serial.println(esp32PwmChannelCouner);
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(brightnessPin, esp32PwmChannelCouner);
+  // on ESP32 we write to PWM channels instead of pins, so we copy channel
+  // number as pin in order to reuse variable
+  brightnessPin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+#else
+  pinMode(brightnessPin, OUTPUT);
+
+#ifdef ARDUINO_ARCH_ESP8266
+  analogWriteRange(1024);
+#endif
+#endif
+
+  Supla::Control::DimmerBase::onInit();
+}
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_leds.h b/lib/SuplaDevice/src/supla/control/dimmer_leds.h
new file mode 100644
index 00000000..7fed3d48
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/dimmer_leds.h
@@ -0,0 +1,44 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef __dimmer_leds_h
+#define __dimmer_leds_h
+
+#include "dimmer_base.h"
+
+namespace Supla {
+namespace Control {
+class DimmerLeds : public DimmerBase {
+ public:
+  DimmerLeds(int brightnessPin);
+
+  void setRGBWValueOnDevice(uint8_t red,
+                            uint8_t green,
+                            uint8_t blue,
+                            uint8_t colorBrightness,
+                            uint8_t brightness);
+
+  void onInit();
+
+ protected:
+  int brightnessPin;
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
+
diff --git a/lib/SuplaDevice/src/supla/control/rgb_base.cpp b/lib/SuplaDevice/src/supla/control/rgb_base.cpp
new file mode 100644
index 00000000..9869e5a1
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/rgb_base.cpp
@@ -0,0 +1,61 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "rgb_base.h"
+#include "../storage/storage.h"
+
+Supla::Control::RGBBase::RGBBase() {
+  channel.setType(SUPLA_CHANNELTYPE_RGBLEDCONTROLLER);
+  channel.setDefault(SUPLA_CHANNELFNC_RGBLIGHTING);
+}
+
+void Supla::Control::RGBBase::setRGBW(int red,
+                                      int green,
+                                      int blue,
+                                      int colorBrightness,
+                                      int brightness,
+                                      bool toggle) {
+  Supla::Control::RGBWBase::setRGBW(
+      red, green, blue, colorBrightness, 0, toggle);
+}
+
+void Supla::Control::RGBBase::onSaveState() {
+  /*
+  uint8_t curRed;                   // 0 - 255
+  uint8_t curGreen;                 // 0 - 255
+  uint8_t curBlue;                  // 0 - 255
+  uint8_t curColorBrightness;       // 0 - 100
+  uint8_t lastColorBrightness;      // 0 - 100
+  */
+  Supla::Storage::WriteState((unsigned char *)&curRed, sizeof(curRed));
+  Supla::Storage::WriteState((unsigned char *)&curGreen, sizeof(curGreen));
+  Supla::Storage::WriteState((unsigned char *)&curBlue, sizeof(curBlue));
+  Supla::Storage::WriteState((unsigned char *)&curColorBrightness,
+                             sizeof(curColorBrightness));
+  Supla::Storage::WriteState((unsigned char *)&lastColorBrightness,
+                             sizeof(lastColorBrightness));
+}
+
+void Supla::Control::RGBBase::onLoadState() {
+  Supla::Storage::ReadState((unsigned char *)&curRed, sizeof(curRed));
+  Supla::Storage::ReadState((unsigned char *)&curGreen, sizeof(curGreen));
+  Supla::Storage::ReadState((unsigned char *)&curBlue, sizeof(curBlue));
+  Supla::Storage::ReadState((unsigned char *)&curColorBrightness,
+                             sizeof(curColorBrightness));
+  Supla::Storage::ReadState((unsigned char *)&lastColorBrightness,
+                             sizeof(lastColorBrightness));
+}
+
diff --git a/lib/SuplaDevice/src/supla/control/rgb_base.h b/lib/SuplaDevice/src/supla/control/rgb_base.h
index 75afb29e..2bc534d9 100644
--- a/lib/SuplaDevice/src/supla/control/rgb_base.h
+++ b/lib/SuplaDevice/src/supla/control/rgb_base.h
@@ -23,20 +23,16 @@ namespace Supla {
 namespace Control {
 class RGBBase : public RGBWBase {
  public:
-  RGBBase() {
-    channel.setType(SUPLA_CHANNELTYPE_RGBLEDCONTROLLER);
-    channel.setDefault(SUPLA_CHANNELFNC_RGBLIGHTING);
-  }
-
+  RGBBase();
   void setRGBW(int red,
                int green,
                int blue,
                int colorBrightness,
                int brightness,
-               bool toggle) {
-    RGBWBase::setRGBW(red, green, blue, colorBrightness, 0, toggle);
-  }
+               bool toggle = false);
 
+  void onLoadState();
+  void onSaveState();
 };
 
 };  // namespace Control
diff --git a/lib/SuplaDevice/src/supla/control/rgb_leds.cpp b/lib/SuplaDevice/src/supla/control/rgb_leds.cpp
new file mode 100644
index 00000000..b0ff0979
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/rgb_leds.cpp
@@ -0,0 +1,95 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "rgb_leds.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+extern int esp32PwmChannelCouner;
+#endif
+
+Supla::Control::RGBLeds::RGBLeds(int redPin,
+                                   int greenPin,
+                                   int bluePin)
+    : redPin(redPin),
+      greenPin(greenPin),
+      bluePin(bluePin)
+{}
+
+void Supla::Control::RGBLeds::setRGBWValueOnDevice(uint8_t red,
+                          uint8_t green,
+                          uint8_t blue,
+                          uint8_t colorBrightness,
+                          uint8_t brightness) {
+  int multiplier = 1;
+#ifdef ARDUINO_ARCH_ESP8266
+  multiplier = 4;
+#endif
+#ifdef ARDUINO_ARCH_ESP32
+  multiplier = 4;
+#endif
+
+  int redAdj = red * multiplier * colorBrightness / 100;
+  int greenAdj = green* multiplier * colorBrightness / 100;
+  int blueAdj = blue * multiplier * colorBrightness / 100;
+
+#ifdef ARDUINO_ARCH_ESP32
+  ledcWrite(redPin, redAdj);
+  ledcWrite(greenPin, greenAdj);
+  ledcWrite(bluePin, blueAdj);
+#else
+  analogWrite(redPin, redAdj);
+  analogWrite(greenPin, greenAdj);
+  analogWrite(bluePin, blueAdj);
+#endif
+}
+
+void Supla::Control::RGBLeds::onInit() {
+#ifdef ARDUINO_ARCH_ESP32
+  Serial.print(F("RGB: attaching pin "));
+  Serial.print(redPin);
+  Serial.print(F(" to PWM channel: "));
+  Serial.println(esp32PwmChannelCouner);
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(redPin, esp32PwmChannelCouner);
+  // on ESP32 we write to PWM channels instead of pins, so we copy channel
+  // number as pin in order to reuse variable
+  redPin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(greenPin, esp32PwmChannelCouner);
+  greenPin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(bluePin, esp32PwmChannelCouner);
+  bluePin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+
+#else
+  pinMode(redPin, OUTPUT); 
+  pinMode(greenPin, OUTPUT); 
+  pinMode(bluePin, OUTPUT); 
+
+ #ifdef ARDUINO_ARCH_ESP8266
+  analogWriteRange(1024);
+ #endif 
+#endif
+
+  Supla::Control::RGBBase::onInit();
+}
+
diff --git a/lib/SuplaDevice/src/supla/control/rgb_leds.h b/lib/SuplaDevice/src/supla/control/rgb_leds.h
new file mode 100644
index 00000000..372052c5
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/rgb_leds.h
@@ -0,0 +1,45 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef __rgb_leds_h
+#define __rgb_leds_h
+
+#include "rgb_base.h"
+
+namespace Supla {
+namespace Control {
+class RGBLeds : public RGBBase {
+ public:
+  RGBLeds(int redPin, int greenPin, int bluePin);
+
+  void setRGBWValueOnDevice(uint8_t red,
+                            uint8_t green,
+                            uint8_t blue,
+                            uint8_t colorBrightness,
+                            uint8_t brightness);
+
+  void onInit();
+
+ protected:
+  int redPin;
+  int greenPin;
+  int bluePin;
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
index 4f2845ff..1fc96361 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
@@ -24,11 +24,16 @@
 #define RGBW_STATE_ON_INIT_OFF 0
 #define RGBW_STATE_ON_INIT_ON 1
 
+#ifdef ARDUINO_ARCH_ESP32
+  int esp32PwmChannelCouner = 0;
+#endif
+
+
 namespace Supla {
 namespace Control {
 
 RGBWBase::RGBWBase()
-    : buttonStep(10),
+    : buttonStep(5),
       curRed(0),
       curGreen(255),
       curBlue(0),
@@ -39,7 +44,7 @@ RGBWBase::RGBWBase()
       defaultDimmedBrightness(20),
       dimIterationDirection(false),
       iterationDelayCounter(0),
-      fadeEffect(1000),
+      fadeEffect(500),
       hwRed(0),
       hwGreen(0),
       hwBlue(0),
@@ -47,7 +52,7 @@ RGBWBase::RGBWBase()
       hwBrightness(0),
       lastTick(0),
       lastMsgReceivedMs(0),
-      stateOnInit(RGBW_STATE_ON_INIT_OFF) {
+      stateOnInit(RGBW_STATE_ON_INIT_RESTORE) {
   channel.setType(SUPLA_CHANNELTYPE_DIMMERANDRGBLED);
   channel.setDefault(SUPLA_CHANNELFNC_DIMMERANDRGBLIGHTING);
 }
@@ -57,7 +62,7 @@ void RGBWBase::setRGBW(int red,
                        int blue,
                        int colorBrightness,
                        int brightness,
-                       bool toggle = false) {
+                       bool toggle) {
   if (toggle) {
     lastMsgReceivedMs = 1;
   } else {
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.h b/lib/SuplaDevice/src/supla/control/rgbw_base.h
index 5ab19fd7..5f3790fd 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.h
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.h
@@ -41,7 +41,7 @@ class RGBWBase : public ChannelElement, public ActionHandler {
                        int blue,
                        int colorBrightness,
                        int brightness,
-                       bool toggle);
+                       bool toggle = false);
 
   int handleNewValueFromServer(TSD_SuplaChannelNewValue *newValue);
   virtual void turnOn();
@@ -51,10 +51,10 @@ class RGBWBase : public ChannelElement, public ActionHandler {
   void setStep(int step);
   void setDefaultDimmedBrightness(int dimmedBrightness);
   void setFadeEffectTime(int timeMs);
-  void onTimer();
-  void iterateAlways();
 
   void onInit();
+  void iterateAlways();
+  void onTimer();
   void onLoadState();
   void onSaveState();
 
@@ -64,7 +64,7 @@ class RGBWBase : public ChannelElement, public ActionHandler {
 
  protected:
   uint8_t addWithLimit(int value, int addition, int limit = 255);
-  void iterateDimmerRGBW(int rgbStep, int wStep);
+  virtual void iterateDimmerRGBW(int rgbStep, int wStep);
 
   uint8_t buttonStep;               // 10
   uint8_t curRed;                   // 0 - 255
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_leds.cpp b/lib/SuplaDevice/src/supla/control/rgbw_leds.cpp
new file mode 100644
index 00000000..1e11a112
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/rgbw_leds.cpp
@@ -0,0 +1,105 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "rgbw_leds.h"
+#include <Arduino.h>
+
+#ifdef ARDUINO_ARCH_ESP32
+extern int esp32PwmChannelCouner;
+#endif
+
+Supla::Control::RGBWLeds::RGBWLeds(int redPin,
+                                   int greenPin,
+                                   int bluePin,
+                                   int brightnessPin)
+    : redPin(redPin),
+      greenPin(greenPin),
+      bluePin(bluePin),
+      brightnessPin(brightnessPin) {
+}
+
+void Supla::Control::RGBWLeds::setRGBWValueOnDevice(uint8_t red,
+                          uint8_t green,
+                          uint8_t blue,
+                          uint8_t colorBrightness,
+                          uint8_t brightness) {
+  int multiplier = 1;
+#ifdef ARDUINO_ARCH_ESP8266
+  multiplier = 4;
+#endif
+#ifdef ARDUINO_ARCH_ESP32
+  multiplier = 4;
+#endif
+
+  int redAdj = red * multiplier * colorBrightness / 100;
+  int greenAdj = green* multiplier * colorBrightness / 100;
+  int blueAdj = blue * multiplier * colorBrightness / 100;
+  int brightnessAdj = brightness * multiplier * 255 / 100;
+#ifdef ARDUINO_ARCH_ESP32
+  ledcWrite(redPin, redAdj);
+  ledcWrite(greenPin, greenAdj);
+  ledcWrite(bluePin, blueAdj);
+  ledcWrite(brightnessPin, brightnessAdj);
+#else
+  analogWrite(redPin, redAdj);
+  analogWrite(greenPin, greenAdj);
+  analogWrite(bluePin, blueAdj);
+  analogWrite(brightnessPin, brightnessAdj);
+#endif
+}
+
+void Supla::Control::RGBWLeds::onInit() {
+#ifdef ARDUINO_ARCH_ESP32
+  Serial.print(F("RGBW: attaching pin "));
+  Serial.print(redPin);
+  Serial.print(F(" to PWM channel: "));
+  Serial.println(esp32PwmChannelCouner);
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(redPin, esp32PwmChannelCouner);
+  // on ESP32 we write to PWM channels instead of pins, so we copy channel
+  // number as pin in order to reuse variable
+  redPin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(greenPin, esp32PwmChannelCouner);
+  greenPin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(bluePin, esp32PwmChannelCouner);
+  bluePin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+
+  ledcSetup(esp32PwmChannelCouner, 12000, 10);
+  ledcAttachPin(brightnessPin, esp32PwmChannelCouner);
+  brightnessPin = esp32PwmChannelCouner;
+  esp32PwmChannelCouner++;
+
+#else
+  pinMode(redPin, OUTPUT); 
+  pinMode(greenPin, OUTPUT); 
+  pinMode(bluePin, OUTPUT); 
+  pinMode(brightnessPin, OUTPUT); 
+
+ #ifdef ARDUINO_ARCH_ESP8266
+  analogWriteRange(1024);
+ #endif 
+#endif
+
+  Supla::Control::RGBWBase::onInit();
+}
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_leds.h b/lib/SuplaDevice/src/supla/control/rgbw_leds.h
new file mode 100644
index 00000000..9457afca
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/rgbw_leds.h
@@ -0,0 +1,49 @@
+/*
+Copyright (C) AC SOFTWARE SP. Z O.O.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef __rgbw_leds_h
+#define __rgbw_leds_h
+
+#include "rgbw_base.h"
+
+namespace Supla {
+namespace Control {
+class RGBWLeds : public RGBWBase {
+ public:
+  RGBWLeds(int redPin,
+           int greenPin,
+           int bluePin,
+           int brightnessPin);
+
+  void setRGBWValueOnDevice(uint8_t red,
+                            uint8_t green,
+                            uint8_t blue,
+                            uint8_t colorBrightness,
+                            uint8_t brightness);
+
+  void onInit();
+
+ protected:
+  int redPin;
+  int greenPin;
+  int bluePin;
+  int brightnessPin;
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
index 237b54aa..c249ef34 100644
--- a/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
+++ b/lib/SuplaDevice/src/supla/control/roller_shutter.cpp
@@ -392,7 +392,7 @@ void RollerShutter::onTimer() {
                               // just handle roller movement/status
     if (currentDirection == UP_DIR && currentPosition > 0) {
       int movementDistance = lastPositionBeforeMovement;
-      int timeRequired = (1.0 * openingTimeMs * movementDistance / 100.0);
+      uint32_t timeRequired = (1.0 * openingTimeMs * movementDistance / 100.0);
       float fractionOfMovemendDone =
           (1.0 * (millis() - lastMovementStartTime) / timeRequired);
       if (fractionOfMovemendDone > 1) {
@@ -405,7 +405,7 @@ void RollerShutter::onTimer() {
       }
     } else if (currentDirection == DOWN_DIR && currentPosition < 100) {
       int movementDistance = 100 - lastPositionBeforeMovement;
-      int timeRequired = (1.0 * closingTimeMs * movementDistance / 100.0);
+      uint32_t timeRequired = (1.0 * closingTimeMs * movementDistance / 100.0);
       float fractionOfMovemendDone =
           (1.0 * (millis() - lastMovementStartTime) / timeRequired);
       if (fractionOfMovemendDone > 1) {

From 0f4b57f01df24b4c1853f325b7d43880bbc13fd4 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 11 Feb 2021 19:33:54 +0100
Subject: [PATCH 065/165] dodanie szablonu H801

---
 src/SuplaTemplateBoard.cpp | 7 ++++++-
 src/SuplaTemplateBoard.h   | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 4c81bc2b..0d26cca0 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -65,7 +65,7 @@ void chooseTemplateBoard(uint8_t board) {
     key = KEY_GPIO + nr;
     ConfigManager->set(key, "");
   }
-  
+
   ConfigManager->set(KEY_MAX_BUTTON, "0");
   ConfigManager->set(KEY_MAX_RELAY, "0");
   ConfigManager->set(KEY_MAX_LIMIT_SWITCH, "0");
@@ -233,5 +233,10 @@ void chooseTemplateBoard(uint8_t board) {
       addButton(4);
       addButton(16);
       break;
+    case BOARD_H801:
+      addLedCFG(1);
+      addButtonCFG(0);
+      addRGBW(15, 13, 12, 4);
+      break;
   }
 }
diff --git a/src/SuplaTemplateBoard.h b/src/SuplaTemplateBoard.h
index 0868b8c1..99b1bd4f 100644
--- a/src/SuplaTemplateBoard.h
+++ b/src/SuplaTemplateBoard.h
@@ -37,6 +37,7 @@ enum _board
   BOARD_YUNTONG_SMART,
   BOARD_GOSUND_SP111,
   BOARD_DIMMER_LUKASZH,
+  BOARD_H801,
   MAX_MODULE
 };
 
@@ -61,10 +62,12 @@ const char YUNSHAN[] PROGMEM = "Yunshan";
 const char YUNTONG_SMART[] PROGMEM = "YUNTONG Smart";
 const char GOSUNG_SP111[] PROGMEM = "Gosund SP111";
 const char DRIMMER_LUKASZH[] PROGMEM = "Dimmer by @LukaszH";
+const char H801[] PROGMEM = "H801 RGBW";
+const char SONOFF_MINI[] PROGMEM = "SONOFF Mini";
 
 const char* const BOARD_P[MAX_MODULE] PROGMEM = {
     BOARD_NULL, ELECTRODRAGON, INCAN3,    INCAN4,       MELINK,           NEO_COOLCAM,      SHELLY1,    SHELLY2, SONOFF_BASIC,  SONOFF_DUAL_R2,
-    SONOFF_S2X, SONOFF_SV,     SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHAN, YUNTONG_SMART, GOSUNG_SP111, DRIMMER_LUKASZH};
+    SONOFF_S2X, SONOFF_SV,     SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHAN, YUNTONG_SMART, GOSUNG_SP111, DRIMMER_LUKASZH, H801};
 
 void chooseTemplateBoard(uint8_t board);
 

From ee5e4296e2564e839060013dd52af8753cad8bb8 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 11 Feb 2021 19:34:48 +0100
Subject: [PATCH 066/165] GUI_Generic_1M_ver1.2.5

---
 lib/SuplaDevice/src/supla/sensor/HC_SR04.cpp  | 111 ++++++++++++++++++
 lib/SuplaDevice/src/supla/sensor/HC_SR04.h    |  74 +++---------
 .../src/supla/sensor/HC_SR04_NewPing.h        |  71 +++++++++++
 .../{MAX6675_K.cpp => MAXThermocouple.cpp}    |  58 +++++----
 .../sensor/{MAX6675_K.h => MAXThermocouple.h} |  12 +-
 platformio.ini                                |   2 +-
 src/GUI-Generic.ino                           |   9 +-
 src/SuplaDeviceGUI.h                          |   2 +-
 src/SuplaWebPageControl.cpp                   |   8 +-
 src/SuplaWebPageOther.cpp                     |  13 +-
 src/SuplaWebPageRelay.cpp                     |   8 +-
 src/SuplaWebPageSensor.cpp                    |   2 +-
 12 files changed, 271 insertions(+), 99 deletions(-)
 create mode 100644 lib/SuplaDevice/src/supla/sensor/HC_SR04.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/HC_SR04_NewPing.h
 rename lib/SuplaDevice/src/supla/sensor/{MAX6675_K.cpp => MAXThermocouple.cpp} (55%)
 rename lib/SuplaDevice/src/supla/sensor/{MAX6675_K.h => MAXThermocouple.h} (83%)

diff --git a/lib/SuplaDevice/src/supla/sensor/HC_SR04.cpp b/lib/SuplaDevice/src/supla/sensor/HC_SR04.cpp
new file mode 100644
index 00000000..4639556c
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/HC_SR04.cpp
@@ -0,0 +1,111 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <Arduino.h>
+
+#include "HC_SR04.h"
+
+namespace Supla {
+namespace Sensor {
+HC_SR04::HC_SR04(int8_t trigPin,
+                 int8_t echoPin,
+                 int16_t minIn,
+                 int16_t maxIn,
+                 int16_t minOut,
+                 int16_t maxOut)
+    : failCount(0), readouts{}, index(0) {
+  _trigPin = trigPin;
+  _echoPin = echoPin;
+  _minIn = minIn;
+  _maxIn = maxIn;
+  _minOut = minOut;
+  _maxOut = maxOut;
+}
+
+void HC_SR04::onInit() {
+  pinMode(_trigPin, OUTPUT);
+  pinMode(_echoPin, INPUT);
+  digitalWrite(_trigPin, LOW);
+  delayMicroseconds(2);
+
+  channel.setNewValue(getValue());
+  channel.setNewValue(getValue());
+}
+
+double HC_SR04::getValue() {
+  noInterrupts();
+  digitalWrite(_trigPin, HIGH);
+  delayMicroseconds(10);
+  digitalWrite(_trigPin, LOW);
+  unsigned long duration = pulseIn(_echoPin, HIGH, 60000);
+  interrupts();
+  if (duration > 50) {
+    index++;
+    if (index > 4) index = 0;
+    readouts[index] = duration;
+    failCount = 0;
+  } else {
+    failCount++;
+  }
+
+  unsigned long min = 0, max = 0, sum = 0;
+  int count = 0;
+  for (int i = 0; i < 5; i++) {
+    if (readouts[i] > 0) {
+      count++;
+      if (min > readouts[i] || min == 0) min = readouts[i];
+      if (max < readouts[i]) max = readouts[i];
+      sum += readouts[i];
+    }
+  }
+
+  if (count == 5) {
+    if (min > 0) {
+      sum -= min;
+      count--;
+    }
+    if (max > 0) {
+      sum -= max;
+      count--;
+    }
+  }
+  if (count > 0) {
+    duration = sum / count;
+  } 
+
+  long distance = (duration / 2.0) / 29.1;
+  long value = map(distance, _minIn, _maxIn, _minOut, _maxOut);
+  if (_minOut < _maxOut) {
+    value = constrain(value, _minOut, _maxOut);
+  } else {
+    value = constrain(value, _maxOut, _minOut);
+  }
+  return failCount <= 3 ? static_cast<double>(value) / 100.0
+                        : DISTANCE_NOT_AVAILABLE;
+}
+
+void HC_SR04::setMinMaxIn(int16_t minIn, int16_t maxIn) {
+  _minIn = minIn;
+  _maxIn = maxIn;
+}
+
+void HC_SR04::setMinMaxOut(int16_t minOut, int16_t maxOut) {
+  _minOut = minOut;
+  _maxOut = maxOut;
+}
+
+};  // namespace Sensor
+};  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/sensor/HC_SR04.h b/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
index ecd9ea1f..2f222ee8 100644
--- a/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
+++ b/lib/SuplaDevice/src/supla/sensor/HC_SR04.h
@@ -26,60 +26,18 @@ namespace Supla {
 namespace Sensor {
 class HC_SR04 : public Distance {
  public:
-  HC_SR04(int8_t trigPin, int8_t echoPin, int16_t minIn = 0,
-          int16_t maxIn = 500, int16_t minOut = 0, int16_t maxOut = 500)
-      : failCount(0), lastDuration(0) {
-    _trigPin = trigPin;
-    _echoPin = echoPin;
-    _minIn = minIn;
-    _maxIn = maxIn;
-    _minOut = minOut;
-    _maxOut = maxOut;
-  }
-  void onInit() {
-    pinMode(_trigPin, OUTPUT);
-    pinMode(_echoPin, INPUT);
-    digitalWrite(_trigPin, LOW);
-    delayMicroseconds(2);
-
-    channel.setNewValue(getValue());
-    channel.setNewValue(getValue());
-  }
-
-  virtual double getValue() {
-    digitalWrite(_trigPin, HIGH);
-    delayMicroseconds(10);
-    digitalWrite(_trigPin, LOW);
-    unsigned long duration = pulseIn(_echoPin, HIGH, 60000);
-    if (duration > 50) {
-      lastDuration = duration;
-      failCount = 0;
-    } else {
-      duration = lastDuration;
-      failCount++;
-    }
-
-    long distance = (duration / 2.0) / 29.1;
-    long value = map(distance, _minIn, _maxIn, _minOut, _maxOut);
-    if (_minOut < _maxOut) {
-      value = constrain(value, _minOut, _maxOut);
-    } else {
-      value = constrain(value, _maxOut, _minOut);
-    }
-    return failCount <= 3 ? (float)value / 100.0 : DISTANCE_NOT_AVAILABLE;
-  }
-
-  void setMinMaxIn(int16_t minIn, int16_t maxIn) {
-    _minIn = minIn;
-    _maxIn = maxIn;
-  }
-
-  void setMinMaxOut(int16_t minOut, int16_t maxOut) {
-    _minOut = minOut;
-    _maxOut = maxOut;
-  }
-
-protected:
+  HC_SR04(int8_t trigPin,
+          int8_t echoPin,
+          int16_t minIn = 0,
+          int16_t maxIn = 500,
+          int16_t minOut = 0,
+          int16_t maxOut = 500);
+  void onInit();
+  virtual double getValue();
+  void setMinMaxIn(int16_t minIn, int16_t maxIn);
+  void setMinMaxOut(int16_t minOut, int16_t maxOut);
+
+ protected:
   int8_t _trigPin;
   int8_t _echoPin;
   int16_t _minIn;
@@ -87,11 +45,11 @@ class HC_SR04 : public Distance {
   int16_t _minOut;
   int16_t _maxOut;
   char failCount;
-  bool ready;
-  unsigned long lastDuration;
+  unsigned long readouts[5];
+  int index;
 };
 
-}; // namespace Sensor
-}; // namespace Supla
+};  // namespace Sensor
+};  // namespace Supla
 
 #endif
diff --git a/lib/SuplaDevice/src/supla/sensor/HC_SR04_NewPing.h b/lib/SuplaDevice/src/supla/sensor/HC_SR04_NewPing.h
new file mode 100644
index 00000000..8b664ffd
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/HC_SR04_NewPing.h
@@ -0,0 +1,71 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _hc_sr04_newping_h
+#define _hc_sr04_newping_h
+
+#include <NewPing.h>
+
+#include "supla/channel.h"
+#include "supla/sensor/distance.h"
+
+namespace Supla {
+namespace Sensor {
+class HC_SR04_NewPing : public Distance {
+ public:
+  HC_SR04_NewPing(int8_t trigPin, int8_t echoPin, int16_t depth = 0) : retryCount(0) {
+    _depth = depth;
+    sonar = new NewPing(trigPin, echoPin);
+  }
+  void onInit() {
+    channel.setNewValue(getValue());
+  }
+
+  virtual double getValue() {
+    unsigned long uS = sonar->ping_median();
+
+    if (uS < 50) {
+      retryCount++;
+      if (retryCount > 3) {
+        retryCount = 0;
+        value = DISTANCE_NOT_AVAILABLE;
+      }
+    } else {
+      retryCount = 0;
+      unsigned long distance = sonar->convert_cm(uS);
+
+      if (_depth > 0) {
+        value = map(distance, 0, _depth, _depth, 0);
+        if (value > _depth) value = 0;
+      } else {
+        value = distance;
+      }
+      value = value / 100.0;
+    }
+    return value;
+  }
+
+ protected:
+  NewPing *sonar = nullptr;
+  double value;
+  int16_t _depth;
+  int8_t retryCount;
+};
+
+};  // namespace Sensor
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp b/lib/SuplaDevice/src/supla/sensor/MAXThermocouple.cpp
similarity index 55%
rename from lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
rename to lib/SuplaDevice/src/supla/sensor/MAXThermocouple.cpp
index 4f610197..34d8eed8 100644
--- a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/MAXThermocouple.cpp
@@ -14,36 +14,54 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "MAX6675_K.h"
+#include "MAXThermocouple.h"
 
 namespace Supla {
 namespace Sensor {
-MAX6675_K::MAX6675_K(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO)
+MAXThermocouple::MAXThermocouple(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO)
     : pin_CLK(pin_CLK), pin_CS(pin_CS), pin_DO(pin_DO) {
 }
 
-double MAX6675_K::getValue() {
-  uint16_t value;
+double MAXThermocouple::getValue() {
+  int32_t value;
 
   digitalWrite(pin_CS, LOW);
   delay(1);
 
   value = spiRead();
-  value <<= 8;
-  value |= spiRead();
 
   digitalWrite(pin_CS, HIGH);
 
-  if (value & 0x4) {  // this means there is no probe connected to Max6675
-    Serial.print(F("no probe connected to Max6675"));
-    return TEMPERATURE_NOT_AVAILABLE;
-  }
-  value >>= 3;
+  if ((value >> 16) == (value & 0xffff)) {  // MAX6675
+    value >>= 16;
+
+    if ((value & 0x4) || (value <= 0)) {  // this means there is no probe connected to Max6675
+      Serial.println(F("Max6675 Error"));
+      return TEMPERATURE_NOT_AVAILABLE;
+    }
+    value >>= 3;
+
+    return (double)value * 0.25;
+
+  } else {  // MAX31855
 
-  return value * 0.25;
+    if (value & 0x7) {
+      Serial.println(F("Max31855 Error"));
+      return TEMPERATURE_NOT_AVAILABLE;
+    } else {
+      uint16_t _internTemp = (value >> 4) & 0xfff;
+
+      value >>= 18;
+      if (value & 0x2000) {  // is -
+        value |= 0xffffc000;
+      }
+
+      return (double)value * 0.25;
+    }
+  }
 }
 
-void MAX6675_K::onInit() {
+void MAXThermocouple::onInit() {
   digitalWrite(pin_CS, HIGH);
 
   pinMode(pin_CS, OUTPUT);
@@ -53,16 +71,14 @@ void MAX6675_K::onInit() {
   channel.setNewValue(getValue());
 }
 
-byte MAX6675_K::spiRead() {
-  int i;
-  byte d = 0;
+uint32_t MAXThermocouple::spiRead() {
+  uint32_t d = 0;
 
-  for (i = 7; i >= 0; i--) {
+  for (int i = 31; i >= 0; i--) {
     digitalWrite(pin_CLK, LOW);
     delay(1);
-    if (digitalRead(pin_DO)) {
-      d |= (1 << i);
-    }
+    d <<= 1;
+    d |= digitalRead(pin_DO);
 
     digitalWrite(pin_CLK, HIGH);
     delay(1);
@@ -71,4 +87,4 @@ byte MAX6675_K::spiRead() {
 }
 
 };  // namespace Sensor
-};  // namespace Supla
\ No newline at end of file
+};  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h b/lib/SuplaDevice/src/supla/sensor/MAXThermocouple.h
similarity index 83%
rename from lib/SuplaDevice/src/supla/sensor/MAX6675_K.h
rename to lib/SuplaDevice/src/supla/sensor/MAXThermocouple.h
index 868a9bff..1f20260e 100644
--- a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h
+++ b/lib/SuplaDevice/src/supla/sensor/MAXThermocouple.h
@@ -14,22 +14,22 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#ifndef _max6675_k_h
-#define _max6675_k_h
+#ifndef _maxThermocouple_k_h
+#define _maxThermocouple_k_h
 
 #include <Arduino.h>
 #include <supla/sensor/thermometer.h>
 
 namespace Supla {
 namespace Sensor {
-class MAX6675_K : public Thermometer {
+class MAXThermocouple : public Thermometer {
  public:
-  MAX6675_K(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO);
+  MAXThermocouple(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO);
   double getValue();
 
  private:
   void onInit();
-  byte spiRead();
+  uint32_t spiRead(void);
 
  protected:
   int8_t pin_CLK;
@@ -40,4 +40,4 @@ class MAX6675_K : public Thermometer {
 };  // namespace Sensor
 };  // namespace Supla
 
-#endif
\ No newline at end of file
+#endif
diff --git a/platformio.ini b/platformio.ini
index f77ac537..f892aa0d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.3"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.5"'
                 -w
                 -DATOMIC_FS_UPDATE
                 -DBEARSSL_SSL_BASIC
diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index 18068b12..b597255a 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -117,7 +117,7 @@ void setup() {
 #ifdef SUPLA_HC_SR04
   if (ConfigESP->getGpio(FUNCTION_TRIG) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_ECHO) != OFF_GPIO) {
     Supla::Sensor::HC_SR04 *hcsr04;
-    if (strcmp(ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValue(), "") != 0) {
+    if (ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValueInt() > 0) {
       hcsr04 = new Supla::Sensor::HC_SR04(ConfigESP->getGpio(FUNCTION_TRIG), ConfigESP->getGpio(FUNCTION_ECHO), 0,
                                           ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValueInt(),
                                           ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValueInt(), 0);
@@ -133,9 +133,10 @@ void setup() {
 
 #ifdef SUPLA_MAX6675
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
-    auto max6675 = new Supla::Sensor::MAX6675_K(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
-    Supla::GUI::addConditionsTurnON(SENSOR_MAX6675, max6675);
-    Supla::GUI::addConditionsTurnOFF(SENSOR_MAX6675, max6675);
+    auto thermocouple =
+        new Supla::Sensor::MAXThermocouple(ConfigESP->getGpio(FUNCTION_CLK), ConfigESP->getGpio(FUNCTION_CS), ConfigESP->getGpio(FUNCTION_D0));
+    Supla::GUI::addConditionsTurnON(SENSOR_MAX6675, thermocouple);
+    Supla::GUI::addConditionsTurnOFF(SENSOR_MAX6675, thermocouple);
   }
 #endif
 
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index b1d03f88..68acc0c4 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -65,7 +65,7 @@
 #include <supla/sensor/Si7021.h>
 #endif
 #ifdef SUPLA_MAX6675
-#include <supla/sensor/MAX6675_K.h>
+#include <supla/sensor/MAXThermocouple.h>
 #endif
 #ifdef SUPLA_IMPULSE_COUNTER
 #include <supla/sensor/impulse_counter.h>
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index ac11b769..136027b5 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -91,7 +91,13 @@ void SuplaWebPageControl::handleControlSave() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      supla_webpage_control(1);
+      if (last_value >= ConfigManager->get(KEY_MAX_BUTTON)->getValueInt()) {
+        supla_webpage_control(1);
+      }
+      else {
+        supla_webpage_control(2);
+        ConfigESP->rebootESP();
+      }
       break;
     case E_CONFIG_FILE_OPEN:
       supla_webpage_control(2);
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 64b5c9f0..8bca472a 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -36,7 +36,7 @@ void handleOtherSave() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  uint8_t nr, current_value, last_value;
+  uint8_t nr, last_value;
 
 #ifdef SUPLA_HC_SR04
   if (!WebServer->saveGPIO(INPUT_TRIG_GPIO, FUNCTION_TRIG)) {
@@ -118,13 +118,13 @@ void suplaWebPageOther(int save) {
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
   addListGPIOBox(webContentBuffer, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
   addListGPIOBox(webContentBuffer, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
-  addNumberBox(webContentBuffer, INPUT_HC_SR04_MAX_SENSOR_READ, F("Odległość[cm]"), F("maksymalna odległość odczytu czujnika"), false,
+  addNumberBox(webContentBuffer, INPUT_HC_SR04_MAX_SENSOR_READ, F("Głębokość[cm]"), F("maksymalna odległość odczytu czujnika"), false,
                ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValue());
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " " + S_IMPULSE_COUNTER);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" ") + S_IMPULSE_COUNTER);
   addNumberBox(webContentBuffer, INPUT_MAX_IMPULSE_COUNTER, S_QUANTITY, KEY_MAX_IMPULSE_COUNTER, ConfigESP->countFreeGpio(FUNCTION_IMPULSE_COUNTER));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
     addListGPIOLinkBox(webContentBuffer, INPUT_IMPULSE_COUNTER_GPIO, F("IC GPIO"), FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
@@ -144,7 +144,7 @@ void suplaWebPageOther(int save) {
 #endif
 
 #ifdef SUPLA_RGBW
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + " RGBW/RGB/DIMMER");
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" RGBW/RGB/DIMMER"));
   addNumberBox(webContentBuffer, INPUT_RGBW_MAX, S_QUANTITY, KEY_MAX_RGBW, ConfigESP->countFreeGpio());
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RGBW)->getValueInt(); nr++) {
     addListGPIOBox(webContentBuffer, INPUT_RGBW_RED, F("RED"), FUNCTION_RGBW_RED, nr, false);
@@ -156,7 +156,7 @@ void suplaWebPageOther(int save) {
 #endif
 
 #if defined(SUPLA_PUSHOVER)
-  addFormHeader(webContentBuffer, String(S_SETTING_FOR) + " PUSHOVER");
+  addFormHeader(webContentBuffer, String(S_SETTING_FOR) + F(" PUSHOVER"));
   addTextBox(webContentBuffer, INPUT_PUSHOVER_TOKEN, F("Token"), KEY_PUSHOVER_TOKEN, 0, MAX_TOKEN_SIZE, false);
   addTextBox(webContentBuffer, INPUT_PUSHOVER_USER, F("Users"), KEY_PUSHOVER_USER, 0, MAX_USER_SIZE, false);
   addFormHeaderEnd(webContentBuffer);
@@ -340,6 +340,9 @@ void handleHLW8012CalibrateSave() {
   }
 
   if (calibPower && calibVoltage) {
+    for (int i = 0; i < Supla::GUI::relay.size(); i++) {
+      Supla::GUI::relay[i]->turnOn();
+    }
     Supla::GUI::counterHLW8012->calibrate(calibPower, calibVoltage);
     suplaWebpageHLW8012Calibrate(1);
   }
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index e60a5dbc..bd57e33f 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -85,7 +85,13 @@ void SuplaWebPageRelay::handleRelaySave() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      supla_webpage_relay(1);
+      if (last_value >= ConfigManager->get(KEY_MAX_RELAY)->getValueInt()) {
+        supla_webpage_relay(1);
+      }
+      else {
+        supla_webpage_relay(2);
+        ConfigESP->rebootESP();
+      }
       break;
     case E_CONFIG_FILE_OPEN:
       supla_webpage_relay(2);
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index a8ade5e3..3a434ee3 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -608,7 +608,7 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
 
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MAX6675).toInt();
-    addListBox(webContentBuffer, INPUT_MAX6675, F("MAX6675"), STATE_P, 2, selected);
+    addListBox(webContentBuffer, INPUT_MAX6675, F("MAX6675/MAX31855"), STATE_P, 2, selected);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif

From 6123de5d30b7b8c6ec2d6fd81a7b64acec7afc94 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 12 Feb 2021 20:18:24 +0100
Subject: [PATCH 067/165] SPIFFS -> LittleFS

---
 src/SuplaConfigManager.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index af595843..f6ff8ca6 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -21,7 +21,7 @@
 #include <IPAddress.h>
 #include <supla-common/proto.h>
 
-#include "FS.h"
+#include "LittleFS.h"
 #include "SuplaConfigManager.h"
 #include "SuplaDeviceGUI.h"
 
@@ -138,10 +138,10 @@ void ConfigOption::setValue(const char *value) {
 // class SuplaConfigManager
 //
 SuplaConfigManager::SuplaConfigManager() {
-  if (SPIFFS.begin()) {
-    //    Serial.println(F("\nSPIFFS mounted"));
+  if (LittleFS.begin()) {
+    //    Serial.println(F("\nLittleFS mounted"));
     //  } else {
-    //    Serial.println(F("\nFailed to mount SPIFFS"));
+    //    Serial.println(F("\nFailed to mount LittleFS"));
   }
   _optionCount = 0;
 
@@ -248,9 +248,9 @@ uint8_t SuplaConfigManager::deleteKey(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::load() {
-  if (SPIFFS.begin()) {
-    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
+  if (LittleFS.begin()) {
+    if (LittleFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -293,9 +293,9 @@ uint8_t SuplaConfigManager::load() {
 }
 
 uint8_t SuplaConfigManager::loadItem(uint8_t key) {
-  if (SPIFFS.begin()) {
-    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
+  if (LittleFS.begin()) {
+    if (LittleFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -336,7 +336,7 @@ uint8_t SuplaConfigManager::loadItem(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::save() {
-  if (SPIFFS.begin()) {
+  if (LittleFS.begin()) {
     int i = 0;
     int offset = 0;
     int length = 0;
@@ -345,7 +345,7 @@ uint8_t SuplaConfigManager::save() {
       length += _options[i]->getLength();
     }
 
-    File configFile = SPIFFS.open(CONFIG_FILE_PATH, "w+");
+    File configFile = LittleFS.open(CONFIG_FILE_PATH, "w+");
     if (configFile) {
       uint8_t *content = (uint8_t *)malloc(sizeof(uint8_t) * length);
       for (i = 0; i < _optionCount; i++) {

From 823a459514bb2f54fb9564d06fbf6995ad741efd Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 13 Feb 2021 22:07:17 +0100
Subject: [PATCH 068/165] SPIFFS -> LittleFS

---
 src/SuplaWebPageDownload.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
index b4e08d5b..dc347c86 100644
--- a/src/SuplaWebPageDownload.cpp
+++ b/src/SuplaWebPageDownload.cpp
@@ -1,5 +1,6 @@
 #include "SuplaWebPageDownload.h"
 #include "SuplaDeviceGUI.h"
+#include "LittleFS.h"
 
 void createWebDownload() {
   WebServer->httpServer.on(getURL(PATH_DOWNLOAD), handleDownload);
@@ -11,7 +12,7 @@ void handleDownload() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  File dataFile = SPIFFS.open(F(CONFIG_FILE_PATH), "r");
+  File dataFile = LittleFS.open(F(CONFIG_FILE_PATH), "r");
 
   if (!dataFile) {
     return;

From 8094acab40cf75b0489abbf4fb697d56a94d4237 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 13 Feb 2021 22:07:41 +0100
Subject: [PATCH 069/165] =?UTF-8?q?linki=20bezpo=C5=9Brednie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/supla/control/direct_link.cpp         | 156 ++++++++++++++++++
 .../src/supla/control/direct_link.h           |  75 +++++++++
 .../src/supla/control/pushover.cpp            |  25 +--
 lib/SuplaDevice/src/supla/control/pushover.h  |  10 +-
 platformio.ini                                |  12 +-
 src/GUI-Generic_Config.h                      |   3 +-
 src/SuplaConfigESP.cpp                        |  61 ++-----
 src/SuplaConfigManager.cpp                    |  27 ++-
 src/SuplaConfigManager.h                      |   6 +-
 src/SuplaDeviceGUI.cpp                        |  36 ++--
 src/SuplaDeviceGUI.h                          |   1 +
 src/SuplaWebPageRelay.cpp                     |  90 ++++++++--
 src/SuplaWebPageRelay.h                       |   6 +-
 13 files changed, 396 insertions(+), 112 deletions(-)
 create mode 100644 lib/SuplaDevice/src/supla/control/direct_link.cpp
 create mode 100644 lib/SuplaDevice/src/supla/control/direct_link.h

diff --git a/lib/SuplaDevice/src/supla/control/direct_link.cpp b/lib/SuplaDevice/src/supla/control/direct_link.cpp
new file mode 100644
index 00000000..4c7ad3e6
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/direct_link.cpp
@@ -0,0 +1,156 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "direct_link.h"
+
+#include <Arduino.h>
+
+namespace Supla {
+namespace Control {
+
+DirectLink::DirectLink(const char *host, bool isSecured)
+    : _lastStateON(false), _lastStateOFF(false) {
+  setHost(host);
+  enableSSL(isSecured);
+}
+
+DirectLink::~DirectLink() {
+  delete[] client;
+}
+
+void DirectLink::setHost(const char *host) {
+  if (host) {
+    strncpy(_host, host, MAX_HOST_SIZE);
+  }
+}
+
+void DirectLink::setUrlON(const char *url) {
+  if (url) {
+    strncpy(_urlON, url, MAX_DIRECT_LINKS_SIZE);
+  }
+}
+
+void DirectLink::setUrlOFF(const char *url) {
+  if (url) {
+    strncpy(_urlOFF, url, MAX_DIRECT_LINKS_SIZE);
+  }
+}
+
+void DirectLink::enableSSL(bool isSecured) {
+  _isSecured = isSecured;
+}
+
+bool DirectLink::openConnection() {
+  if (!client->connect(_host, _isSecured ? 443 : 80)) {
+    return false;
+  }
+  return true;
+}
+
+bool DirectLink::closeConnection() {
+  client->stop();
+  return checkConnection();
+}
+
+bool DirectLink::checkConnection() {
+  if (client->connected() == 1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+void DirectLink::toggleConnection() {
+  if (client == NULL) {
+    if (_isSecured) {
+      client = new WiFiClientSecure();
+      ((WiFiClientSecure *)client)->setInsecure();
+      ((WiFiClientSecure *)client)->setBufferSizes(256, 256);
+      ((WiFiClientSecure *)client)->setTimeout(200);
+    } else {
+      client = new WiFiClient();
+    }
+  }
+
+  if (checkConnection()) {
+    closeConnection();
+  } else {
+    openConnection();
+  }
+}
+
+void DirectLink::sendRequest(const char *url) {
+  if (client) {
+    (WiFiClientSecure *)client->print(
+        String("GET /direct/") + url + " HTTP/1.1\r\n" + "Host: " + _host +
+        "\r\n" + "User-Agent: BuildFailureDetectorESP8266\r\n" +
+        "Connection: close\r\n\r\n");
+
+    while (client->connected() || client->available()) {
+      String line = client->readStringUntil('\n');
+      if (line == "\r") {
+        Serial.println(F("Headers received"));
+        break;
+      }
+    }
+
+    /* String line = client->readString();
+      if (line.indexOf("true") > 0) {
+        Serial.println(F("Alert sent successfully!"));
+      } else {
+        Serial.print(F("Alert failure"));
+        Serial.println(line);
+      }*/
+  }
+}
+
+void DirectLink::send(const char *url) {
+  toggleConnection();
+  sendRequest(url);
+  toggleConnection();
+
+  if (client) {
+    delete client;
+    client = nullptr;
+  }
+}
+
+void DirectLink::iterateAlways() {
+  if (_lastStateON) {
+    _lastStateON = false;
+    send(_urlON);
+  }
+  if (_lastStateOFF) {
+    _lastStateOFF = false;
+    send(_urlOFF);
+  }
+}
+
+void DirectLink::handleAction(int event, int action) {
+  (void)(event);
+
+  switch (action) {
+    case SEND_DIRECT_LINKS_ON:
+      _lastStateON = true;
+      break;
+    case SEND_DIRECT_LINKS_OFF:
+      _lastStateOFF = true;
+      break;
+  }
+}
+
+};  // namespace Control
+};  // namespace Supla
diff --git a/lib/SuplaDevice/src/supla/control/direct_link.h b/lib/SuplaDevice/src/supla/control/direct_link.h
new file mode 100644
index 00000000..2fb20291
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/control/direct_link.h
@@ -0,0 +1,75 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _direct_link_h
+#define _direct_link_h
+
+#include <Arduino.h>
+#include <WiFiClientSecure.h>
+
+#include "../action_handler.h"
+#include "../actions.h"
+#include "../channel_element.h"
+
+#define MAX_DIRECT_LINKS_SIZE 32
+#define MAX_HOST_SIZE         32
+
+namespace Supla {
+enum DirectLink {
+  SEND_DIRECT_LINKS_ON,
+  SEND_DIRECT_LINKS_OFF,
+};
+}
+
+namespace Supla {
+namespace Control {
+
+class DirectLink : public Element, public ActionHandler {
+ public:
+  DirectLink(const char *host, bool isSecured = true);
+  ~DirectLink();
+
+  void setHost(const char *host);
+  void setUrlON(const char *url);
+  void setUrlOFF(const char *url);
+  void enableSSL(bool isSecured);
+
+  void iterateAlways();
+  void handleAction(int event, int action);
+
+  bool checkConnection();
+  void toggleConnection();
+  bool openConnection();
+  bool closeConnection();
+  void sendRequest(const char *url);
+  void send(const char *url);
+
+ protected:
+  WiFiClient *client = NULL;
+  bool _lastStateON;
+  bool _lastStateOFF;
+  int _action;
+
+  bool _isSecured;
+  char _urlON[MAX_DIRECT_LINKS_SIZE];
+  char _urlOFF[MAX_DIRECT_LINKS_SIZE];
+  char _host[MAX_HOST_SIZE];
+};
+
+};  // namespace Control
+};  // namespace Supla
+
+#endif
diff --git a/lib/SuplaDevice/src/supla/control/pushover.cpp b/lib/SuplaDevice/src/supla/control/pushover.cpp
index 750a44b2..7d72b5a1 100644
--- a/lib/SuplaDevice/src/supla/control/pushover.cpp
+++ b/lib/SuplaDevice/src/supla/control/pushover.cpp
@@ -22,7 +22,7 @@ namespace Supla {
 namespace Control {
 
 Pushover::Pushover(const char *token, const char *user, bool isSecured)
-    : lastMsgReceivedMs(0) {
+    : lastStateSend(false) {
   setToken(token);
   setUser(user);
   _isSecured = isSecured;
@@ -81,7 +81,8 @@ void Pushover::toggleConnection() {
     if (_isSecured) {
       client = new WiFiClientSecure();
       ((WiFiClientSecure *)client)->setInsecure();
-      ((WiFiClientSecure *)client)->setBufferSizes(1024, 1024);
+      ((WiFiClientSecure *)client)->setBufferSizes(256, 256);
+      ((WiFiClientSecure *)client)->setTimeout(200);
     } else {
       client = new WiFiClient();
     }
@@ -119,13 +120,13 @@ void Pushover::sendRequest() {
       }
     }
 
-   /* String line = client->readString();
-    if (line.indexOf("\"status\":1") != -1 || line.indexOf("200 OK") != -1) {
-      Serial.println(F("Alert sent successfully!"));
-    } else {
-      Serial.print(F("Alert failure"));
-      Serial.println(line);
-    }*/
+    /* String line = client->readString();
+     if (line.indexOf("\"status\":1") != -1 || line.indexOf("200 OK") != -1) {
+       Serial.println(F("Alert sent successfully!"));
+     } else {
+       Serial.print(F("Alert failure"));
+       Serial.println(line);
+     }*/
   }
 }
 
@@ -141,8 +142,8 @@ void Pushover::send() {
 }
 
 void Pushover::iterateAlways() {
-  if (lastMsgReceivedMs != 0 && millis() - lastMsgReceivedMs > 400) {
-    lastMsgReceivedMs = 0;
+  if (lastStateSend) {
+    lastStateSend = false;
     send();
   }
 }
@@ -150,7 +151,7 @@ void Pushover::iterateAlways() {
 void Pushover::handleAction(int event, int action) {
   (void)(event);
   if (action == SEND_NOTIF_1) {
-    lastMsgReceivedMs = millis();
+    lastStateSend = true;
   }
 }
 
diff --git a/lib/SuplaDevice/src/supla/control/pushover.h b/lib/SuplaDevice/src/supla/control/pushover.h
index c93a0d06..ebd01b01 100644
--- a/lib/SuplaDevice/src/supla/control/pushover.h
+++ b/lib/SuplaDevice/src/supla/control/pushover.h
@@ -62,21 +62,13 @@ class Pushover : public Element, public ActionHandler {
   WiFiClient *client = NULL;
   const char *host = "api.pushover.net";
   const char *path = "/1/messages.json";
-  unsigned long lastMsgReceivedMs;
+  bool lastStateSend;
 
   bool _isSecured;
   char _token[MAX_TOKEN_SIZE];
   char _user[MAX_USER_SIZE];
   char _title[MAX_TITLE_SIZE];
   char _message[MAX_MESSAGE_SIZE];
-  String _device;
-  String _url;
-  String _url_title;
-  int8_t _priority = 0;
-  uint16_t _retry;
-  uint16_t _expire;
-  uint32_t _timestamp = 0;
-  String _sound;
 };
 
 };  // namespace Control
diff --git a/platformio.ini b/platformio.ini
index f892aa0d..b34b30fc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,10 +22,10 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.5"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.6"'
                 -w
-                -DATOMIC_FS_UPDATE
-                -DBEARSSL_SSL_BASIC
+                -D ATOMIC_FS_UPDATE
+                -D BEARSSL_SSL_BASIC
                 -D SUPLA_OTA
                 -D SUPLA_RELAY
                 -D SUPLA_BUTTON
@@ -46,14 +46,16 @@ build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.5"'
                 -D SUPLA_HLW8012
                 -D SUPLA_MCP23017
                 -D SUPLA_RGBW  
-                -D SUPLA_PUSHOVER           
+                -D SUPLA_PUSHOVER
+                -D SUPLA_DIRECT_LINKS           
 
 [env]
 framework = arduino
-platform = espressif8266@2.6.0
+platform = espressif8266@2.6.3
 upload_speed = 256000
 monitor_speed = 74880
 upload_resetmethod = nodemcu
+board_build.filesystem = littlefs
 board_build.flash_mode = dout
 ;set frequency to 160MHz
 board_build.f_cpu = 160000000L
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index eed3e7b0..f07f0713 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -51,8 +51,9 @@
 #define SUPLA_HC_SR04
 #define SUPLA_IMPULSE_COUNTER
 #define SUPLA_HLW8012
-//#define SUPLA_RGBW
+#define SUPLA_RGBW
 #define SUPLA_PUSHOVER
+#define SUPLA_DIRECT_LINKS
 
 #endif
 #endif  // GUI-Generic_Config_h
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index e48dd8a1..a203a3f0 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -427,7 +427,7 @@ int SuplaConfigESP::getAction(int nr, int function) {
 
 bool SuplaConfigESP::checkBusyCfg(int gpio) {
   uint8_t key = KEY_GPIO + gpio;
-  if (ConfigManager->get(key)->getElement(FUNCTION_CFG_LED).toInt() == 1) {
+  if (ConfigManager->get(key)->getElement(CFG).toInt() == 1) {
     return true;
   }
   return false;
@@ -440,21 +440,17 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
   else {
     uint8_t key = KEY_GPIO + gpio;
 
-    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_BUTTON) {
-      if (function == FUNCTION_CFG_BUTTON) {
-        return false;
-      }
-    }
-    if (checkBusyCfg(gpio)) {
-      if (function != FUNCTION_BUTTON) {
-        return false;
-      }
-    }
-    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() != FUNCTION_OFF) {
-      if (ConfigManager->get(key)->getElement(FUNCTION).toInt() != function) {
-        return false;
-      }
-    }
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_BUTTON)
+      if (function == FUNCTION_CFG_BUTTON)
+        return true;
+
+    if (checkBusyCfg(gpio))
+      if (function == FUNCTION_BUTTON)
+        return true;
+
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() != FUNCTION_OFF || checkBusyCfg(gpio))
+      return false;
+
     return true;
   }
 }
@@ -677,42 +673,15 @@ void SuplaConfigESP::factoryReset(bool forceReset) {
     }
     EEPROM.end();
 
-    ConfigManager->set(KEY_WIFI_SSID, "");
-    ConfigManager->set(KEY_WIFI_PASS, "");
+    ConfigManager->deleteAllValues();
+
     ConfigManager->set(KEY_SUPLA_SERVER, DEFAULT_SERVER);
     ConfigManager->set(KEY_SUPLA_EMAIL, DEFAULT_EMAIL);
     ConfigManager->set(KEY_HOST_NAME, DEFAULT_HOSTNAME);
     ConfigManager->set(KEY_LOGIN, DEFAULT_LOGIN);
     ConfigManager->set(KEY_LOGIN_PASS, DEFAULT_LOGIN_PASS);
-    ConfigManager->set(KEY_MAX_RELAY, "0");
-    ConfigManager->set(KEY_MAX_BUTTON, "0");
-    ConfigManager->set(KEY_MAX_LIMIT_SWITCH, "0");
-    ConfigManager->set(KEY_MAX_DHT22, "0");
-    ConfigManager->set(KEY_MAX_DHT11, "0");
-    ConfigManager->set(KEY_MULTI_MAX_DS18B20, "0");
-    ConfigManager->set(KEY_MAX_ROLLERSHUTTER, "0");
-    ConfigManager->set(KEY_ALTITUDE_BME280, "0");
-    ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, "0");
-    ConfigManager->set(KEY_MAX_IMPULSE_COUNTER, "0");
-    ConfigManager->set(KEY_ACTIVE_SENSOR, "");
-    ConfigManager->set(KEY_BOARD, "0");
-    ConfigManager->set(KEY_CFG_MODE, "0");
-
-    uint8_t nr, key;
-    for (nr = 0; nr <= OFF_GPIO; nr++) {
-      key = KEY_GPIO + nr;
-      ConfigManager->set(key, "");
-    }
-
-    ConfigManager->set(KEY_ADDR_DS18B20, "");
-    ConfigManager->set(KEY_NAME_SENSOR, "");
-
-    ConfigManager->set(KEY_CONDITIONS_SENSOR_TYPE, "");
-    ConfigManager->set(KEY_CONDITIONS_TYPE, "");
-    ConfigManager->set(KEY_CONDITIONS_MIN, "");
-    ConfigManager->set(KEY_CONDITIONS_MAX, "");
-
     ConfigESP->setGpio(0, FUNCTION_CFG_BUTTON);
+
     ConfigManager->save();
 
     if (!forceReset) {
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index f6ff8ca6..a474e8ec 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -95,7 +95,7 @@ const String ConfigOption::getElement(int index) {
 const String ConfigOption::replaceElement(int index, int newvalue) {
   String data = _value;
   data.reserve(_maxLength);
-  int lenght = SETTINGSCOUNT;
+  int lenght = _maxLength;
   String table;
   for (int i = 0; i <= lenght; i++) {
     if (i == index) {
@@ -104,6 +104,7 @@ const String ConfigOption::replaceElement(int index, int newvalue) {
     else {
       table += this->getElement(i);
     }
+    
     if (i < lenght - 1)
       table += SEPARATOR;
   }
@@ -111,7 +112,7 @@ const String ConfigOption::replaceElement(int index, int newvalue) {
 }
 
 const String ConfigOption::replaceElement(int index, const char *newvalue) {
-  int lenght = SETTINGSCOUNT;
+  int lenght = _maxLength;
   String table;
   for (int i = 0; i <= lenght; i++) {
     if (i == index) {
@@ -154,29 +155,28 @@ SuplaConfigManager::SuplaConfigManager() {
   this->addKey(KEY_HOST_NAME, DEFAULT_HOSTNAME, MAX_HOSTNAME);
   this->addKey(KEY_SUPLA_SERVER, DEFAULT_SERVER, MAX_SUPLA_SERVER);
   this->addKey(KEY_SUPLA_EMAIL, DEFAULT_EMAIL, MAX_EMAIL);
-  this->addKey(KEY_MAX_ROLLERSHUTTER, "0", 2);
   this->addKey(KEY_MAX_RELAY, "0", 2);
   this->addKey(KEY_MAX_BUTTON, "0", 2);
   this->addKey(KEY_MAX_LIMIT_SWITCH, "0", 2);
   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_MAX_ROLLERSHUTTER, "0", 2);
   this->addKey(KEY_ALTITUDE_BME280, "0", 4);
   this->addKey(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, "10", 4);
   this->addKey(KEY_MAX_IMPULSE_COUNTER, "0", 2);
+  this->addKey(KEY_ACTIVE_SENSOR, "", 16);
+  this->addKey(KEY_BOARD, "0", 2);
+  this->addKey(KEY_CFG_MODE, "0", 2);
+  this->addKey(KEY_ADDR_DS18B20, MAX_DS18B20_ADDRESS_HEX * MAX_DS18B20);
+  this->addKey(KEY_NAME_SENSOR, MAX_DS18B20_NAME * MAX_DS18B20);
 
   uint8_t nr, key;
-
   for (nr = 0; nr <= MAX_GPIO; nr++) {
     key = KEY_GPIO + nr;
     this->addKey(key, "", SETTINGSCOUNT * 3);
   }
 
-  this->addKey(KEY_ACTIVE_SENSOR, "", 16);
-  this->addKey(KEY_BOARD, "0", 2);
-  this->addKey(KEY_CFG_MODE, "0", 2);
-  this->addKey(KEY_ADDR_DS18B20, MAX_DS18B20_ADDRESS_HEX * MAX_DS18B20);
-  this->addKey(KEY_NAME_SENSOR, MAX_DS18B20_NAME * MAX_DS18B20);
   this->addKey(KEY_LEVEL_LED, "0", 1);
   this->addKey(KEY_OLED_ANIMATION, "0", 1);
   this->addKey(KEY_OLED_BACK_LIGHT_TIME, "5", 2);
@@ -194,6 +194,9 @@ SuplaConfigManager::SuplaConfigManager() {
 
   this->addKey(KEY_HC_SR04_MAX_SENSOR_READ, "", 3);
 
+  this->addKey(KEY_DIRECT_LINKS_ON, "", MAX_DIRECT_LINK * MAX_DIRECT_LINKS_SIZE);
+  this->addKey(KEY_DIRECT_LINKS_OFF, "", MAX_DIRECT_LINK * MAX_DIRECT_LINKS_SIZE);
+
   this->load();
   //  switch (this->load()) {
   //    case E_CONFIG_OK:
@@ -377,6 +380,12 @@ void SuplaConfigManager::showAllValue() {
   }
 }
 
+void SuplaConfigManager::deleteAllValues() {
+  for (int i = 2; i < _optionCount; i++) {
+    _options[i]->setValue("");
+  }
+}
+
 bool SuplaConfigManager::isDeviceConfigured() {
   return strcmp(this->get(KEY_SUPLA_GUID)->getValue(), "") == 0 || strcmp(this->get(KEY_SUPLA_AUTHKEY)->getValue(), "") == 0 ||
          strcmp(this->get(KEY_WIFI_SSID)->getValue(), "") == 0 || strcmp(this->get(KEY_WIFI_PASS)->getValue(), "") == 0 ||
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 32bd5571..8710a2a6 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -47,6 +47,7 @@
 #define MAX_DS18B20          20
 #define MAX_GPIO             17
 #define MAX_PUSHOVER_MESSAGE 2
+#define MAX_DIRECT_LINK      2
 
 enum _key
 {
@@ -87,7 +88,9 @@ enum _key
   KEY_CONDITIONS_TYPE,
   KEY_CONDITIONS_MIN,
   KEY_CONDITIONS_MAX,
-  KEY_HC_SR04_MAX_SENSOR_READ
+  KEY_HC_SR04_MAX_SENSOR_READ,
+  KEY_DIRECT_LINKS_ON,
+  KEY_DIRECT_LINKS_OFF,
 };
 
 //#define GPIO      "GPIO"
@@ -189,6 +192,7 @@ class SuplaConfigManager {
   uint8_t loadItem(uint8_t key);
   uint8_t save();
   void showAllValue();
+  void deleteAllValues();
 
   ConfigOption *get(uint8_t key);
   bool set(uint8_t key, int value);
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index bb1c8f91..5ea7bd75 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -40,13 +40,13 @@ void begin() {
   supla_hostname.replace(" ", "_");
   wifi->setHostName(supla_hostname.c_str());
 
-  SuplaDevice.setName((char *)ConfigManager->get(KEY_HOST_NAME)->getValue());
+  SuplaDevice.setName(ConfigManager->get(KEY_HOST_NAME)->getValue());
 
   SuplaDevice.setSwVersion(BUILD_VERSION);
 
   SuplaDevice.begin((char *)ConfigManager->get(KEY_SUPLA_GUID)->getValue(),      // Global Unique Identifier
-                    (char *)ConfigManager->get(KEY_SUPLA_SERVER)->getValue(),    // SUPLA server address
-                    (char *)ConfigManager->get(KEY_SUPLA_EMAIL)->getValue(),     // Email address used to login to Supla Cloud
+                    ConfigManager->get(KEY_SUPLA_SERVER)->getValue(),            // SUPLA server address
+                    ConfigManager->get(KEY_SUPLA_EMAIL)->getValue(),             // Email address used to login to Supla Cloud
                     (char *)ConfigManager->get(KEY_SUPLA_AUTHKEY)->getValue());  // Authorization key
 
   ConfigManager->showAllValue();
@@ -96,19 +96,29 @@ void addRelayButton(uint8_t nr) {
     }
 
 #if defined(SUPLA_PUSHOVER)
-    if (ConfigManager->get(KEY_PUSHOVER)->getElement(size).toInt() && strcmp(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), "") != 0 &&
-        strcmp(ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), "") != 0) {
-      auto pushover =
-          new Supla::Control::Pushover(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), true);
-      pushover->setTitle(ConfigManager->get(KEY_HOST_NAME)->getValue());
+    if (size <= MAX_PUSHOVER_MESSAGE) {
+      if (ConfigManager->get(KEY_PUSHOVER)->getElement(size).toInt() && strcmp(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), "") != 0 &&
+          strcmp(ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), "") != 0) {
+        auto pushover =
+            new Supla::Control::Pushover(ConfigManager->get(KEY_PUSHOVER_TOKEN)->getValue(), ConfigManager->get(KEY_PUSHOVER_USER)->getValue(), true);
 
-      if (size <= MAX_PUSHOVER_MESSAGE) {
+        pushover->setTitle(ConfigManager->get(KEY_HOST_NAME)->getValue());
         pushover->setMessage(ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(size).c_str());
+
+        relay[size]->addAction(Pushover::SEND_NOTIF_1, pushover, Supla::ON_TURN_ON);
       }
-      else {
-        pushover->setMessage(String("Przekaźnik " + String(size + 1) + " - ZAŁĄCZONY").c_str());
-      }
-      relay[size]->addAction(Pushover::SEND_NOTIF_1, pushover, Supla::ON_TURN_ON);
+    }
+#endif
+
+#if defined(SUPLA_DIRECT_LINKS)
+    if (size <= MAX_DIRECT_LINK) {
+      auto directLink = new Supla::Control::DirectLink(ConfigManager->get(KEY_SUPLA_SERVER)->getValue());
+
+      directLink->setUrlON(ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(size).c_str());
+      directLink->setUrlOFF(ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(size).c_str());
+
+      relay[size]->addAction(DirectLink::SEND_DIRECT_LINKS_ON, directLink, Supla::ON_TURN_ON);
+      relay[size]->addAction(DirectLink::SEND_DIRECT_LINKS_OFF, directLink, Supla::ON_TURN_OFF);
     }
 #endif
   }
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 68acc0c4..3c01ecfe 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -86,6 +86,7 @@
 #include <Wire.h>
 
 #include <supla/control/pushover.h>
+#include <supla/control/direct_link.h>
 
 namespace Supla {
 namespace GUI {
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index bd57e33f..05cdcbca 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -174,11 +174,6 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
   input += nr_relay;
   ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
 
-#if defined(SUPLA_PUSHOVER)
-  input = INPUT_PUSHOVER;
-  ConfigManager->setElement(KEY_PUSHOVER, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
-#endif
-
   input = INPUT_CONDITIONS_SENSOR_TYPE;
   ConfigManager->setElement(KEY_CONDITIONS_SENSOR_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
   input = INPUT_CONDITIONS_TYPE;
@@ -187,10 +182,24 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
   ConfigManager->setElement(KEY_CONDITIONS_MIN, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
   input = INPUT_CONDITIONS_MAX;
   ConfigManager->setElement(KEY_CONDITIONS_MAX, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+
+#if defined(SUPLA_PUSHOVER)
   if (nr_relay.toInt() <= MAX_PUSHOVER_MESSAGE) {
+    input = INPUT_PUSHOVER;
+    ConfigManager->setElement(KEY_PUSHOVER, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
     input = INPUT_PUSHOVER_MESSAGE;
     ConfigManager->setElement(KEY_PUSHOVER_MASSAGE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
   }
+#endif
+
+#if defined(SUPLA_DIRECT_LINKS)
+  if (nr_relay.toInt() <= MAX_DIRECT_LINKS_SIZE) {
+    input = INPUT_DIRECT_LINK_ON;
+    ConfigManager->setElement(KEY_DIRECT_LINKS_ON, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+    input = INPUT_DIRECT_LINK_OFF;
+    ConfigManager->setElement(KEY_DIRECT_LINKS_OFF, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+  }
+#endif
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
@@ -203,12 +212,13 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
 }
 
 void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
-  String path, readUrl, nr_relay;
+  String path, readUrl, nr_relay, massage;
   uint8_t place, selected;
 
   path.reserve(10);
   readUrl.reserve(11);
   nr_relay.reserve(2);
+  massage.reserve(MAX_DIRECT_LINKS_SIZE);
 
   webContentBuffer += SuplaSaveResult(save);
 
@@ -234,20 +244,35 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
 
   selected = ConfigESP->getMemory(nr_relay.toInt(), FUNCTION_RELAY);
   addListBox(webContentBuffer, INPUT_RELAY_MEMORY + nr_relay, S_REACTION_AFTER_RESET, MEMORY_P, 3, selected);
+  addFormHeaderEnd(webContentBuffer);
 
 #if defined(SUPLA_PUSHOVER)
-  selected = ConfigManager->get(KEY_PUSHOVER)->getElement(nr_relay.toInt() - 1).toInt();
-  addListBox(webContentBuffer, INPUT_PUSHOVER, F("Pushover"), STATE_P, 2, selected);
+  if (nr_relay.toInt() < MAX_PUSHOVER_MESSAGE) {
+    addFormHeader(webContentBuffer, F("Pushover"));
 
-  if (nr_relay.toInt() <= MAX_PUSHOVER_MESSAGE) {
-    String pushoverMassage = ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(nr_relay.toInt() - 1).c_str();
-    addTextBox(webContentBuffer, INPUT_PUSHOVER_MESSAGE, "Wiadomość", pushoverMassage, 0, 16, false);
+    selected = ConfigManager->get(KEY_PUSHOVER)->getElement(nr_relay.toInt() - 1).toInt();
+    addListBox(webContentBuffer, INPUT_PUSHOVER, F("Stan"), STATE_P, 2, selected);
+
+    massage = ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(nr_relay.toInt() - 1).c_str();
+    addTextBox(webContentBuffer, INPUT_PUSHOVER_MESSAGE, F("Wiadomość"), massage, 0, 16, false);
+    addFormHeaderEnd(webContentBuffer);
   }
 #endif
-  addFormHeaderEnd(webContentBuffer);
 
-  addFormHeader(webContentBuffer, F("Warunkowanie"));
+#if defined(SUPLA_DIRECT_LINKS)
+  if (nr_relay.toInt() <= MAX_DIRECT_LINK) {
+    addFormHeader(webContentBuffer, F("Linki bezpośrednie"));
+    massage = ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(nr_relay.toInt() - 1).c_str();
+    addTextBox(webContentBuffer, INPUT_DIRECT_LINK_ON, F("ON"), massage, F("xx/xxxxxxxxx/turn-on"), 0, MAX_DIRECT_LINKS_SIZE, false);
+
+    massage = ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(nr_relay.toInt() - 1).c_str();
+    addTextBox(webContentBuffer, INPUT_DIRECT_LINK_OFF, F("OFF"), massage, F("xx/xxxxxxxxx/turn-off"), 0, MAX_DIRECT_LINKS_SIZE, false);
 
+    addFormHeaderEnd(webContentBuffer);
+  }
+#endif
+
+  addFormHeader(webContentBuffer, F("Warunkowanie"));
   selected = ConfigManager->get(KEY_CONDITIONS_SENSOR_TYPE)->getElement(nr_relay.toInt() - 1).toInt();
   addListBox(webContentBuffer, INPUT_CONDITIONS_SENSOR_TYPE, F("Sensor"), SENSOR_LIST_P, COUNT_SENSOR_LIST, selected);
 
@@ -277,6 +302,8 @@ void SuplaWebPageRelay::handleRelaySetMCP23017() {
 
 void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
   uint8_t selected;
+  String massage, name, input;
+  input.reserve(9);
 
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_RELAY);
@@ -285,12 +312,34 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
   addFormHeader(webContentBuffer, F("Ustawienia dla przekaźników"));
 
   selected = ConfigESP->getLevel(1, FUNCTION_RELAY);
-  addListBox(webContentBuffer, INPUT_RELAY_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
+  input = INPUT_RELAY_LEVEL;
+  addListBox(webContentBuffer, input, S_STATE_CONTROL, LEVEL_P, 2, selected);
 
   selected = ConfigESP->getMemory(1, FUNCTION_RELAY);
-  addListBox(webContentBuffer, INPUT_RELAY_MEMORY, S_REACTION_AFTER_RESET, MEMORY_P, 3, selected);
+  input = INPUT_RELAY_MEMORY;
+  addListBox(webContentBuffer, input, S_REACTION_AFTER_RESET, MEMORY_P, 3, selected);
+  addFormHeaderEnd(webContentBuffer);
 
+#if defined(SUPLA_PUSHOVER)
+  addFormHeader(webContentBuffer, F("Pushover"));
+  for (uint8_t i = 0; i < MAX_PUSHOVER_MESSAGE; i++) {
+    selected = ConfigManager->get(KEY_PUSHOVER)->getElement(i).toInt();
+    name = F("Stan ");
+    name += i + 1;
+    input = INPUT_PUSHOVER;
+    input += i;
+    addListBox(webContentBuffer, input, name, STATE_P, 2, selected);
+
+    massage = ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(i).c_str();
+    name = F("Wiadomość ");
+    name += i + 1;
+    input = INPUT_PUSHOVER_MESSAGE;
+    input += i;
+    addTextBox(webContentBuffer, input, name, massage, 0, 16, false);
+  }
   addFormHeaderEnd(webContentBuffer);
+#endif
+
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_RELAY);
@@ -321,6 +370,17 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
     ConfigManager->setElement(key, LEVEL_RELAY, level);
   }
 
+#if defined(SUPLA_PUSHOVER)
+  for (uint8_t i = 0; i < MAX_PUSHOVER_MESSAGE; i++) {
+    input = INPUT_PUSHOVER;
+    input += i;
+    ConfigManager->setElement(KEY_PUSHOVER, i, WebServer->httpServer.arg(input).toInt());
+    input = INPUT_PUSHOVER_MESSAGE;
+    input += i;
+    ConfigManager->setElement(KEY_PUSHOVER_MASSAGE, i, WebServer->httpServer.arg(input).c_str());
+  }
+#endif
+
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
       supla_webpage_relay(1);
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index e70f919f..2975712b 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -1,7 +1,6 @@
 #ifndef SuplaWebPageRelay_h
 #define SuplaWebPageRelay_h
 
-#include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 
 #define PATH_RELAY            "relay"
@@ -26,6 +25,11 @@
 #define INPUT_PUSHOVER_MESSAGE "pm"
 #endif
 
+#if defined(SUPLA_DIRECT_LINKS)
+#define INPUT_DIRECT_LINK_ON  "dlo"
+#define INPUT_DIRECT_LINK_OFF "dlof"
+#endif
+
 enum _memory_relay
 {
   MEMORY_RELAY_OFF,

From 36f08833779182dd06d42b888b96b8c0f9ad2ca9 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 14 Feb 2021 07:01:08 +0100
Subject: [PATCH 070/165] =?UTF-8?q?powr=C3=B3cenie=20do=20SPIFFS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini               | 11 ++---------
 src/SuplaConfigManager.cpp   | 26 +++++++++++++-------------
 src/SuplaConfigManager.h     |  2 +-
 src/SuplaWebPageDownload.cpp |  4 ++--
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index b34b30fc..020c3e77 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,7 +22,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.6"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.7"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
@@ -55,7 +55,6 @@ platform = espressif8266@2.6.3
 upload_speed = 256000
 monitor_speed = 74880
 upload_resetmethod = nodemcu
-board_build.filesystem = littlefs
 board_build.flash_mode = dout
 ;set frequency to 160MHz
 board_build.f_cpu = 160000000L
@@ -151,10 +150,4 @@ build_unflags = -D SUPLA_OTA
                 -D SUPLA_SI7021
                 -D SUPLA_MAX6675
                 -D SUPLA_HC_SR04
-                -D SUPLA_IMPULSE_COUNTER    
-  
-[env:GUI_Generic_MCP23017]
-board = esp8285
-board_build.ldscript = eagle.flash.1m64.ld
-build_flags =   ${common.build_flags}
-build_unflags = -D SUPLA_IMPULSE_COUNTER   
\ No newline at end of file
+                -D SUPLA_IMPULSE_COUNTER  
\ No newline at end of file
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index a474e8ec..2d9ec1bc 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -21,7 +21,7 @@
 #include <IPAddress.h>
 #include <supla-common/proto.h>
 
-#include "LittleFS.h"
+#include "FS.h"
 #include "SuplaConfigManager.h"
 #include "SuplaDeviceGUI.h"
 
@@ -104,7 +104,7 @@ const String ConfigOption::replaceElement(int index, int newvalue) {
     else {
       table += this->getElement(i);
     }
-    
+
     if (i < lenght - 1)
       table += SEPARATOR;
   }
@@ -139,10 +139,10 @@ void ConfigOption::setValue(const char *value) {
 // class SuplaConfigManager
 //
 SuplaConfigManager::SuplaConfigManager() {
-  if (LittleFS.begin()) {
-    //    Serial.println(F("\nLittleFS mounted"));
+  if (SPIFFS.begin()) {
+    //    Serial.println(F("\nSPIFFS mounted"));
     //  } else {
-    //    Serial.println(F("\nFailed to mount LittleFS"));
+    //    Serial.println(F("\nFailed to mount SPIFFS"));
   }
   _optionCount = 0;
 
@@ -251,9 +251,9 @@ uint8_t SuplaConfigManager::deleteKey(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::load() {
-  if (LittleFS.begin()) {
-    if (LittleFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
+  if (SPIFFS.begin()) {
+    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -296,9 +296,9 @@ uint8_t SuplaConfigManager::load() {
 }
 
 uint8_t SuplaConfigManager::loadItem(uint8_t key) {
-  if (LittleFS.begin()) {
-    if (LittleFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
+  if (SPIFFS.begin()) {
+    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -339,7 +339,7 @@ uint8_t SuplaConfigManager::loadItem(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::save() {
-  if (LittleFS.begin()) {
+  if (SPIFFS.begin()) {
     int i = 0;
     int offset = 0;
     int length = 0;
@@ -348,7 +348,7 @@ uint8_t SuplaConfigManager::save() {
       length += _options[i]->getLength();
     }
 
-    File configFile = LittleFS.open(CONFIG_FILE_PATH, "w+");
+    File configFile = SPIFFS.open(CONFIG_FILE_PATH, "w+");
     if (configFile) {
       uint8_t *content = (uint8_t *)malloc(sizeof(uint8_t) * length);
       for (i = 0; i < _optionCount; i++) {
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 8710a2a6..4151b185 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -31,7 +31,7 @@
 #define MAX_AUTHKEY             SUPLA_GUID_SIZE
 #define MAX_SSID                32
 #define MAX_PASSWORD            64
-#define MIN_PASSWORD            8
+#define MIN_PASSWORD            4
 #define MAX_MLOGIN              32
 #define MAX_MPASSWORD           64
 #define MAX_HOSTNAME            32
diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
index dc347c86..5981e3b4 100644
--- a/src/SuplaWebPageDownload.cpp
+++ b/src/SuplaWebPageDownload.cpp
@@ -1,6 +1,6 @@
 #include "SuplaWebPageDownload.h"
 #include "SuplaDeviceGUI.h"
-#include "LittleFS.h"
+#include "FS.h"
 
 void createWebDownload() {
   WebServer->httpServer.on(getURL(PATH_DOWNLOAD), handleDownload);
@@ -12,7 +12,7 @@ void handleDownload() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  File dataFile = LittleFS.open(F(CONFIG_FILE_PATH), "r");
+  File dataFile = SPIFFS.open(F(CONFIG_FILE_PATH), "r");
 
   if (!dataFile) {
     return;

From f6a9d080856678fa2f5f17e76e4558a8e4b6f33c Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 14 Feb 2021 09:36:36 +0100
Subject: [PATCH 071/165] zmiana nazwy direct_links

---
 .../{direct_link.cpp => direct_links.cpp}     | 30 +++++++++----------
 .../control/{direct_link.h => direct_links.h} |  8 ++---
 src/SuplaDeviceGUI.cpp                        |  6 ++--
 src/SuplaDeviceGUI.h                          |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)
 rename lib/SuplaDevice/src/supla/control/{direct_link.cpp => direct_links.cpp} (82%)
 rename lib/SuplaDevice/src/supla/control/{direct_link.h => direct_links.h} (92%)

diff --git a/lib/SuplaDevice/src/supla/control/direct_link.cpp b/lib/SuplaDevice/src/supla/control/direct_links.cpp
similarity index 82%
rename from lib/SuplaDevice/src/supla/control/direct_link.cpp
rename to lib/SuplaDevice/src/supla/control/direct_links.cpp
index 4c7ad3e6..ac287304 100644
--- a/lib/SuplaDevice/src/supla/control/direct_link.cpp
+++ b/lib/SuplaDevice/src/supla/control/direct_links.cpp
@@ -14,58 +14,58 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "direct_link.h"
+#include "direct_links.h"
 
 #include <Arduino.h>
 
 namespace Supla {
 namespace Control {
 
-DirectLink::DirectLink(const char *host, bool isSecured)
+DirectLinks::DirectLinks(const char *host, bool isSecured)
     : _lastStateON(false), _lastStateOFF(false) {
   setHost(host);
   enableSSL(isSecured);
 }
 
-DirectLink::~DirectLink() {
+DirectLinks::~DirectLinks() {
   delete[] client;
 }
 
-void DirectLink::setHost(const char *host) {
+void DirectLinks::setHost(const char *host) {
   if (host) {
     strncpy(_host, host, MAX_HOST_SIZE);
   }
 }
 
-void DirectLink::setUrlON(const char *url) {
+void DirectLinks::setUrlON(const char *url) {
   if (url) {
     strncpy(_urlON, url, MAX_DIRECT_LINKS_SIZE);
   }
 }
 
-void DirectLink::setUrlOFF(const char *url) {
+void DirectLinks::setUrlOFF(const char *url) {
   if (url) {
     strncpy(_urlOFF, url, MAX_DIRECT_LINKS_SIZE);
   }
 }
 
-void DirectLink::enableSSL(bool isSecured) {
+void DirectLinks::enableSSL(bool isSecured) {
   _isSecured = isSecured;
 }
 
-bool DirectLink::openConnection() {
+bool DirectLinks::openConnection() {
   if (!client->connect(_host, _isSecured ? 443 : 80)) {
     return false;
   }
   return true;
 }
 
-bool DirectLink::closeConnection() {
+bool DirectLinks::closeConnection() {
   client->stop();
   return checkConnection();
 }
 
-bool DirectLink::checkConnection() {
+bool DirectLinks::checkConnection() {
   if (client->connected() == 1) {
     return true;
   } else {
@@ -73,7 +73,7 @@ bool DirectLink::checkConnection() {
   }
 }
 
-void DirectLink::toggleConnection() {
+void DirectLinks::toggleConnection() {
   if (client == NULL) {
     if (_isSecured) {
       client = new WiFiClientSecure();
@@ -92,7 +92,7 @@ void DirectLink::toggleConnection() {
   }
 }
 
-void DirectLink::sendRequest(const char *url) {
+void DirectLinks::sendRequest(const char *url) {
   if (client) {
     (WiFiClientSecure *)client->print(
         String("GET /direct/") + url + " HTTP/1.1\r\n" + "Host: " + _host +
@@ -117,7 +117,7 @@ void DirectLink::sendRequest(const char *url) {
   }
 }
 
-void DirectLink::send(const char *url) {
+void DirectLinks::send(const char *url) {
   toggleConnection();
   sendRequest(url);
   toggleConnection();
@@ -128,7 +128,7 @@ void DirectLink::send(const char *url) {
   }
 }
 
-void DirectLink::iterateAlways() {
+void DirectLinks::iterateAlways() {
   if (_lastStateON) {
     _lastStateON = false;
     send(_urlON);
@@ -139,7 +139,7 @@ void DirectLink::iterateAlways() {
   }
 }
 
-void DirectLink::handleAction(int event, int action) {
+void DirectLinks::handleAction(int event, int action) {
   (void)(event);
 
   switch (action) {
diff --git a/lib/SuplaDevice/src/supla/control/direct_link.h b/lib/SuplaDevice/src/supla/control/direct_links.h
similarity index 92%
rename from lib/SuplaDevice/src/supla/control/direct_link.h
rename to lib/SuplaDevice/src/supla/control/direct_links.h
index 2fb20291..6526c66e 100644
--- a/lib/SuplaDevice/src/supla/control/direct_link.h
+++ b/lib/SuplaDevice/src/supla/control/direct_links.h
@@ -28,7 +28,7 @@
 #define MAX_HOST_SIZE         32
 
 namespace Supla {
-enum DirectLink {
+enum DirectLinks {
   SEND_DIRECT_LINKS_ON,
   SEND_DIRECT_LINKS_OFF,
 };
@@ -37,10 +37,10 @@ enum DirectLink {
 namespace Supla {
 namespace Control {
 
-class DirectLink : public Element, public ActionHandler {
+class DirectLinks : public Element, public ActionHandler {
  public:
-  DirectLink(const char *host, bool isSecured = true);
-  ~DirectLink();
+  DirectLinks(const char *host, bool isSecured = true);
+  ~DirectLinks();
 
   void setHost(const char *host);
   void setUrlON(const char *url);
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 5ea7bd75..8fd8da10 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -112,13 +112,13 @@ void addRelayButton(uint8_t nr) {
 
 #if defined(SUPLA_DIRECT_LINKS)
     if (size <= MAX_DIRECT_LINK) {
-      auto directLink = new Supla::Control::DirectLink(ConfigManager->get(KEY_SUPLA_SERVER)->getValue());
+      auto directLink = new Supla::Control::DirectLinks(ConfigManager->get(KEY_SUPLA_SERVER)->getValue());
 
       directLink->setUrlON(ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(size).c_str());
       directLink->setUrlOFF(ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(size).c_str());
 
-      relay[size]->addAction(DirectLink::SEND_DIRECT_LINKS_ON, directLink, Supla::ON_TURN_ON);
-      relay[size]->addAction(DirectLink::SEND_DIRECT_LINKS_OFF, directLink, Supla::ON_TURN_OFF);
+      relay[size]->addAction(DirectLinks::SEND_DIRECT_LINKS_ON, directLink, Supla::ON_TURN_ON);
+      relay[size]->addAction(DirectLinks::SEND_DIRECT_LINKS_OFF, directLink, Supla::ON_TURN_OFF);
     }
 #endif
   }
diff --git a/src/SuplaDeviceGUI.h b/src/SuplaDeviceGUI.h
index 3c01ecfe..91ba7b10 100644
--- a/src/SuplaDeviceGUI.h
+++ b/src/SuplaDeviceGUI.h
@@ -86,7 +86,7 @@
 #include <Wire.h>
 
 #include <supla/control/pushover.h>
-#include <supla/control/direct_link.h>
+#include <supla/control/direct_links.h>
 
 namespace Supla {
 namespace GUI {

From e0cf4189f9725488446856665e9cefbc112e5724 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 14 Feb 2021 18:18:09 +0100
Subject: [PATCH 072/165] =?UTF-8?q?dodanie=20DirectLinks=20je=C5=BCeli=20l?=
 =?UTF-8?q?ink=20nie=20jest=20pusty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaDeviceGUI.cpp | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 8fd8da10..85f7858b 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -83,10 +83,16 @@ void addRelayButton(uint8_t nr) {
     }
 
     relay[size]->keepTurnOnDuration();
-    // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 
     if (pinButton != OFF_GPIO) {
-      auto button = new Supla::Control::Button(pinButton, true);
+      Supla::Control::Button *button;
+      if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
+        button = new Supla::Control::Button(pinButton, true, false);
+      }
+      else {
+        button = new Supla::Control::Button(pinButton, true);
+      }
+
       button->addAction(ConfigESP->getAction(size + 1, FUNCTION_BUTTON), *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
       button->setSwNoiseFilterDelay(50);
     }
@@ -112,13 +118,19 @@ void addRelayButton(uint8_t nr) {
 
 #if defined(SUPLA_DIRECT_LINKS)
     if (size <= MAX_DIRECT_LINK) {
-      auto directLink = new Supla::Control::DirectLinks(ConfigManager->get(KEY_SUPLA_SERVER)->getValue());
-
-      directLink->setUrlON(ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(size).c_str());
-      directLink->setUrlOFF(ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(size).c_str());
-
-      relay[size]->addAction(DirectLinks::SEND_DIRECT_LINKS_ON, directLink, Supla::ON_TURN_ON);
-      relay[size]->addAction(DirectLinks::SEND_DIRECT_LINKS_OFF, directLink, Supla::ON_TURN_OFF);
+      if (strcmp(ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(size).c_str(), "") != 0 ||
+          strcmp(ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(size).c_str(), "") != 0) {
+        auto directLink = new Supla::Control::DirectLinks(ConfigManager->get(KEY_SUPLA_SERVER)->getValue());
+
+        if (strcmp(ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(size).c_str(), "") != 0) {
+          directLink->setUrlON(ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(size).c_str());
+          relay[size]->addAction(DirectLinks::SEND_DIRECT_LINKS_ON, directLink, Supla::ON_TURN_ON);
+        }
+        if (strcmp(ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(size).c_str(), "") != 0) {
+          directLink->setUrlOFF(ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(size).c_str());
+          relay[size]->addAction(DirectLinks::SEND_DIRECT_LINKS_OFF, directLink, Supla::ON_TURN_OFF);
+        }
+      }
     }
 #endif
   }

From b9d833fa05be01725fc5b90907e0d5e7f7f909b2 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 14 Feb 2021 19:15:13 +0100
Subject: [PATCH 073/165] SPIFFS -> LittleFS

---
 src/SuplaConfigManager.cpp   | 26 +++++++++++++-------------
 src/SuplaConfigManager.h     |  2 +-
 src/SuplaWebPageDownload.cpp |  4 ++--
 src/SuplaWebPageUpload.cpp   |  5 +++--
 src/SuplaWebServer.cpp       |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 2d9ec1bc..a474e8ec 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -21,7 +21,7 @@
 #include <IPAddress.h>
 #include <supla-common/proto.h>
 
-#include "FS.h"
+#include "LittleFS.h"
 #include "SuplaConfigManager.h"
 #include "SuplaDeviceGUI.h"
 
@@ -104,7 +104,7 @@ const String ConfigOption::replaceElement(int index, int newvalue) {
     else {
       table += this->getElement(i);
     }
-
+    
     if (i < lenght - 1)
       table += SEPARATOR;
   }
@@ -139,10 +139,10 @@ void ConfigOption::setValue(const char *value) {
 // class SuplaConfigManager
 //
 SuplaConfigManager::SuplaConfigManager() {
-  if (SPIFFS.begin()) {
-    //    Serial.println(F("\nSPIFFS mounted"));
+  if (LittleFS.begin()) {
+    //    Serial.println(F("\nLittleFS mounted"));
     //  } else {
-    //    Serial.println(F("\nFailed to mount SPIFFS"));
+    //    Serial.println(F("\nFailed to mount LittleFS"));
   }
   _optionCount = 0;
 
@@ -251,9 +251,9 @@ uint8_t SuplaConfigManager::deleteKey(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::load() {
-  if (SPIFFS.begin()) {
-    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
+  if (LittleFS.begin()) {
+    if (LittleFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -296,9 +296,9 @@ uint8_t SuplaConfigManager::load() {
 }
 
 uint8_t SuplaConfigManager::loadItem(uint8_t key) {
-  if (SPIFFS.begin()) {
-    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
+  if (LittleFS.begin()) {
+    if (LittleFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -339,7 +339,7 @@ uint8_t SuplaConfigManager::loadItem(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::save() {
-  if (SPIFFS.begin()) {
+  if (LittleFS.begin()) {
     int i = 0;
     int offset = 0;
     int length = 0;
@@ -348,7 +348,7 @@ uint8_t SuplaConfigManager::save() {
       length += _options[i]->getLength();
     }
 
-    File configFile = SPIFFS.open(CONFIG_FILE_PATH, "w+");
+    File configFile = LittleFS.open(CONFIG_FILE_PATH, "w+");
     if (configFile) {
       uint8_t *content = (uint8_t *)malloc(sizeof(uint8_t) * length);
       for (i = 0; i < _optionCount; i++) {
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 4151b185..a7e11ef3 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -171,7 +171,7 @@ class ConfigOption {
   int getLength();
   void setValue(const char *value);
   const String getElement(int index);
-  uint8_t getElement(int index, size_t size);
+  //uint8_t getElement(int index, size_t size);
   const String replaceElement(int index, int value);
   const String replaceElement(int index, const char *newvalue);
 
diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
index 5981e3b4..dc347c86 100644
--- a/src/SuplaWebPageDownload.cpp
+++ b/src/SuplaWebPageDownload.cpp
@@ -1,6 +1,6 @@
 #include "SuplaWebPageDownload.h"
 #include "SuplaDeviceGUI.h"
-#include "FS.h"
+#include "LittleFS.h"
 
 void createWebDownload() {
   WebServer->httpServer.on(getURL(PATH_DOWNLOAD), handleDownload);
@@ -12,7 +12,7 @@ void handleDownload() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  File dataFile = SPIFFS.open(F(CONFIG_FILE_PATH), "r");
+  File dataFile = LittleFS.open(F(CONFIG_FILE_PATH), "r");
 
   if (!dataFile) {
     return;
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index 73b0cb10..2ac4470b 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -1,5 +1,6 @@
 #include "SuplaWebPageUpload.h"
 #include "SuplaDeviceGUI.h"
+#include "LittleFS.h"
 
 static const char uploadIndex[] PROGMEM =
     R"(<form class="formcenter" method="POST" action="/upload" enctype="multipart/form-data">
@@ -59,11 +60,11 @@ void handleFileUpload() {
       return WebServer->httpServer.requestAuthentication();
   }
 
-  if (SPIFFS.begin()) {
+  if (LittleFS.begin()) {
     HTTPUpload& upload = WebServer->httpServer.upload();
 
     if (upload.status == UPLOAD_FILE_START) {
-      dataFile = SPIFFS.open(CONFIG_FILE_PATH, "w");
+      dataFile = LittleFS.open(CONFIG_FILE_PATH, "w");
     }
     else if (upload.status == UPLOAD_FILE_WRITE) {
       if (dataFile)
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 706c8fd6..2024ca27 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -71,7 +71,7 @@ void SuplaWebServer::createWebServer() {
   WebPageConfig->createWebPageConfig();
 #endif
 #ifdef SUPLA_OTA
-  httpUpdater.setup(&httpServer, this->www_username, this->www_password);
+  httpUpdater.setup(&httpServer, ConfigManager->get(KEY_LOGIN)->getValue(), ConfigManager->get(KEY_LOGIN_PASS)->getValue());
 #endif
 
   createWebDownload();

From 04b9a4c0ef70d279a17a045e5a67a42d28fed207 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 15 Feb 2021 11:12:09 +0100
Subject: [PATCH 074/165] Update direct_links.cpp

---
 .../src/supla/control/direct_links.cpp           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/control/direct_links.cpp b/lib/SuplaDevice/src/supla/control/direct_links.cpp
index ac287304..60cad047 100644
--- a/lib/SuplaDevice/src/supla/control/direct_links.cpp
+++ b/lib/SuplaDevice/src/supla/control/direct_links.cpp
@@ -102,18 +102,18 @@ void DirectLinks::sendRequest(const char *url) {
     while (client->connected() || client->available()) {
       String line = client->readStringUntil('\n');
       if (line == "\r") {
-        Serial.println(F("Headers received"));
+        Serial.println(F("Direct links - Headers received"));
         break;
       }
     }
 
-    /* String line = client->readString();
-      if (line.indexOf("true") > 0) {
-        Serial.println(F("Alert sent successfully!"));
-      } else {
-        Serial.print(F("Alert failure"));
-        Serial.println(line);
-      }*/
+    String line = client->readString();
+    if (line.indexOf("true") != -1) {
+      Serial.println(F("Alert sent successfully!"));
+    } else {
+      Serial.print(F("Alert failure"));
+      Serial.println(line);
+    }
   }
 }
 

From 04331e0539328a0f9d3b659228ec504ec526e920 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 15 Feb 2021 11:45:16 +0100
Subject: [PATCH 075/165] aktualizacja SuplaDevice

---
 lib/SuplaDevice/src/CMakeLists.txt            |  12 ++
 lib/SuplaDevice/src/SuplaDevice.cpp           |  27 +++--
 lib/SuplaDevice/src/SuplaDevice.h             |   2 -
 .../src/supla/control/dimmer_leds.cpp         |  21 ++--
 .../src/supla/control/dimmer_leds.h           |  10 +-
 .../src/supla/control/rgb_leds.cpp            |  49 ++++----
 lib/SuplaDevice/src/supla/control/rgb_leds.h  |  10 +-
 .../src/supla/control/rgbw_base.cpp           | 110 ++++++++----------
 lib/SuplaDevice/src/supla/control/rgbw_base.h |  10 +-
 .../src/supla/control/rgbw_leds.cpp           |  30 ++---
 lib/SuplaDevice/src/supla/control/rgbw_leds.h |  10 +-
 .../src/supla/control/simple_button.cpp       |  11 +-
 lib/SuplaDevice/src/supla/network/esp_wifi.h  |   6 +-
 .../src/supla/network/ethernet_shield.h       |   2 +-
 lib/SuplaDevice/src/supla/network/network.cpp |   4 +-
 lib/SuplaDevice/src/supla/network/network.h   |   6 +-
 .../src/supla/sensor/MAX6675_K.cpp            |  74 ++++++++++++
 lib/SuplaDevice/src/supla/sensor/MAX6675_K.h  |  43 +++++++
 lib/SuplaDevice/src/supla/storage/eeprom.cpp  |  10 +-
 lib/SuplaDevice/src/supla/storage/eeprom.h    |   3 +-
 lib/SuplaDevice/src/supla/storage/storage.cpp |   5 +
 lib/SuplaDevice/src/supla/storage/storage.h   |   1 +
 lib/SuplaDevice/src/supla/timer.cpp           |   4 +
 src/SuplaGuiWiFi.h                            |   2 +-
 24 files changed, 299 insertions(+), 163 deletions(-)
 create mode 100644 lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
 create mode 100644 lib/SuplaDevice/src/supla/sensor/MAX6675_K.h

diff --git a/lib/SuplaDevice/src/CMakeLists.txt b/lib/SuplaDevice/src/CMakeLists.txt
index 24760701..55931cc9 100644
--- a/lib/SuplaDevice/src/CMakeLists.txt
+++ b/lib/SuplaDevice/src/CMakeLists.txt
@@ -7,8 +7,19 @@ set(SRCS
   supla/element.cpp
   supla/local_action.cpp
   supla/channel_element.cpp
+  
+  supla/storage/storage.cpp
+
   supla/control/internal_pin_output.cpp
   supla/control/pin_status_led.cpp
+  supla/control/rgbw_base.cpp
+  supla/control/rgb_base.cpp
+  supla/control/dimmer_base.cpp
+  supla/control/rgbw_leds.cpp
+  supla/control/rgb_leds.cpp
+  supla/control/dimmer_leds.cpp
+  supla/control/simple_button.cpp
+
   supla/condition.cpp
   supla/conditions/on_less.cpp
   supla/conditions/on_less_eq.cpp
@@ -17,6 +28,7 @@ set(SRCS
   supla/conditions/on_between.cpp
   supla/conditions/on_between_eq.cpp
   supla/conditions/on_equal.cpp
+
 )
 
 add_library(supladevicelib SHARED ${SRCS})
diff --git a/lib/SuplaDevice/src/SuplaDevice.cpp b/lib/SuplaDevice/src/SuplaDevice.cpp
index de04f397..90cf5f43 100644
--- a/lib/SuplaDevice/src/SuplaDevice.cpp
+++ b/lib/SuplaDevice/src/SuplaDevice.cpp
@@ -94,22 +94,27 @@ bool SuplaDeviceClass::begin(unsigned char version) {
   // Supla::Storage::LoadDeviceConfig();
   // Supla::Storage::LoadElementConfig();
 
-  // Pefrorm dry run of write state to validate stored state section with current
-  // device configuration
-  Serial.println(F("Validating storage state section with current device configuration"));
+  // Pefrorm dry run of write state to validate stored state section with
+  // current device configuration
+  Serial.println(
+      F("Validating storage state section with current device configuration"));
   Supla::Storage::PrepareState(true);
   for (auto element = Supla::Element::begin(); element != nullptr;
-      element = element->next()) {
+       element = element->next()) {
     element->onSaveState();
+    delay(0);
   }
   // If state storage validation was successful, perform read state
   if (Supla::Storage::FinalizeSaveState()) {
-    Serial.println(F("Storage state section validation completed. Loading elements state..."));
+    Serial.println(
+        F("Storage state section validation completed. Loading elements "
+          "state..."));
     // Iterate all elements and load state
     Supla::Storage::PrepareState();
     for (auto element = Supla::Element::begin(); element != nullptr;
-        element = element->next()) {
+         element = element->next()) {
       element->onLoadState();
+      delay(0);
     }
   }
 
@@ -117,12 +122,12 @@ bool SuplaDeviceClass::begin(unsigned char version) {
   for (auto element = Supla::Element::begin(); element != nullptr;
        element = element->next()) {
     element->onInit();
+    delay(0);
   }
 
   // Enable timers
   Supla::initTimers();
 
-
   bool emptyGuidDetected = true;
   for (int i = 0; i < SUPLA_GUID_SIZE; i++) {
     if (Supla::Channel::reg_dev.GUID[i] != 0) {
@@ -244,6 +249,7 @@ void SuplaDeviceClass::iterate(void) {
   for (auto element = Supla::Element::begin(); element != nullptr;
        element = element->next()) {
     element->iterateAlways();
+    delay(0);
   }
 
   // Iterate all elements and saves state
@@ -252,6 +258,7 @@ void SuplaDeviceClass::iterate(void) {
     for (auto element = Supla::Element::begin(); element != nullptr;
          element = element->next()) {
       element->onSaveState();
+      delay(0);
     }
     Supla::Storage::FinalizeSaveState();
   }
@@ -346,6 +353,7 @@ void SuplaDeviceClass::iterate(void) {
         if (!element->iterateConnected(srpc)) {
           break;
         }
+        delay(0);
       }
 
       last_iterate_time = millis();
@@ -501,7 +509,8 @@ void SuplaDeviceClass::setServer(const char *server) {
       Supla::Channel::reg_dev.ServerName, server, SUPLA_SERVER_NAME_MAXSIZE);
 }
 
-void SuplaDeviceClass::onGetUserLocaltimeResult(TSDC_UserLocalTimeResult *result) {
+void SuplaDeviceClass::onGetUserLocaltimeResult(
+    TSDC_UserLocalTimeResult *result) {
   if (clock) {
     clock->parseLocaltimeFromServer(result);
   }
@@ -512,7 +521,7 @@ void SuplaDeviceClass::addClock(Supla::Clock *_clock) {
   clock = _clock;
 }
 
-Supla::Clock * SuplaDeviceClass::getClock() {
+Supla::Clock *SuplaDeviceClass::getClock() {
   return clock;
 }
 
diff --git a/lib/SuplaDevice/src/SuplaDevice.h b/lib/SuplaDevice/src/SuplaDevice.h
index 5c1067fe..0057105c 100644
--- a/lib/SuplaDevice/src/SuplaDevice.h
+++ b/lib/SuplaDevice/src/SuplaDevice.h
@@ -17,8 +17,6 @@
 #ifndef SUPLADEVICE_H
 #define SUPLADEVICE_H
 
-#include <IPAddress.h>
-
 #include "supla-common/proto.h"
 #include "supla/network/network.h"
 #include "supla/uptime.h"
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_leds.cpp b/lib/SuplaDevice/src/supla/control/dimmer_leds.cpp
index 13781eb1..10abcb05 100644
--- a/lib/SuplaDevice/src/supla/control/dimmer_leds.cpp
+++ b/lib/SuplaDevice/src/supla/control/dimmer_leds.cpp
@@ -24,20 +24,17 @@ Supla::Control::DimmerLeds::DimmerLeds(int brightnessPin)
     : brightnessPin(brightnessPin) {
 }
 
-void Supla::Control::DimmerLeds::setRGBWValueOnDevice(uint8_t red,
-                                                      uint8_t green,
-                                                      uint8_t blue,
-                                                      uint8_t colorBrightness,
-                                                      uint8_t brightness) {
-  int multiplier = 1;
-#ifdef ARDUINO_ARCH_ESP8266
-  multiplier = 4;
-#endif
-#ifdef ARDUINO_ARCH_ESP32
-  multiplier = 4;
+void Supla::Control::DimmerLeds::setRGBWValueOnDevice(uint32_t red,
+                                                      uint32_t green,
+                                                      uint32_t blue,
+                                                      uint32_t colorBrightness,
+                                                      uint32_t brightness) {
+  uint32_t brightnessAdj = brightness;
+
+#ifdef ARDUINO_ARCH_AVR
+  brightnessAdj = map(brightnessAdj, 0, 1023, 0, 255);
 #endif
 
-  int brightnessAdj = brightness * multiplier * 255 / 100;
 #ifdef ARDUINO_ARCH_ESP32
   ledcWrite(brightnessPin, brightnessAdj);
 #else
diff --git a/lib/SuplaDevice/src/supla/control/dimmer_leds.h b/lib/SuplaDevice/src/supla/control/dimmer_leds.h
index 7fed3d48..041639e5 100644
--- a/lib/SuplaDevice/src/supla/control/dimmer_leds.h
+++ b/lib/SuplaDevice/src/supla/control/dimmer_leds.h
@@ -25,11 +25,11 @@ class DimmerLeds : public DimmerBase {
  public:
   DimmerLeds(int brightnessPin);
 
-  void setRGBWValueOnDevice(uint8_t red,
-                            uint8_t green,
-                            uint8_t blue,
-                            uint8_t colorBrightness,
-                            uint8_t brightness);
+  void setRGBWValueOnDevice(uint32_t red,
+                            uint32_t green,
+                            uint32_t blue,
+                            uint32_t colorBrightness,
+                            uint32_t brightness);
 
   void onInit();
 
diff --git a/lib/SuplaDevice/src/supla/control/rgb_leds.cpp b/lib/SuplaDevice/src/supla/control/rgb_leds.cpp
index b0ff0979..1efc29dd 100644
--- a/lib/SuplaDevice/src/supla/control/rgb_leds.cpp
+++ b/lib/SuplaDevice/src/supla/control/rgb_leds.cpp
@@ -20,30 +20,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern int esp32PwmChannelCouner;
 #endif
 
-Supla::Control::RGBLeds::RGBLeds(int redPin,
-                                   int greenPin,
-                                   int bluePin)
-    : redPin(redPin),
-      greenPin(greenPin),
-      bluePin(bluePin)
-{}
+Supla::Control::RGBLeds::RGBLeds(int redPin, int greenPin, int bluePin)
+    : redPin(redPin), greenPin(greenPin), bluePin(bluePin) {
+}
 
-void Supla::Control::RGBLeds::setRGBWValueOnDevice(uint8_t red,
-                          uint8_t green,
-                          uint8_t blue,
-                          uint8_t colorBrightness,
-                          uint8_t brightness) {
-  int multiplier = 1;
-#ifdef ARDUINO_ARCH_ESP8266
-  multiplier = 4;
-#endif
-#ifdef ARDUINO_ARCH_ESP32
-  multiplier = 4;
-#endif
+void Supla::Control::RGBLeds::setRGBWValueOnDevice(uint32_t red,
+                                                   uint32_t green,
+                                                   uint32_t blue,
+                                                   uint32_t colorBrightness,
+                                                   uint32_t brightness) {
+  uint32_t redAdj =   red   * colorBrightness / 1023;
+  uint32_t greenAdj = green * colorBrightness / 1023;
+  uint32_t blueAdj =  blue  * colorBrightness / 1023;
 
-  int redAdj = red * multiplier * colorBrightness / 100;
-  int greenAdj = green* multiplier * colorBrightness / 100;
-  int blueAdj = blue * multiplier * colorBrightness / 100;
+#ifdef ARDUINO_ARCH_AVR
+  redAdj = map(redAdj, 0, 1023, 0, 255);
+  greenAdj = map(greenAdj, 0, 1023, 0, 255);
+  blueAdj = map(blueAdj, 0, 1023, 0, 255);
+#endif
 
 #ifdef ARDUINO_ARCH_ESP32
   ledcWrite(redPin, redAdj);
@@ -81,15 +75,14 @@ void Supla::Control::RGBLeds::onInit() {
   esp32PwmChannelCouner++;
 
 #else
-  pinMode(redPin, OUTPUT); 
-  pinMode(greenPin, OUTPUT); 
-  pinMode(bluePin, OUTPUT); 
+  pinMode(redPin, OUTPUT);
+  pinMode(greenPin, OUTPUT);
+  pinMode(bluePin, OUTPUT);
 
- #ifdef ARDUINO_ARCH_ESP8266
+#ifdef ARDUINO_ARCH_ESP8266
   analogWriteRange(1024);
- #endif 
+#endif
 #endif
 
   Supla::Control::RGBBase::onInit();
 }
-
diff --git a/lib/SuplaDevice/src/supla/control/rgb_leds.h b/lib/SuplaDevice/src/supla/control/rgb_leds.h
index 372052c5..bebddd3c 100644
--- a/lib/SuplaDevice/src/supla/control/rgb_leds.h
+++ b/lib/SuplaDevice/src/supla/control/rgb_leds.h
@@ -25,11 +25,11 @@ class RGBLeds : public RGBBase {
  public:
   RGBLeds(int redPin, int greenPin, int bluePin);
 
-  void setRGBWValueOnDevice(uint8_t red,
-                            uint8_t green,
-                            uint8_t blue,
-                            uint8_t colorBrightness,
-                            uint8_t brightness);
+  void setRGBWValueOnDevice(uint32_t red,
+                            uint32_t green,
+                            uint32_t blue,
+                            uint32_t colorBrightness,
+                            uint32_t brightness);
 
   void onInit();
 
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
index 1fc96361..228b5a44 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.cpp
@@ -45,7 +45,7 @@ RGBWBase::RGBWBase()
       dimIterationDirection(false),
       iterationDelayCounter(0),
       fadeEffect(500),
-      hwRed(0),
+      hwRed(-1),
       hwGreen(0),
       hwBlue(0),
       hwColorBrightness(0),
@@ -98,12 +98,6 @@ void RGBWBase::setRGBW(int red,
     curBrightness = brightness;
   }
 
-  // If fade effect is disabled, then set new values to device directly
-  if (fadeEffect <= 0) {
-    setRGBWValueOnDevice(
-        curRed, curGreen, curBlue, curColorBrightness, curBrightness);
-  }
-
   // Schedule save in 5 s after state change
   Supla::Storage::ScheduleSave(5000);
 }
@@ -355,96 +349,94 @@ void RGBWBase::setFadeEffectTime(int timeMs) {
 }
 
 void RGBWBase::onTimer() {
-  // exit it fade effect is disabled
-  if (fadeEffect <= 0) {
-    return;
-  }
   unsigned long timeDiff = millis() - lastTick;
   lastTick = millis();
 
   if (timeDiff > 0) {
-    int divider = fadeEffect / timeDiff;
+    double divider = 1.0* fadeEffect / timeDiff;
     if (divider <= 0) {
       divider = 1;
     }
 
-    uint8_t rgbStep = 255 / divider;
-    uint8_t brightnessStep = 100 / divider;
+    double step = 1023 / divider;
     bool valueChanged = false;
-    if (rgbStep < 1) {
-      rgbStep = 1;
-    }
-    if (brightnessStep < 1) {
-      brightnessStep = 1;
+    if (step < 1) {
+      step = 1;
     }
 
-    if (curRed > hwRed) {
+    int curRedAdj = map(curRed, 0, 255, 0, 1023);
+    int curGreenAdj = map(curGreen, 0, 255, 0 , 1023);
+    int curBlueAdj = map(curBlue, 0, 255, 0, 1023);
+    int curColorBrightnessAdj = map(curColorBrightness, 0, 100, 0, 1023);
+    int curBrightnessAdj = map(curBrightness, 0, 100, 0, 1023);
+
+    if (curRedAdj > hwRed) {
       valueChanged = true;
-      hwRed += rgbStep;
-      if (hwRed > curRed) {
-        hwRed = curRed;
+      hwRed += step;
+      if (hwRed > curRedAdj) {
+        hwRed = curRedAdj;
       }
-    } else if (curRed < hwRed) {
+    } else if (curRedAdj < hwRed) {
       valueChanged = true;
-      hwRed -= rgbStep;
-      if (hwRed < curRed) {
-        hwRed = curRed;
+      hwRed -= step;
+      if (hwRed < curRedAdj) {
+        hwRed = curRedAdj;
       }
     }
 
-    if (curGreen > hwGreen) {
+    if (curGreenAdj > hwGreen) {
       valueChanged = true;
-      hwGreen += rgbStep;
-      if (hwGreen > curGreen) {
-        hwGreen = curGreen;
+      hwGreen += step;
+      if (hwGreen > curGreenAdj) {
+        hwGreen = curGreenAdj;
       }
-    } else if (curGreen < hwGreen) {
+    } else if (curGreenAdj < hwGreen) {
       valueChanged = true;
-      hwGreen -= rgbStep;
-      if (hwGreen < curGreen) {
-        hwGreen = curGreen;
+      hwGreen -= step;
+      if (hwGreen < curGreenAdj) {
+        hwGreen = curGreenAdj;
       }
     }
 
-    if (curBlue > hwBlue) {
+    if (curBlueAdj > hwBlue) {
       valueChanged = true;
-      hwBlue += rgbStep;
-      if (hwBlue > curBlue) {
-        hwBlue = curBlue;
+      hwBlue += step;
+      if (hwBlue > curBlueAdj) {
+        hwBlue = curBlueAdj;
       }
-    } else if (curBlue < hwBlue) {
+    } else if (curBlueAdj < hwBlue) {
       valueChanged = true;
-      hwBlue -= rgbStep;
-      if (hwBlue < curBlue) {
-        hwBlue = curBlue;
+      hwBlue -= step;
+      if (hwBlue < curBlueAdj) {
+        hwBlue = curBlueAdj;
       }
     }
 
-    if (curColorBrightness > hwColorBrightness) {
+    if (curColorBrightnessAdj > hwColorBrightness) {
       valueChanged = true;
-      hwColorBrightness += brightnessStep;
-      if (hwColorBrightness > curColorBrightness) {
-        hwColorBrightness = curColorBrightness;
+      hwColorBrightness += step;
+      if (hwColorBrightness > curColorBrightnessAdj) {
+        hwColorBrightness = curColorBrightnessAdj;
       }
-    } else if (curColorBrightness < hwColorBrightness) {
+    } else if (curColorBrightnessAdj < hwColorBrightness) {
       valueChanged = true;
-      hwColorBrightness -= brightnessStep;
-      if (hwColorBrightness < curColorBrightness) {
-        hwColorBrightness = curColorBrightness;
+      hwColorBrightness -= step;
+      if (hwColorBrightness < curColorBrightnessAdj) {
+        hwColorBrightness = curColorBrightnessAdj;
       }
     }
 
-    if (curBrightness > hwBrightness) {
+    if (curBrightnessAdj > hwBrightness) {
       valueChanged = true;
-      hwBrightness += brightnessStep;
-      if (hwBrightness > curBrightness) {
-        hwBrightness = curBrightness;
+      hwBrightness += step;
+      if (hwBrightness > curBrightnessAdj) {
+        hwBrightness = curBrightnessAdj;
       }
-    } else if (curBrightness < hwBrightness) {
+    } else if (curBrightnessAdj < hwBrightness) {
       valueChanged = true;
-      hwBrightness -= brightnessStep;
-      if (hwBrightness < curBrightness) {
-        hwBrightness = curBrightness;
+      hwBrightness -= step;
+      if (hwBrightness < curBrightnessAdj) {
+        hwBrightness = curBrightnessAdj;
       }
     }
 
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_base.h b/lib/SuplaDevice/src/supla/control/rgbw_base.h
index 5f3790fd..c6d3ac41 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_base.h
+++ b/lib/SuplaDevice/src/supla/control/rgbw_base.h
@@ -30,11 +30,11 @@ class RGBWBase : public ChannelElement, public ActionHandler {
  public:
   RGBWBase();
 
-  virtual void setRGBWValueOnDevice(uint8_t red,
-                                    uint8_t green,
-                                    uint8_t blue,
-                                    uint8_t colorBrightness,
-                                    uint8_t brightness) = 0;
+  virtual void setRGBWValueOnDevice(uint32_t red,
+                                    uint32_t green,
+                                    uint32_t blue,
+                                    uint32_t colorBrightness,
+                                    uint32_t brightness) = 0;
 
   virtual void setRGBW(int red,
                        int green,
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_leds.cpp b/lib/SuplaDevice/src/supla/control/rgbw_leds.cpp
index 1e11a112..11f85f9d 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_leds.cpp
+++ b/lib/SuplaDevice/src/supla/control/rgbw_leds.cpp
@@ -31,23 +31,23 @@ Supla::Control::RGBWLeds::RGBWLeds(int redPin,
       brightnessPin(brightnessPin) {
 }
 
-void Supla::Control::RGBWLeds::setRGBWValueOnDevice(uint8_t red,
-                          uint8_t green,
-                          uint8_t blue,
-                          uint8_t colorBrightness,
-                          uint8_t brightness) {
-  int multiplier = 1;
-#ifdef ARDUINO_ARCH_ESP8266
-  multiplier = 4;
-#endif
-#ifdef ARDUINO_ARCH_ESP32
-  multiplier = 4;
+void Supla::Control::RGBWLeds::setRGBWValueOnDevice(uint32_t red,
+                          uint32_t green,
+                          uint32_t blue,
+                          uint32_t colorBrightness,
+                          uint32_t brightness) {
+  uint32_t redAdj =   red   * colorBrightness / 1023;
+  uint32_t greenAdj = green * colorBrightness / 1023;
+  uint32_t blueAdj =  blue  * colorBrightness / 1023;
+  uint32_t brightnessAdj = brightness;
+
+#ifdef ARDUINO_ARCH_AVR
+  redAdj = map(redAdj, 0, 1023, 0, 255);
+  greenAdj = map(greenAdj, 0, 1023, 0, 255);
+  blueAdj = map(blueAdj, 0, 1023, 0, 255);
+  brightnessAdj = map(brightnessAdj, 0, 1023, 0, 255);
 #endif
 
-  int redAdj = red * multiplier * colorBrightness / 100;
-  int greenAdj = green* multiplier * colorBrightness / 100;
-  int blueAdj = blue * multiplier * colorBrightness / 100;
-  int brightnessAdj = brightness * multiplier * 255 / 100;
 #ifdef ARDUINO_ARCH_ESP32
   ledcWrite(redPin, redAdj);
   ledcWrite(greenPin, greenAdj);
diff --git a/lib/SuplaDevice/src/supla/control/rgbw_leds.h b/lib/SuplaDevice/src/supla/control/rgbw_leds.h
index 9457afca..b3133e99 100644
--- a/lib/SuplaDevice/src/supla/control/rgbw_leds.h
+++ b/lib/SuplaDevice/src/supla/control/rgbw_leds.h
@@ -28,11 +28,11 @@ class RGBWLeds : public RGBWBase {
            int bluePin,
            int brightnessPin);
 
-  void setRGBWValueOnDevice(uint8_t red,
-                            uint8_t green,
-                            uint8_t blue,
-                            uint8_t colorBrightness,
-                            uint8_t brightness);
+  void setRGBWValueOnDevice(uint32_t red,
+                            uint32_t green,
+                            uint32_t blue,
+                            uint32_t colorBrightness,
+                            uint32_t brightness);
 
   void onInit();
 
diff --git a/lib/SuplaDevice/src/supla/control/simple_button.cpp b/lib/SuplaDevice/src/supla/control/simple_button.cpp
index 7714f675..2bbbd387 100644
--- a/lib/SuplaDevice/src/supla/control/simple_button.cpp
+++ b/lib/SuplaDevice/src/supla/control/simple_button.cpp
@@ -30,18 +30,19 @@ Supla::Control::ButtonState::ButtonState(int pin, bool pullUp, bool invertLogic)
 }
 
 int Supla::Control::ButtonState::update() {
-  if (millis() - debounceTimeMs > debounceDelayMs) {
+  unsigned long curMillis = millis();
+  if (debounceDelayMs == 0 || curMillis - debounceTimeMs > debounceDelayMs) {
     int currentState = Supla::Io::digitalRead(pin);
     if (currentState != prevState) {
       // If status is changed, then make sure that it will be kept at
       // least swNoiseFilterDelayMs ms to avoid noise
-      if (currentState != newStatusCandidate) {
+      if (swNoiseFilterDelayMs != 0 && currentState != newStatusCandidate) {
         newStatusCandidate = currentState;
-        filterTimeMs = millis();
-      } else if (millis() - filterTimeMs > swNoiseFilterDelayMs) {
+        filterTimeMs = curMillis;
+      } else if (curMillis - filterTimeMs > swNoiseFilterDelayMs) {
       // If new status is kept at least swNoiseFilterDelayMs ms, then apply
       // change of status
-        debounceTimeMs = millis();
+        debounceTimeMs = curMillis;
         prevState = currentState;
         if (currentState == valueOnPress()) {
           return TO_PRESSED;
diff --git a/lib/SuplaDevice/src/supla/network/esp_wifi.h b/lib/SuplaDevice/src/supla/network/esp_wifi.h
index adbeac69..b0d60130 100644
--- a/lib/SuplaDevice/src/supla/network/esp_wifi.h
+++ b/lib/SuplaDevice/src/supla/network/esp_wifi.h
@@ -44,7 +44,7 @@ class ESPWifi : public Supla::Network {
  public:
   ESPWifi(const char *wifiSsid = nullptr,
           const char *wifiPassword = nullptr,
-          IPAddress *ip = nullptr)
+          unsigned char *ip = nullptr)
       : Network(ip), client(nullptr), isSecured(true), wifiConfigured(false) {
     ssid[0] = '\0';
     password[0] = '\0';
@@ -67,6 +67,7 @@ class ESPWifi : public Supla::Network {
       for (int i = 0; i < readSize; i++) {
         Serial.print(static_cast<unsigned char *>(buf)[i], HEX);
         Serial.print(F(" "));
+        delay(0);
       }
       Serial.println(F("]"));
 #endif
@@ -82,6 +83,7 @@ class ESPWifi : public Supla::Network {
     for (int i = 0; i < count; i++) {
       Serial.print(static_cast<unsigned char *>(buf)[i], HEX);
       Serial.print(F(" "));
+      delay(0);
     }
     Serial.println(F("]"));
 #endif
@@ -127,7 +129,7 @@ class ESPWifi : public Supla::Network {
               server,
               connectionPort);
 
-    //    static_cast<WiFiClientSecure*>(client)->setBufferSizes(512, 512); //
+//       static_cast<WiFiClientSecure*>(client)->setBufferSizes(512, 512); //
     //    EXPERIMENTAL
 
     bool result = client->connect(server, connectionPort);
diff --git a/lib/SuplaDevice/src/supla/network/ethernet_shield.h b/lib/SuplaDevice/src/supla/network/ethernet_shield.h
index 7d5e7e7a..683acf94 100644
--- a/lib/SuplaDevice/src/supla/network/ethernet_shield.h
+++ b/lib/SuplaDevice/src/supla/network/ethernet_shield.h
@@ -28,7 +28,7 @@
 namespace Supla {
 class EthernetShield : public Supla::Network {
  public:
-  EthernetShield(uint8_t mac[6], IPAddress *ip = NULL) : Network(ip), isDeviceReady(false) {
+  EthernetShield(uint8_t mac[6], unsigned char *ip = NULL) : Network(ip), isDeviceReady(false) {
     memcpy(this->mac, mac, 6);
   }
 
diff --git a/lib/SuplaDevice/src/supla/network/network.cpp b/lib/SuplaDevice/src/supla/network/network.cpp
index 4cf98681..b8864583 100644
--- a/lib/SuplaDevice/src/supla/network/network.cpp
+++ b/lib/SuplaDevice/src/supla/network/network.cpp
@@ -145,7 +145,7 @@ void message_received(void *_srpc,
   }
 }
 
-Network::Network(IPAddress *ip) {
+Network::Network(unsigned char *ip) {
   lastSentMs = 0;
   srpc = NULL;
   lastPingTimeMs = 0;
@@ -158,7 +158,7 @@ Network::Network(IPAddress *ip) {
     useLocalIp = false;
   } else {
     useLocalIp = true;
-    localIp = *ip;
+    memcpy(localIp, ip, 4);
   }
 }
 
diff --git a/lib/SuplaDevice/src/supla/network/network.h b/lib/SuplaDevice/src/supla/network/network.h
index 9316eca2..8e5a5da1 100644
--- a/lib/SuplaDevice/src/supla/network/network.h
+++ b/lib/SuplaDevice/src/supla/network/network.h
@@ -17,8 +17,6 @@
 #ifndef _network_interface_h
 #define _network_interface_h
 
-#include <IPAddress.h>
-
 #include "supla-common/log.h"
 #include "supla-common/proto.h"
 
@@ -99,7 +97,7 @@ class Network {
     return false;
   }
 
-  Network(IPAddress *ip);
+  Network(uint8_t ip[4]);
   virtual int read(void *buf, int count) = 0;
   virtual int write(void *buf, int count) = 0;
   virtual int connect(const char *server, int port = -1) = 0;
@@ -129,7 +127,7 @@ class Network {
   void *srpc;
 
   bool useLocalIp;
-  IPAddress localIp;
+  unsigned char localIp[4];
 };
 
 // Method passed to SRPC as a callback to read raw data from network interface
diff --git a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
new file mode 100644
index 00000000..4f610197
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.cpp
@@ -0,0 +1,74 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "MAX6675_K.h"
+
+namespace Supla {
+namespace Sensor {
+MAX6675_K::MAX6675_K(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO)
+    : pin_CLK(pin_CLK), pin_CS(pin_CS), pin_DO(pin_DO) {
+}
+
+double MAX6675_K::getValue() {
+  uint16_t value;
+
+  digitalWrite(pin_CS, LOW);
+  delay(1);
+
+  value = spiRead();
+  value <<= 8;
+  value |= spiRead();
+
+  digitalWrite(pin_CS, HIGH);
+
+  if (value & 0x4) {  // this means there is no probe connected to Max6675
+    Serial.print(F("no probe connected to Max6675"));
+    return TEMPERATURE_NOT_AVAILABLE;
+  }
+  value >>= 3;
+
+  return value * 0.25;
+}
+
+void MAX6675_K::onInit() {
+  digitalWrite(pin_CS, HIGH);
+
+  pinMode(pin_CS, OUTPUT);
+  pinMode(pin_CLK, OUTPUT);
+  pinMode(pin_DO, INPUT);
+
+  channel.setNewValue(getValue());
+}
+
+byte MAX6675_K::spiRead() {
+  int i;
+  byte d = 0;
+
+  for (i = 7; i >= 0; i--) {
+    digitalWrite(pin_CLK, LOW);
+    delay(1);
+    if (digitalRead(pin_DO)) {
+      d |= (1 << i);
+    }
+
+    digitalWrite(pin_CLK, HIGH);
+    delay(1);
+  }
+  return d;
+}
+
+};  // namespace Sensor
+};  // namespace Supla
\ No newline at end of file
diff --git a/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h
new file mode 100644
index 00000000..868a9bff
--- /dev/null
+++ b/lib/SuplaDevice/src/supla/sensor/MAX6675_K.h
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#ifndef _max6675_k_h
+#define _max6675_k_h
+
+#include <Arduino.h>
+#include <supla/sensor/thermometer.h>
+
+namespace Supla {
+namespace Sensor {
+class MAX6675_K : public Thermometer {
+ public:
+  MAX6675_K(uint8_t pin_CLK, uint8_t pin_CS, uint8_t pin_DO);
+  double getValue();
+
+ private:
+  void onInit();
+  byte spiRead();
+
+ protected:
+  int8_t pin_CLK;
+  int8_t pin_CS;
+  int8_t pin_DO;
+};
+
+};  // namespace Sensor
+};  // namespace Supla
+
+#endif
\ No newline at end of file
diff --git a/lib/SuplaDevice/src/supla/storage/eeprom.cpp b/lib/SuplaDevice/src/supla/storage/eeprom.cpp
index 79cd9f7b..8bba0afb 100644
--- a/lib/SuplaDevice/src/supla/storage/eeprom.cpp
+++ b/lib/SuplaDevice/src/supla/storage/eeprom.cpp
@@ -24,19 +24,25 @@ using namespace Supla;
 // By default, write to EEPROM every 3 min
 #define SUPLA_EEPROM_WRITING_PERIOD 3*60*1000
 
-Eeprom::Eeprom(unsigned int storageStartingOffset)
+Eeprom::Eeprom(unsigned int storageStartingOffset, int reservedSize)
     : Storage(storageStartingOffset),
-      dataChanged(false) {
+      dataChanged(false), reservedSize(reservedSize) {
   setStateSavePeriod((unsigned long)SUPLA_EEPROM_WRITING_PERIOD);
 }
 
 bool Eeprom::init() {
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+  if (reservedSize <= 0) {
 #if defined(ARDUINO_ARCH_ESP8266) 
   EEPROM.begin(1024);
 #elif defined(ARDUINO_ARCH_ESP32)
   EEPROM.begin(512);
 #endif
+  } else { 
+    EEPROM.begin(reservedSize);
+  }
   delay(15);
+#endif 
 
   return Storage::init();
 }
diff --git a/lib/SuplaDevice/src/supla/storage/eeprom.h b/lib/SuplaDevice/src/supla/storage/eeprom.h
index b9699ada..2dc40bfe 100644
--- a/lib/SuplaDevice/src/supla/storage/eeprom.h
+++ b/lib/SuplaDevice/src/supla/storage/eeprom.h
@@ -23,7 +23,7 @@ namespace Supla {
 
 class Eeprom : public Storage {
  public:
-  Eeprom(unsigned int storageStartingOffset = 0);
+  Eeprom(unsigned int storageStartingOffset = 0, int reservedSize = -1);
   bool init();
   void commit();
 
@@ -31,6 +31,7 @@ class Eeprom : public Storage {
   int readStorage(unsigned int, unsigned char *, int, bool);
   int writeStorage(unsigned int, const unsigned char *, int);
 
+  int reservedSize;
   bool dataChanged;
 };
 
diff --git a/lib/SuplaDevice/src/supla/storage/storage.cpp b/lib/SuplaDevice/src/supla/storage/storage.cpp
index 8e21d098..9f78faf0 100644
--- a/lib/SuplaDevice/src/supla/storage/storage.cpp
+++ b/lib/SuplaDevice/src/supla/storage/storage.cpp
@@ -15,6 +15,7 @@
 */
 
 #include <Arduino.h>
+#include <string.h>
 
 #include "storage.h"
 
@@ -106,6 +107,10 @@ Storage::Storage(unsigned int storageStartingOffset)
   instance = this;
 }
 
+Storage::~Storage() {
+  instance = nullptr;
+}
+
 void Storage::prepareState(bool performDryRun) {
   dryRun = performDryRun;
   newSectionSize = 0;
diff --git a/lib/SuplaDevice/src/supla/storage/storage.h b/lib/SuplaDevice/src/supla/storage/storage.h
index f25a4091..0537749c 100644
--- a/lib/SuplaDevice/src/supla/storage/storage.h
+++ b/lib/SuplaDevice/src/supla/storage/storage.h
@@ -39,6 +39,7 @@ class Storage {
   static void ScheduleSave(unsigned long delayMs);
 
   Storage(unsigned int storageStartingOffset = 0);
+  virtual ~Storage();
 
   // Changes default state save period time
   virtual void setStateSavePeriod(unsigned long periodMs);
diff --git a/lib/SuplaDevice/src/supla/timer.cpp b/lib/SuplaDevice/src/supla/timer.cpp
index a0a50ec7..8a43039f 100644
--- a/lib/SuplaDevice/src/supla/timer.cpp
+++ b/lib/SuplaDevice/src/supla/timer.cpp
@@ -23,6 +23,10 @@
 #include <Ticker.h>
 #endif
 
+#ifdef ARDUINO_ARCH_ESP8266
+#include <os_type.h>
+#endif
+
 namespace {
 #if defined(ARDUINO_ARCH_ESP8266)
 ETSTimer supla_esp_timer;
diff --git a/src/SuplaGuiWiFi.h b/src/SuplaGuiWiFi.h
index f8c322e8..c9a4d9cf 100644
--- a/src/SuplaGuiWiFi.h
+++ b/src/SuplaGuiWiFi.h
@@ -8,7 +8,7 @@
 namespace Supla {
 class GUIESPWifi : public Supla::ESPWifi {
  public:
-  GUIESPWifi(const char *wifiSsid = nullptr, const char *wifiPassword = nullptr, IPAddress *ip = nullptr) : ESPWifi(wifiSsid, wifiPassword, ip) {
+  GUIESPWifi(const char *wifiSsid = nullptr, const char *wifiPassword = nullptr) : ESPWifi(wifiSsid, wifiPassword) {
   }
 
   int connect(const char *server, int port = -1) {

From 57ce8085e378357dcd89f9cc55dddd3c0f0558e1 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 15 Feb 2021 17:02:12 +0100
Subject: [PATCH 076/165] =?UTF-8?q?okre=C5=9Blenie=20pullupu=20dla=20przyc?=
 =?UTF-8?q?isku?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini              |  8 +++-
 src/SuplaConfigESP.cpp      | 87 +++++++++++++++++--------------------
 src/SuplaConfigManager.h    | 10 ++---
 src/SuplaDeviceGUI.cpp      | 10 +++--
 src/SuplaWebPageConfig.cpp  |  4 +-
 src/SuplaWebPageControl.cpp | 64 +++++++++++++++++----------
 src/SuplaWebPageControl.h   | 11 +++--
 src/SuplaWebPageOther.cpp   |  2 +-
 src/SuplaWebPageRelay.cpp   |  8 ++--
 src/SuplaWebServer.cpp      | 27 +++++++-----
 src/language/pl.h           |  6 +--
 11 files changed, 129 insertions(+), 108 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 020c3e77..dd4e8d5c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,7 +11,8 @@
 [platformio]
 default_envs = 
                  GUI_Generic_1M
-;                 GUI_Generic_1M-en   
+;                 GUI_Generic_1M-en  
+                 GUI_Generic_2M 
 ;                 GUI_Generic_4M
 ;                 GUI_Generic_minimal
 ;                 GUI_Generic_lite
@@ -82,6 +83,11 @@ board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}
 				-D UI_LANGUAGE=en     				 
 
+[env:GUI_Generic_2M]
+board = esp8285
+board_build.ldscript = eagle.flash.2m64.ld
+build_flags =   ${common.build_flags}   
+
 [env:GUI_Generic_4M]
 board = esp12e
 board_build.ldscript = eagle.flash.4m1m.ld
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index a203a3f0..1e850336 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -288,7 +288,10 @@ int SuplaConfigESP::getLevel(int nr, int function) {
     uint8_t key = KEY_GPIO + gpio;
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
-        return ConfigManager->get(key)->getElement(LEVEL).toInt();
+        if (function == FUNCTION_BUTTON)
+          return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+        else
+          return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
       }
     }
 
@@ -297,42 +300,30 @@ int SuplaConfigESP::getLevel(int nr, int function) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-              switch (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt()) {
-                case FUNCTION_RELAY:
-                  return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
-                  break;
-                case FUNCTION_BUTTON:
-                  return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-                  break;
-              }
+              if (function == FUNCTION_BUTTON)
+                return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+              else
+                return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
             }
           }
           break;
         case 1:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-              switch (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt()) {
-                case FUNCTION_RELAY:
-                  return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
-                  break;
-                case FUNCTION_BUTTON:
-                  return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-                  break;
-              }
+              if (function == FUNCTION_BUTTON)
+                return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+              else
+                return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
             }
           }
           break;
         case 2:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-              switch (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt()) {
-                case FUNCTION_RELAY:
-                  return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
-                  break;
-                case FUNCTION_BUTTON:
-                  return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-                  break;
-              }
+              if (function == FUNCTION_BUTTON)
+                return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+              else
+                return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
             }
           }
           break;
@@ -357,7 +348,6 @@ int SuplaConfigESP::getMemory(int nr, int function) {
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
               return ConfigManager->get(key)->getElement(MEMORY).toInt();
-              ;
             }
           }
           break;
@@ -365,7 +355,6 @@ int SuplaConfigESP::getMemory(int nr, int function) {
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
               return ConfigManager->get(key)->getElement(MEMORY).toInt();
-              ;
             }
           }
           break;
@@ -373,7 +362,6 @@ int SuplaConfigESP::getMemory(int nr, int function) {
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
               return ConfigManager->get(key)->getElement(MEMORY).toInt();
-              ;
             }
           }
           break;
@@ -388,8 +376,7 @@ int SuplaConfigESP::getAction(int nr, int function) {
     uint8_t key = KEY_GPIO + gpio;
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
-        return ConfigManager->get(key)->getElement(ACTION).toInt();
-        ;
+        return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
       }
     }
 
@@ -398,24 +385,21 @@ int SuplaConfigESP::getAction(int nr, int function) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(ACTION).toInt();
-              ;
+              return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
             }
           }
           break;
         case 1:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(ACTION).toInt();
-              ;
+              return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
             }
           }
           break;
         case 2:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
             if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(ACTION).toInt();
-              ;
+              return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
             }
           }
           break;
@@ -465,12 +449,16 @@ void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function, uint8_t
 
   ConfigManager->setElement(key, NR, nr);
   ConfigManager->setElement(key, FUNCTION, function);
-  ConfigManager->setElement(key, LEVEL, level);
-  ConfigManager->setElement(key, MEMORY, memory);
-  ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
 
-  // ConfigManager->setElement(key.c_str(), MEMORY, memory);
-  // ConfigManager->setElement(key.c_str(), CFG, cfg);
+  if (function == FUNCTION_BUTTON) {
+    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+  }
+  else {
+    ConfigManager->setElement(key, LEVEL_RELAY, level);
+  }
+
+  ConfigManager->setElement(key, MEMORY, memory);
+  ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
 }
 
 void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
@@ -482,9 +470,10 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
   }
   ConfigManager->setElement(key, NR, 0);
   ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
-  ConfigManager->setElement(key, LEVEL, 0);
+  ConfigManager->setElement(key, LEVEL_RELAY, 0);
+  ConfigManager->setElement(key, LEVEL_BUTTON, 1);
   ConfigManager->setElement(key, MEMORY, 2);
-  ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
+  ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
 }
 
 uint8_t SuplaConfigESP::countFreeGpio(uint8_t exception) {
@@ -583,14 +572,14 @@ void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, u
   ConfigESP->clearGpioMCP23017(_gpio, nr, function);
 
   if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
-    ConfigManager->setElement(key, LEVEL, 0);
+    ConfigManager->setElement(key, LEVEL_RELAY, 0);
     ConfigManager->setElement(key, MEMORY, 2);
-    ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
+    ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
   }
   else {
-    ConfigManager->setElement(key, LEVEL, level);
+    ConfigManager->setElement(key, LEVEL_RELAY, level);
     ConfigManager->setElement(key, MEMORY, memory);
-    ConfigManager->setElement(key, ACTION, Supla::TOGGLE);
+    ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
   }
 
   switch (adress) {
@@ -616,6 +605,10 @@ void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t functio
   if (adress != OFF_MCP23017) {
     ConfigManager->setElement(key, getNrMCP23017(adress), 0);
     ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
+    ConfigManager->setElement(key, LEVEL_RELAY, 0);
+    ConfigManager->setElement(key, LEVEL_BUTTON, 1);
+    ConfigManager->setElement(key, MEMORY, 2);
+    ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
   }
 }
 
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index a7e11ef3..60e5479c 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -100,10 +100,10 @@ enum _settings
 {
   NR,
   FUNCTION,
-  LEVEL,
-  MEMORY,
+  LEVEL_RELAY,
+  MEMORY,  // for the button EVENT
   CFG,
-  ACTION,
+  ACTION_BUTTON,
   MCP23017_NR_1,
   MCP23017_FUNCTION_1,
   MCP23017_NR_2,
@@ -112,7 +112,7 @@ enum _settings
   MCP23017_FUNCTION_3,
   MCP23017_NR_4,
   MCP23017_FUNCTION_4,
-  LEVEL_RELAY,
+  EVENT_BUTTON,
   LEVEL_BUTTON,
   SETTINGSCOUNT
 };
@@ -171,7 +171,7 @@ class ConfigOption {
   int getLength();
   void setValue(const char *value);
   const String getElement(int index);
-  //uint8_t getElement(int index, size_t size);
+  // uint8_t getElement(int index, size_t size);
   const String replaceElement(int index, int value);
   const String replaceElement(int index, const char *newvalue);
 
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 85f7858b..18dd10f5 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -70,7 +70,7 @@ void addRelayButton(uint8_t nr) {
 
     int size = relay.size() - 1;
 
-    switch (ConfigESP->getMemory(size + 1, FUNCTION_RELAY)) {
+    switch (ConfigESP->getMemory(nr, FUNCTION_RELAY)) {
       case MEMORY_RELAY_OFF:
         relay[size]->setDefaultStateOff();
         break;
@@ -87,13 +87,15 @@ void addRelayButton(uint8_t nr) {
     if (pinButton != OFF_GPIO) {
       Supla::Control::Button *button;
       if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-        button = new Supla::Control::Button(pinButton, true, false);
+        button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON), false);
       }
       else {
-        button = new Supla::Control::Button(pinButton, true);
+        button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON));
       }
 
-      button->addAction(ConfigESP->getAction(size + 1, FUNCTION_BUTTON), *relay[size], ConfigESP->getLevel(size + 1, FUNCTION_BUTTON));
+      Serial.println(ConfigESP->getLevel(nr, FUNCTION_BUTTON));
+
+      button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getMemory(nr, FUNCTION_BUTTON));
       button->setSwNoiseFilterDelay(50);
     }
 
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index def78b14..ea1f2452 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -41,7 +41,7 @@ void SuplaWebPageConfig::handleConfigSave() {
 
   uint8_t key = KEY_GPIO + ConfigESP->getGpio(FUNCTION_CFG_LED);
   String input = INPUT_CFG_LED_LEVEL;
-  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer.arg(input).toInt());
 
   if (!WebServer->saveGPIO(INPUT_CFG_BTN_GPIO, FUNCTION_CFG_BUTTON)) {
     supla_webpage_config(6);
@@ -73,9 +73,9 @@ void SuplaWebPageConfig::supla_webpage_config(int save) {
   addForm(webContentBuffer, F("post"), PATH_SAVE_CONFIG);
   addFormHeader(webContentBuffer, S_GPIO_SETTINGS_FOR_CONFIG);
   addListGPIOBox(webContentBuffer, INPUT_CFG_LED_GPIO, F("LED"), FUNCTION_CFG_LED);
-
   selected = ConfigESP->getLevel(FUNCTION_CFG_LED);
   addListBox(webContentBuffer, INPUT_CFG_LED_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
+
   addListGPIOBox(webContentBuffer, INPUT_CFG_BTN_GPIO, S_BUTTON, FUNCTION_CFG_BUTTON);
 
   selected = ConfigManager->get(KEY_CFG_MODE)->getValueInt();
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 136027b5..7d78a385 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -26,7 +26,7 @@ void SuplaWebPageControl::createWebPageControl() {
     WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageControl::handleButtonSaveSetMCP23017, this));
   }
   else {
-    for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
+    for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_BUTTON)->getValueInt(); i++) {
       path = PATH_START;
       path += PATH_BUTTON_SET;
       path += i;
@@ -176,25 +176,29 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   gpio = ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
   key = KEY_GPIO + gpio;
 
-  input = INPUT_BUTTON_LEVEL;
+  input = INPUT_BUTTON_EVENT;
   input += nr_button;
-  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
+
+  input = INPUT_RELAY_LEVEL;
+  input += nr_button;
+  ConfigManager->setElement(key, LEVEL_BUTTON, WebServer->httpServer.arg(input).toInt());
 
   input = INPUT_BUTTON_ACTION;
   input += nr_button;
-  ConfigManager->setElement(key, ACTION, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, ACTION_BUTTON, WebServer->httpServer.arg(input).toInt());
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      supla_webpage_control(1);
+      supla_webpage_button_set(1, nr_button.toInt());
       break;
     case E_CONFIG_FILE_OPEN:
-      supla_webpage_control(2);
+      supla_webpage_button_set(2, nr_button.toInt());
       break;
   }
 }
 
-void SuplaWebPageControl::supla_webpage_button_set(int save) {
+void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   String path, readUrl, nr_button;
   uint8_t place, selected;
 
@@ -202,21 +206,28 @@ void SuplaWebPageControl::supla_webpage_button_set(int save) {
   readUrl.reserve(11);
   nr_button.reserve(2);
 
-  path = PATH_START;
-  path += PATH_BUTTON_SET;
-  readUrl = WebServer->httpServer.uri();
-
-  place = readUrl.indexOf(path);
-  nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
+  if (nr != 0) {
+    webContentBuffer += SuplaJavaScript(PATH_BUTTON_SET + String(nr));
+    nr_button = nr;
+  }
+  else {
+    path = PATH_START;
+    path += PATH_BUTTON_SET;
+    readUrl = WebServer->httpServer.uri();
 
-  webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_CONTROL);
+    place = readUrl.indexOf(path);
+    nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
+    webContentBuffer += SuplaJavaScript(String(PATH_BUTTON_SET + nr_button));
+  }
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET + nr_button);
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
   selected = ConfigESP->getLevel(nr_button.toInt(), FUNCTION_BUTTON);
-  addListBox(webContentBuffer, INPUT_BUTTON_LEVEL + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
+  addListBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, S_STATE_CONTROL, LEVEL_P, 2, selected);
+
+  selected = ConfigESP->getMemory(nr_button.toInt(), FUNCTION_BUTTON);
+  addListBox(webContentBuffer, INPUT_BUTTON_EVENT + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
 
   selected = ConfigESP->getAction(nr_button.toInt(), FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_ACTION + nr_button, S_ACTION, ACTION_P, 3, selected);
@@ -325,13 +336,16 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   uint8_t selected;
 
   webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_CONTROL);
+  webContentBuffer += SuplaJavaScript(PATH_BUTTON_SET);
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET);
   addFormHeader(webContentBuffer, F("Ustawienia dla przycisków"));
 
   selected = ConfigESP->getLevel(1, FUNCTION_BUTTON);
-  addListBox(webContentBuffer, INPUT_BUTTON_LEVEL, S_REACTION_TO, TRIGGER_P, 3, selected);
+  addListBox(webContentBuffer, INPUT_RELAY_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
+
+  selected = ConfigESP->getMemory(1, FUNCTION_BUTTON);
+  addListBox(webContentBuffer, INPUT_BUTTON_EVENT, S_REACTION_TO, TRIGGER_P, 3, selected);
 
   selected = ConfigESP->getAction(1, FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_ACTION, S_ACTION, ACTION_P, 3, selected);
@@ -351,11 +365,14 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   }
 
   String input;
-  uint8_t key, gpio, level, action;
+  uint8_t key, gpio, level, event, action;
 
   input.reserve(10);
 
-  input = INPUT_BUTTON_LEVEL;
+  input = INPUT_BUTTON_EVENT;
+  event = WebServer->httpServer.arg(input).toInt();
+
+  input = INPUT_RELAY_LEVEL;
   level = WebServer->httpServer.arg(input).toInt();
 
   input = INPUT_BUTTON_ACTION;
@@ -364,14 +381,15 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
     ConfigManager->setElement(key, LEVEL_BUTTON, level);
-    ConfigManager->setElement(key, ACTION, action);
+    ConfigManager->setElement(key, MEMORY, event);
+    ConfigManager->setElement(key, ACTION_BUTTON, action);
   }
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      supla_webpage_control(1);
+      supla_webpage_button_set_MCP23017(1);
       break;
     case E_CONFIG_FILE_OPEN:
-      supla_webpage_control(2);
+      supla_webpage_button_set_MCP23017(2);
       break;
   }
 }
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index 400989a3..b6fa73f4 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -13,7 +13,7 @@
 #define INPUT_TRIGGER           "trs"
 #define INPUT_BUTTON_SET        "bts"
 #define INPUT_BUTTON_GPIO       "btg"
-#define INPUT_BUTTON_LEVEL      "icl"
+#define INPUT_BUTTON_EVENT      "icl"
 #define INPUT_BUTTON_ACTION     "bta"
 #define INPUT_LIMIT_SWITCH_GPIO "lsg"
 #define INPUT_MAX_BUTTON        "mbt"
@@ -46,13 +46,12 @@ class SuplaWebPageControl {
 #endif
 
 #ifdef SUPLA_BUTTON
-  void supla_webpage_button_set(int save);
+  void supla_webpage_button_set(int save, int nr = 0);
 #endif
 
-void handleButtonSetMCP23017();
-void handleButtonSaveSetMCP23017();
-void supla_webpage_button_set_MCP23017(int save);
-
+  void handleButtonSetMCP23017();
+  void handleButtonSaveSetMCP23017();
+  void supla_webpage_button_set_MCP23017(int save);
 };
 
 extern SuplaWebPageControl* WebPageControl;
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 8bca472a..ae39e555 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -201,7 +201,7 @@ void handleImpulseCounterSaveSet() {
 
   input = INPUT_IMPULSE_COUNTER_RAISING_EDGE;
   input += nr;
-  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer.arg(input).toInt());
 
   ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
   Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 05cdcbca..61cf36b5 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -172,7 +172,7 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
 
   input = INPUT_RELAY_LEVEL;
   input += nr_relay;
-  ConfigManager->setElement(key, LEVEL, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer.arg(input).toInt());
 
   input = INPUT_CONDITIONS_SENSOR_TYPE;
   ConfigManager->setElement(KEY_CONDITIONS_SENSOR_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
@@ -306,7 +306,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
   input.reserve(9);
 
   webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_RELAY);
+  webContentBuffer += SuplaJavaScript(PATH_RELAY_SET);
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_RELAY_SET);
   addFormHeader(webContentBuffer, F("Ustawienia dla przekaźników"));
@@ -383,10 +383,10 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
-      supla_webpage_relay(1);
+      supla_webpage_relay_set_MCP23017(1);
       break;
     case E_CONFIG_FILE_OPEN:
-      supla_webpage_relay(2);
+      supla_webpage_relay_set_MCP23017(2);
       break;
   }
 }
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 2024ca27..85b57fc6 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -346,7 +346,7 @@ void SuplaWebServer::handleNotFound() {
 }
 
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t current_value, key;
+  uint8_t gpioInput, current_value, key;
   String input;
   input = _input;
 
@@ -360,23 +360,24 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   if (strcmp(WebServer->httpServer.arg(input).c_str(), "") == 0) {
     return true;
   }
+  gpioInput = WebServer->httpServer.arg(input).toInt();
+  key = KEY_GPIO + gpioInput;
 
-  key = KEY_GPIO + WebServer->httpServer.arg(input).toInt();
-
-  if (ConfigESP->getGpio(nr, function) != WebServer->httpServer.arg(input).toInt() || WebServer->httpServer.arg(input).toInt() == OFF_GPIO) {
+  if (ConfigESP->getGpio(nr, function) != gpioInput || gpioInput == OFF_GPIO) {
     ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
   }
 
-  if (WebServer->httpServer.arg(input).toInt() != OFF_GPIO) {
+  if (gpioInput != OFF_GPIO) {
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
-      ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), nr, function, 1);
+      ConfigESP->clearGpio(gpioInput, function);
+      ConfigESP->setGpio(gpioInput, nr, function, ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt(),
+                         ConfigManager->get(key)->getElement(MEMORY).toInt());
     }
-    else if (ConfigESP->getGpio(nr, function) == WebServer->httpServer.arg(input).toInt() &&
-             ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
-      ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), nr, function, ConfigESP->getLevel(nr, function));
+    else if (ConfigESP->getGpio(nr, function) == gpioInput && ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      ConfigESP->setGpio(gpioInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
     }
     else if (function == FUNCTION_CFG_BUTTON) {
-      ConfigESP->setGpio(WebServer->httpServer.arg(input).toInt(), FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(gpioInput, FUNCTION_CFG_BUTTON);
     }
     else {
       return false;
@@ -406,14 +407,16 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
   key = KEY_GPIO + gpioInput;
   functionElementInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
   gpio = ConfigESP->getGpioMCP23017(nr, function);
-  if (addressInput == OFF_MCP23017) {
+  if (addressInput == OFF_MCP23017 || gpioInput == OFF_GPIO) {
     ConfigESP->clearGpioMCP23017(gpio, nr, function);
     return true;
   }
 
   if (gpioInput != OFF_GPIO) {
     if (functionElementInput == FUNCTION_OFF) {
-      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, 1, 0);
+      ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
+      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt(),
+                                 ConfigManager->get(key)->getElement(MEMORY).toInt());
     }
     else if (gpio == gpioInput && functionElementInput == function) {
       ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
diff --git a/src/language/pl.h b/src/language/pl.h
index c82bea30..15b3a72a 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -34,7 +34,7 @@
 #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_STATE_CONTROL                                        "Załączany stanem"
 #define S_REACTION_AFTER_RESET                                 "Reakcja po resecie"
 #define S_GPIO_SETTINGS_FOR_BUTTONS                            "Ustawienie GPIO dla przycisków"
 #define S_BUTTON                                               "PRZYCISK"
@@ -85,8 +85,8 @@
 #define S_OFF                 "WYŁĄCZ"
 #define S_ON                  "ZAŁĄCZ"
 #define S_TOGGLE              "PRZEŁĄCZ"
-#define S_LOW                 "ODWRÓCONE"
-#define S_HIGH                "NORMALNE"
+#define S_LOW                 "LOW"
+#define S_HIGH                "HIGH"
 #define S_POSITION_MEMORY     "PAMIĘTAJ STAN"
 #define S_REACTION_ON_PRESS   "WCIŚNIĘCIE"
 #define S_REACTION_ON_RELEASE "ZWOLNIENIE"

From 82b12dd8ff7ca29bec17e4c60fdbcccf6ea76066 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 15 Feb 2021 18:06:07 +0100
Subject: [PATCH 077/165] =?UTF-8?q?ESP8266WebServer=20zamiana=20na=20wska?=
 =?UTF-8?q?=C5=BAnik?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaHTTPUpdateServer.cpp |   4 +-
 src/SuplaWebPageConfig.cpp    |  18 +++---
 src/SuplaWebPageControl.cpp   |  72 ++++++++++-----------
 src/SuplaWebPageDownload.cpp  |  10 +--
 src/SuplaWebPageOther.cpp     |  74 ++++++++++-----------
 src/SuplaWebPageRelay.cpp     |  72 ++++++++++-----------
 src/SuplaWebPageSensor.cpp    | 102 ++++++++++++++---------------
 src/SuplaWebPageStatusLed.cpp |  16 ++---
 src/SuplaWebPageTools.cpp     |  16 ++---
 src/SuplaWebPageUpload.cpp    |  32 ++++-----
 src/SuplaWebServer.cpp        | 118 +++++++++++++++++-----------------
 src/SuplaWebServer.h          |  13 ++--
 12 files changed, 273 insertions(+), 274 deletions(-)

diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 63923abf..20534dc8 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -141,8 +141,8 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
 
 void ESP8266HTTPUpdateServer::handleFirmwareUp() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   suplaWebPageUpddate();
 }
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index ea1f2452..6f56cade 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -14,24 +14,24 @@ void SuplaWebPageConfig::createWebPageConfig() {
   String path;
   path = PATH_START;
   path += PATH_CONFIG;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageConfig::handleConfig, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageConfig::handleConfig, this));
   path = PATH_START;
   path += PATH_SAVE_CONFIG;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageConfig::handleConfigSave, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageConfig::handleConfigSave, this));
 }
 
 void SuplaWebPageConfig::handleConfig() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_config(0);
 }
 
 void SuplaWebPageConfig::handleConfigSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   if (!WebServer->saveGPIO(INPUT_CFG_LED_GPIO, FUNCTION_CFG_LED)) {
@@ -41,15 +41,15 @@ void SuplaWebPageConfig::handleConfigSave() {
 
   uint8_t key = KEY_GPIO + ConfigESP->getGpio(FUNCTION_CFG_LED);
   String input = INPUT_CFG_LED_LEVEL;
-  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer->arg(input).toInt());
 
   if (!WebServer->saveGPIO(INPUT_CFG_BTN_GPIO, FUNCTION_CFG_BUTTON)) {
     supla_webpage_config(6);
     return;
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_CFG_MODE).c_str(), "") != 0) {
-    ConfigManager->set(KEY_CFG_MODE, WebServer->httpServer.arg(INPUT_CFG_MODE).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_CFG_MODE).c_str(), "") != 0) {
+    ConfigManager->set(KEY_CFG_MODE, WebServer->httpServer->arg(INPUT_CFG_MODE).c_str());
   }
 
   switch (ConfigManager->save()) {
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 7d78a385..2925beae 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -10,32 +10,32 @@ void SuplaWebPageControl::createWebPageControl() {
   String path;
   path += PATH_START;
   path += PATH_CONTROL;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleControl, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleControl, this));
   path = PATH_START;
   path += PATH_SAVE_CONTROL;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleControlSave, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleControlSave, this));
 
 #ifdef SUPLA_BUTTON
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     path = PATH_START;
     path += PATH_BUTTON_SET;
-    WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageControl::handleButtonSetMCP23017, this));
+    WebServer->httpServer->on(path, HTTP_GET, std::bind(&SuplaWebPageControl::handleButtonSetMCP23017, this));
 
     path = PATH_START;
     path += PATH_SAVE_BUTTON_SET;
-    WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageControl::handleButtonSaveSetMCP23017, this));
+    WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageControl::handleButtonSaveSetMCP23017, this));
   }
   else {
     for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_BUTTON)->getValueInt(); i++) {
       path = PATH_START;
       path += PATH_BUTTON_SET;
       path += i;
-      WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleButtonSet, this));
+      WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleButtonSet, this));
 
       path = PATH_START;
       path += PATH_SAVE_BUTTON_SET;
       path += i;
-      WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleButtonSaveSet, this));
+      WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleButtonSaveSet, this));
     }
   }
 #endif
@@ -43,17 +43,17 @@ void SuplaWebPageControl::createWebPageControl() {
 #ifdef SUPLA_LIMIT_SWITCH
   path = PATH_START;
   path += PATH_SWITCH;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleLimitSwitch, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleLimitSwitch, this));
   path = PATH_START;
   path += PATH_SAVE_SWITCH;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageControl::handleLimitSwitchSave, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleLimitSwitchSave, this));
 #endif
 }
 
 void SuplaWebPageControl::handleControl() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_control(0);
 }
@@ -62,8 +62,8 @@ void SuplaWebPageControl::handleControlSave() {
   //  Serial.println(F("HTTP_POST - metoda handleControlSave"));
 
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   uint8_t nr, last_value;
@@ -84,8 +84,8 @@ void SuplaWebPageControl::handleControlSave() {
     }
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_BUTTON).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_BUTTON, WebServer->httpServer.arg(INPUT_MAX_BUTTON).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_MAX_BUTTON).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_BUTTON, WebServer->httpServer->arg(INPUT_MAX_BUTTON).c_str());
   }
 #endif
 
@@ -145,8 +145,8 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
 void SuplaWebPageControl::handleButtonSet() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_button_set(0);
 }
@@ -154,8 +154,8 @@ void SuplaWebPageControl::handleButtonSet() {
 void SuplaWebPageControl::handleButtonSaveSet() {
   //  Serial.println(F("HTTP_POST - metoda handleRelaySaveSet"));
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   String readUrl, nr_button, input, path;
@@ -168,7 +168,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
 
   path = PATH_START;
   path += PATH_SAVE_BUTTON_SET;
-  readUrl = WebServer->httpServer.uri();
+  readUrl = WebServer->httpServer->uri();
 
   place = readUrl.indexOf(path);
   nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
@@ -178,15 +178,15 @@ void SuplaWebPageControl::handleButtonSaveSet() {
 
   input = INPUT_BUTTON_EVENT;
   input += nr_button;
-  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, MEMORY, WebServer->httpServer->arg(input).toInt());
 
   input = INPUT_RELAY_LEVEL;
   input += nr_button;
-  ConfigManager->setElement(key, LEVEL_BUTTON, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL_BUTTON, WebServer->httpServer->arg(input).toInt());
 
   input = INPUT_BUTTON_ACTION;
   input += nr_button;
-  ConfigManager->setElement(key, ACTION_BUTTON, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, ACTION_BUTTON, WebServer->httpServer->arg(input).toInt());
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
@@ -213,7 +213,7 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   else {
     path = PATH_START;
     path += PATH_BUTTON_SET;
-    readUrl = WebServer->httpServer.uri();
+    readUrl = WebServer->httpServer->uri();
 
     place = readUrl.indexOf(path);
     nr_button = readUrl.substring(place + path.length(), place + path.length() + 3);
@@ -244,16 +244,16 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
 #ifdef SUPLA_LIMIT_SWITCH
 void SuplaWebPageControl::handleLimitSwitch() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   suplaWebpageLimitSwitch(0);
 }
 
 void SuplaWebPageControl::handleLimitSwitchSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   uint8_t nr, last_value;
@@ -274,8 +274,8 @@ void SuplaWebPageControl::handleLimitSwitchSave() {
     }
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_LIMIT_SWITCH).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_LIMIT_SWITCH, WebServer->httpServer.arg(INPUT_MAX_LIMIT_SWITCH).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_MAX_LIMIT_SWITCH).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_LIMIT_SWITCH, WebServer->httpServer->arg(INPUT_MAX_LIMIT_SWITCH).c_str());
   }
 
   switch (ConfigManager->save()) {
@@ -326,8 +326,8 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
 
 void SuplaWebPageControl::handleButtonSetMCP23017() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_button_set_MCP23017(0);
 }
@@ -360,8 +360,8 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
 
 void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   String input;
@@ -370,13 +370,13 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   input.reserve(10);
 
   input = INPUT_BUTTON_EVENT;
-  event = WebServer->httpServer.arg(input).toInt();
+  event = WebServer->httpServer->arg(input).toInt();
 
   input = INPUT_RELAY_LEVEL;
-  level = WebServer->httpServer.arg(input).toInt();
+  level = WebServer->httpServer->arg(input).toInt();
 
   input = INPUT_BUTTON_ACTION;
-  action = WebServer->httpServer.arg(input).toInt();
+  action = WebServer->httpServer->arg(input).toInt();
 
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
index dc347c86..48940f3b 100644
--- a/src/SuplaWebPageDownload.cpp
+++ b/src/SuplaWebPageDownload.cpp
@@ -3,13 +3,13 @@
 #include "LittleFS.h"
 
 void createWebDownload() {
-  WebServer->httpServer.on(getURL(PATH_DOWNLOAD), handleDownload);
+  WebServer->httpServer->on(getURL(PATH_DOWNLOAD), handleDownload);
 }
 
 void handleDownload() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   File dataFile = LittleFS.open(F(CONFIG_FILE_PATH), "r");
@@ -24,7 +24,7 @@ void handleDownload() {
   str += '_';
   str += F(".dat");
 
-  WebServer->httpServer.sendHeader(F("Content-Disposition"), str);
-  WebServer->httpServer.streamFile(dataFile, F("application/octet-stream"));
+  WebServer->httpServer->sendHeader(F("Content-Disposition"), str);
+  WebServer->httpServer->streamFile(dataFile, F("application/octet-stream"));
   dataFile.close();
 }
\ No newline at end of file
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index ae39e555..74379438 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -2,20 +2,20 @@
 
 void createWebPageOther() {
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
-  WebServer->httpServer.on(getURL(PATH_OTHER), handleOther);
-  WebServer->httpServer.on(getURL(PATH_SAVE_OTHER), handleOtherSave);
+  WebServer->httpServer->on(getURL(PATH_OTHER), handleOther);
+  WebServer->httpServer->on(getURL(PATH_SAVE_OTHER), handleOtherSave);
 
 #if defined(SUPLA_IMPULSE_COUNTER)
   for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); i++) {
-    WebServer->httpServer.on(getURL(PATH_IMPULSE_COUNTER_SET, i), handleImpulseCounterSet);
-    WebServer->httpServer.on(getURL(PATH_SAVE_IMPULSE_COUNTER_SET, i), handleImpulseCounterSaveSet);
+    WebServer->httpServer->on(getURL(PATH_IMPULSE_COUNTER_SET, i), handleImpulseCounterSet);
+    WebServer->httpServer->on(getURL(PATH_SAVE_IMPULSE_COUNTER_SET, i), handleImpulseCounterSaveSet);
   }
 #endif
 
 #if defined(SUPLA_HLW8012)
   if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
-    WebServer->httpServer.on(getURL(PATH_HLW8012_CALIBRATE), handleHLW8012Calibrate);
-    WebServer->httpServer.on(getURL(PATH_SAVE_HLW8012_CALIBRATE), handleHLW8012CalibrateSave);
+    WebServer->httpServer->on(getURL(PATH_HLW8012_CALIBRATE), handleHLW8012Calibrate);
+    WebServer->httpServer->on(getURL(PATH_SAVE_HLW8012_CALIBRATE), handleHLW8012CalibrateSave);
   }
 #endif
 #endif
@@ -24,16 +24,16 @@ void createWebPageOther() {
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
 void handleOther() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   suplaWebPageOther(0);
 }
 
 void handleOtherSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   uint8_t nr, last_value;
@@ -47,11 +47,11 @@ void handleOtherSave() {
     suplaWebPageOther(6);
     return;
   }
-  ConfigManager->set(KEY_HC_SR04_MAX_SENSOR_READ, WebServer->httpServer.arg(INPUT_HC_SR04_MAX_SENSOR_READ).c_str());
+  ConfigManager->set(KEY_HC_SR04_MAX_SENSOR_READ, WebServer->httpServer->arg(INPUT_HC_SR04_MAX_SENSOR_READ).c_str());
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
-  // Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+  // Supla::GUI::impulseCounter[0]->setCounter((unsigned long long)WebServer->httpServer->arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
 
   last_value = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
@@ -61,8 +61,8 @@ void handleOtherSave() {
     }
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_IMPULSE_COUNTER).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_IMPULSE_COUNTER, WebServer->httpServer.arg(INPUT_MAX_IMPULSE_COUNTER).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_MAX_IMPULSE_COUNTER).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_IMPULSE_COUNTER, WebServer->httpServer->arg(INPUT_MAX_IMPULSE_COUNTER).c_str());
   }
 #endif
 
@@ -76,7 +76,7 @@ void handleOtherSave() {
       return;
     }
   }
-  ConfigManager->set(KEY_MAX_RGBW, WebServer->httpServer.arg(INPUT_RGBW_MAX).c_str());
+  ConfigManager->set(KEY_MAX_RGBW, WebServer->httpServer->arg(INPUT_RGBW_MAX).c_str());
 #endif
 
 #ifdef SUPLA_HLW8012
@@ -87,12 +87,12 @@ void handleOtherSave() {
 #endif
 
 #if defined(SUPLA_PUSHOVER)
-  if (strcmp(WebServer->httpServer.arg(INPUT_PUSHOVER_TOKEN).c_str(), "") != 0) {
-    ConfigManager->set(KEY_PUSHOVER_TOKEN, WebServer->httpServer.arg(INPUT_PUSHOVER_TOKEN).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_PUSHOVER_TOKEN).c_str(), "") != 0) {
+    ConfigManager->set(KEY_PUSHOVER_TOKEN, WebServer->httpServer->arg(INPUT_PUSHOVER_TOKEN).c_str());
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_PUSHOVER_USER).c_str(), "") != 0) {
-    ConfigManager->set(KEY_PUSHOVER_USER, WebServer->httpServer.arg(INPUT_PUSHOVER_USER).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_PUSHOVER_USER).c_str(), "") != 0) {
+    ConfigManager->set(KEY_PUSHOVER_USER, WebServer->httpServer->arg(INPUT_PUSHOVER_USER).c_str());
   }
 #endif
 
@@ -172,16 +172,16 @@ void suplaWebPageOther(int save) {
 #ifdef SUPLA_IMPULSE_COUNTER
 void handleImpulseCounterSet() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_impulse_counter_set(0);
 }
 
 void handleImpulseCounterSaveSet() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   String readUrl, nr, input;
@@ -189,7 +189,7 @@ void handleImpulseCounterSaveSet() {
 
   String path = PATH_START;
   path += PATH_SAVE_IMPULSE_COUNTER_SET;
-  readUrl = WebServer->httpServer.uri();
+  readUrl = WebServer->httpServer->uri();
 
   place = readUrl.indexOf(path);
   nr = readUrl.substring(place + path.length(), place + path.length() + 3);
@@ -197,14 +197,14 @@ void handleImpulseCounterSaveSet() {
 
   input = INPUT_IMPULSE_COUNTER_PULL_UP;
   input += nr;
-  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, MEMORY, WebServer->httpServer->arg(input).toInt());
 
   input = INPUT_IMPULSE_COUNTER_RAISING_EDGE;
   input += nr;
-  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer->arg(input).toInt());
 
-  ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
-  Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer.arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+  ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer->arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
+  Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer->arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
@@ -225,7 +225,7 @@ void supla_impulse_counter_set(int save) {
 
   String path = PATH_START;
   path += PATH_IMPULSE_COUNTER_SET;
-  readUrl = WebServer->httpServer.uri();
+  readUrl = WebServer->httpServer->uri();
 
   place = readUrl.indexOf(path);
   nr = readUrl.substring(place + path.length(), place + path.length() + 3);
@@ -316,27 +316,27 @@ void supla_impulse_counter_set(int save) {
 #if defined(SUPLA_HLW8012)
 void handleHLW8012Calibrate() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   suplaWebpageHLW8012Calibrate(0);
 }
 
 void handleHLW8012CalibrateSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   double calibPower, calibVoltage = 0;
   String input = INPUT_CALIB_POWER;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    calibPower = WebServer->httpServer.arg(input).toDouble();
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    calibPower = WebServer->httpServer->arg(input).toDouble();
   }
 
   input = INPUT_CALIB_VOLTAGE;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    calibVoltage = WebServer->httpServer.arg(input).toDouble();
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    calibVoltage = WebServer->httpServer->arg(input).toDouble();
   }
 
   if (calibPower && calibVoltage) {
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 61cf36b5..f6f895c3 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -18,47 +18,47 @@ void SuplaWebPageRelay::createWebPageRelay() {
 
   path += PATH_START;
   path += PATH_RELAY;
-  WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelay, this));
+  WebServer->httpServer->on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelay, this));
   path = PATH_START;
   path += PATH_SAVE_RELAY;
-  WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySave, this));
+  WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySave, this));
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     path = PATH_START;
     path += PATH_RELAY_SET;
-    WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySetMCP23017, this));
+    WebServer->httpServer->on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySetMCP23017, this));
 
     path = PATH_START;
     path += PATH_SAVE_RELAY_SET;
-    WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSetMCP23017, this));
+    WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSetMCP23017, this));
   }
   else {
     for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
       path = PATH_START;
       path += PATH_RELAY_SET;
       path += i;
-      WebServer->httpServer.on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySet, this));
+      WebServer->httpServer->on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySet, this));
 
       path = PATH_START;
       path += PATH_SAVE_RELAY_SET;
       path += i;
-      WebServer->httpServer.on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSet, this));
+      WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSet, this));
     }
   }
 }
 
 void SuplaWebPageRelay::handleRelay() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_relay(0);
 }
 
 void SuplaWebPageRelay::handleRelaySave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   uint8_t nr, last_value;
@@ -79,8 +79,8 @@ void SuplaWebPageRelay::handleRelaySave() {
     }
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_RELAY).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_RELAY, WebServer->httpServer.arg(INPUT_MAX_RELAY).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_MAX_RELAY).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_RELAY, WebServer->httpServer->arg(INPUT_MAX_RELAY).c_str());
   }
 
   switch (ConfigManager->save()) {
@@ -136,16 +136,16 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
 
 void SuplaWebPageRelay::handleRelaySet() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_relay_set(0);
 }
 
 void SuplaWebPageRelay::handleRelaySaveSet() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   String readUrl, nr_relay, input, path;
@@ -158,7 +158,7 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
 
   path = PATH_START;
   path += PATH_SAVE_RELAY_SET;
-  readUrl = WebServer->httpServer.uri();
+  readUrl = WebServer->httpServer->uri();
 
   place = readUrl.indexOf(path);
   nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
@@ -168,36 +168,36 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
 
   input = INPUT_RELAY_MEMORY;
   input += nr_relay;
-  ConfigManager->setElement(key, MEMORY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, MEMORY, WebServer->httpServer->arg(input).toInt());
 
   input = INPUT_RELAY_LEVEL;
   input += nr_relay;
-  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer->arg(input).toInt());
 
   input = INPUT_CONDITIONS_SENSOR_TYPE;
-  ConfigManager->setElement(KEY_CONDITIONS_SENSOR_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(KEY_CONDITIONS_SENSOR_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).toInt());
   input = INPUT_CONDITIONS_TYPE;
-  ConfigManager->setElement(KEY_CONDITIONS_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
+  ConfigManager->setElement(KEY_CONDITIONS_TYPE, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).toInt());
   input = INPUT_CONDITIONS_MIN;
-  ConfigManager->setElement(KEY_CONDITIONS_MIN, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+  ConfigManager->setElement(KEY_CONDITIONS_MIN, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).c_str());
   input = INPUT_CONDITIONS_MAX;
-  ConfigManager->setElement(KEY_CONDITIONS_MAX, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+  ConfigManager->setElement(KEY_CONDITIONS_MAX, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).c_str());
 
 #if defined(SUPLA_PUSHOVER)
   if (nr_relay.toInt() <= MAX_PUSHOVER_MESSAGE) {
     input = INPUT_PUSHOVER;
-    ConfigManager->setElement(KEY_PUSHOVER, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_PUSHOVER, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).toInt());
     input = INPUT_PUSHOVER_MESSAGE;
-    ConfigManager->setElement(KEY_PUSHOVER_MASSAGE, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+    ConfigManager->setElement(KEY_PUSHOVER_MASSAGE, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).c_str());
   }
 #endif
 
 #if defined(SUPLA_DIRECT_LINKS)
   if (nr_relay.toInt() <= MAX_DIRECT_LINKS_SIZE) {
     input = INPUT_DIRECT_LINK_ON;
-    ConfigManager->setElement(KEY_DIRECT_LINKS_ON, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+    ConfigManager->setElement(KEY_DIRECT_LINKS_ON, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).c_str());
     input = INPUT_DIRECT_LINK_OFF;
-    ConfigManager->setElement(KEY_DIRECT_LINKS_OFF, (nr_relay.toInt() - 1), WebServer->httpServer.arg(input).c_str());
+    ConfigManager->setElement(KEY_DIRECT_LINKS_OFF, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).c_str());
   }
 #endif
 
@@ -229,7 +229,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   else {
     path = PATH_START;
     path += PATH_RELAY_SET;
-    readUrl = WebServer->httpServer.uri();
+    readUrl = WebServer->httpServer->uri();
 
     place = readUrl.indexOf(path);
     nr_relay = readUrl.substring(place + path.length(), place + path.length() + 3);
@@ -294,8 +294,8 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
 
 void SuplaWebPageRelay::handleRelaySetMCP23017() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_relay_set_MCP23017(0);
 }
@@ -349,8 +349,8 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
 
 void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   String input;
@@ -359,10 +359,10 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
   input.reserve(9);
 
   input = INPUT_RELAY_MEMORY;
-  memory = WebServer->httpServer.arg(input).toInt();
+  memory = WebServer->httpServer->arg(input).toInt();
 
   input = INPUT_RELAY_LEVEL;
-  level = WebServer->httpServer.arg(input).toInt();
+  level = WebServer->httpServer->arg(input).toInt();
 
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
@@ -374,10 +374,10 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
   for (uint8_t i = 0; i < MAX_PUSHOVER_MESSAGE; i++) {
     input = INPUT_PUSHOVER;
     input += i;
-    ConfigManager->setElement(KEY_PUSHOVER, i, WebServer->httpServer.arg(input).toInt());
+    ConfigManager->setElement(KEY_PUSHOVER, i, WebServer->httpServer->arg(input).toInt());
     input = INPUT_PUSHOVER_MESSAGE;
     input += i;
-    ConfigManager->setElement(KEY_PUSHOVER_MASSAGE, i, WebServer->httpServer.arg(input).c_str());
+    ConfigManager->setElement(KEY_PUSHOVER_MASSAGE, i, WebServer->httpServer->arg(input).c_str());
   }
 #endif
 
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 3a434ee3..4e930db9 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -17,52 +17,52 @@ void SuplaWebPageSensor::createWebPageSensor() {
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
   path = PATH_START;
   path += PATH_1WIRE;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handle1Wire, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handle1Wire, this));
   path = PATH_START;
   path += PATH_SAVE_1WIRE;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handle1WireSave, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handle1WireSave, this));
 #ifdef SUPLA_DS18B20
   path = PATH_START;
   path += PATH_MULTI_DS;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleSearchDS, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handleSearchDS, this));
   path = PATH_START;
   path += PATH_SAVE_MULTI_DS;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleDSSave, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handleDSSave, this));
 #endif
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MCP23017)
   path = PATH_START;
   path += PATH_I2C;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handlei2c, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handlei2c, this));
   path = PATH_START;
   path += PATH_SAVE_I2C;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handlei2cSave, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handlei2cSave, this));
 #endif
 
 #if defined(SUPLA_MAX6675)
   path = PATH_START;
   path += PATH_SPI;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleSpi, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handleSpi, this));
   path = PATH_START;
   path += PATH_SAVE_SPI;
-  WebServer->httpServer.on(path, std::bind(&SuplaWebPageSensor::handleSpiSave, this));
+  WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handleSpiSave, this));
 #endif
 }
 
 #ifdef SUPLA_DS18B20
 void SuplaWebPageSensor::handleSearchDS() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_search(0);
 }
 
 void SuplaWebPageSensor::handleDSSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   for (uint8_t i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); i++) {
     String dsAddr = INPUT_DS18B20_ADDR;
@@ -70,10 +70,10 @@ void SuplaWebPageSensor::handleDSSave() {
     dsAddr += i;
     dsName += i;
 
-    ConfigManager->setElement(KEY_ADDR_DS18B20, i, WebServer->httpServer.arg(dsAddr).c_str());
+    ConfigManager->setElement(KEY_ADDR_DS18B20, i, WebServer->httpServer->arg(dsAddr).c_str());
 
-    if (strcmp(WebServer->httpServer.arg(dsName).c_str(), "") != 0) {
-      ConfigManager->setElement(KEY_NAME_SENSOR, i, WebServer->httpServer.arg(dsName).c_str());
+    if (strcmp(WebServer->httpServer->arg(dsName).c_str(), "") != 0) {
+      ConfigManager->setElement(KEY_NAME_SENSOR, i, WebServer->httpServer->arg(dsName).c_str());
     }
 
     Supla::GUI::sensorDS[i]->setDeviceAddress(HexToBytes(ConfigManager->get(KEY_ADDR_DS18B20)->getElement(i)));
@@ -226,16 +226,16 @@ void SuplaWebPageSensor::showDS18B20(bool readonly) {
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
 void SuplaWebPageSensor::handle1Wire() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_1wire(0);
 }
 
 void SuplaWebPageSensor::handle1WireSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   uint8_t nr, last_value;
@@ -249,8 +249,8 @@ void SuplaWebPageSensor::handle1WireSave() {
     }
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_DHT11).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_DHT11, WebServer->httpServer.arg(INPUT_MAX_DHT11).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_MAX_DHT11).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_DHT11, WebServer->httpServer->arg(INPUT_MAX_DHT11).c_str());
   }
 #endif
 
@@ -263,8 +263,8 @@ void SuplaWebPageSensor::handle1WireSave() {
     }
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_DHT22).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_DHT22, WebServer->httpServer.arg(INPUT_MAX_DHT22).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_MAX_DHT22).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_DHT22, WebServer->httpServer->arg(INPUT_MAX_DHT22).c_str());
   }
 #endif
 
@@ -273,8 +273,8 @@ void SuplaWebPageSensor::handle1WireSave() {
     supla_webpage_1wire(6);
     return;
   }
-  if (strcmp(WebServer->httpServer.arg(INPUT_MAX_DS18B20).c_str(), "") > 0) {
-    ConfigManager->set(KEY_MULTI_MAX_DS18B20, WebServer->httpServer.arg(INPUT_MAX_DS18B20).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_MAX_DS18B20).c_str(), "") > 0) {
+    ConfigManager->set(KEY_MULTI_MAX_DS18B20, WebServer->httpServer->arg(INPUT_MAX_DS18B20).c_str());
   }
 #endif
 
@@ -358,16 +358,16 @@ void SuplaWebPageSensor::supla_webpage_1wire(int save) {
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
 void SuplaWebPageSensor::handlei2c() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_i2c(0);
 }
 
 void SuplaWebPageSensor::handlei2cSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   String input;
@@ -385,38 +385,38 @@ void SuplaWebPageSensor::handlei2cSave() {
 #ifdef SUPLA_BME280
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_BME280;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_BME280, WebServer->httpServer.arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_BME280, WebServer->httpServer->arg(input).toInt());
   }
 
   key = KEY_ALTITUDE_BME280;
   input = INPUT_ALTITUDE_BME280;
-  if (strcmp(WebServer->httpServer.arg(INPUT_ALTITUDE_BME280).c_str(), "") != 0) {
-    ConfigManager->set(key, WebServer->httpServer.arg(input).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_ALTITUDE_BME280).c_str(), "") != 0) {
+    ConfigManager->set(key, WebServer->httpServer->arg(input).c_str());
   }
 #endif
 
 #ifdef SUPLA_SHT3x
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_SHT3x;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_SHT3x, WebServer->httpServer.arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_SHT3x, WebServer->httpServer->arg(input).toInt());
   }
 #endif
 
 #ifdef SUPLA_SI7021
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_SI7021;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_SI7021, WebServer->httpServer.arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_SI7021, WebServer->httpServer->arg(input).toInt());
   }
 #endif
 
 #ifdef SUPLA_OLED
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_OLED;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_OLED, WebServer->httpServer.arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_OLED, WebServer->httpServer->arg(input).toInt());
   }
 
   if (!WebServer->saveGPIO(INPUT_BUTTON_GPIO, FUNCTION_CFG_BUTTON)) {
@@ -425,15 +425,15 @@ void SuplaWebPageSensor::handlei2cSave() {
   }
 
   input = INPUT_OLED_ANIMATION;
-  ConfigManager->set(KEY_OLED_ANIMATION, WebServer->httpServer.arg(input).c_str());
+  ConfigManager->set(KEY_OLED_ANIMATION, WebServer->httpServer->arg(input).c_str());
   input = INPUT_OLED_BRIGHTNESS;
-  ConfigManager->set(KEY_OLED_BACK_LIGHT_TIME, WebServer->httpServer.arg(input).c_str());
+  ConfigManager->set(KEY_OLED_BACK_LIGHT_TIME, WebServer->httpServer->arg(input).c_str());
 
   for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
     input = INPUT_DS18B20_NAME;
     input += i;
-    if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-      ConfigManager->setElement(KEY_NAME_SENSOR, i, WebServer->httpServer.arg(input).c_str());
+    if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+      ConfigManager->setElement(KEY_NAME_SENSOR, i, WebServer->httpServer->arg(input).c_str());
     }
   }
 #endif
@@ -441,8 +441,8 @@ void SuplaWebPageSensor::handlei2cSave() {
 #ifdef SUPLA_MCP23017
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_MCP23017;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_MCP23017, WebServer->httpServer.arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_MCP23017, WebServer->httpServer->arg(input).toInt());
 
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       ConfigESP->clearFunctionGpio(FUNCTION_RELAY);
@@ -542,16 +542,16 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #if defined(SUPLA_MAX6675)
 void SuplaWebPageSensor::handleSpi() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   supla_webpage_spi(0);
 }
 
 void SuplaWebPageSensor::handleSpiSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   String input;
@@ -575,8 +575,8 @@ void SuplaWebPageSensor::handleSpiSave() {
 #ifdef SUPLA_MAX6675
   key = KEY_ACTIVE_SENSOR;
   input = INPUT_MAX6675;
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_MAX6675, WebServer->httpServer.arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(KEY_ACTIVE_SENSOR, SENSOR_I2C_MAX6675, WebServer->httpServer->arg(input).toInt());
   }
 #endif
 
diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
index b6d110eb..bf44c047 100644
--- a/src/SuplaWebPageStatusLed.cpp
+++ b/src/SuplaWebPageStatusLed.cpp
@@ -5,14 +5,14 @@
 #include "Markup.h"
 
 void createWebStatusLed() {
-  WebServer->httpServer.on(getURL(PATH_LED), handleStatusLed);
-  WebServer->httpServer.on(getURL(PATH_SAVE_LED), handleStatusLedSave);
+  WebServer->httpServer->on(getURL(PATH_LED), handleStatusLed);
+  WebServer->httpServer->on(getURL(PATH_SAVE_LED), handleStatusLedSave);
 }
 
 void handleStatusLed() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
   webStatusLed(0);
 }
@@ -21,12 +21,12 @@ void handleStatusLedSave() {
   uint8_t nr;
 
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
-  if (strcmp(WebServer->httpServer.arg(INPUT_LEVEL_LED).c_str(), "") != 0) {
-    ConfigManager->set(KEY_LEVEL_LED, WebServer->httpServer.arg(INPUT_LEVEL_LED).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_LEVEL_LED).c_str(), "") != 0) {
+    ConfigManager->set(KEY_LEVEL_LED, WebServer->httpServer->arg(INPUT_LEVEL_LED).c_str());
   }
 
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index 63306719..8f8ffd61 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -2,15 +2,15 @@
 #include "SuplaDeviceGUI.h"
 
 void createWebTools() {
-  WebServer->httpServer.on(getURL(PATH_TOOLS), handleTools);
+  WebServer->httpServer->on(getURL(PATH_TOOLS), handleTools);
 
-  WebServer->httpServer.on(getURL(PATH_FACTORY_RESET), [&]() {
+  WebServer->httpServer->on(getURL(PATH_FACTORY_RESET), [&]() {
     if (ConfigESP->configModeESP == NORMAL_MODE) {
-      if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-        return WebServer->httpServer.requestAuthentication();
+      if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+        return WebServer->httpServer->requestAuthentication();
     }
-    WebServer->httpServer.sendHeader("Location", "/");
-    WebServer->httpServer.send(303);
+    WebServer->httpServer->sendHeader("Location", "/");
+    WebServer->httpServer->send(303);
     WebServer->supla_webpage_start(0);
     ConfigESP->factoryReset(true);
   });
@@ -18,8 +18,8 @@ void createWebTools() {
 
 void handleTools() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   addFormHeader(webContentBuffer, F("Narzędzia"));
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index 2ac4470b..6e0acee3 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -12,27 +12,27 @@ static const char uploadIndex[] PROGMEM =
 File dataFile;
 
 void createWebUpload() {
-  // WebServer->httpServer.on(F("/upload"), HTTP_GET, handleUpload);
-  WebServer->httpServer.on(getURL(PATH_UPLOAD), HTTP_GET, []() { handleUpload(); });
-  // WebServer->httpServer.on(F("/upload"), HTTP_POST, handleFileUpload);
-  WebServer->httpServer.on(
+  // WebServer->httpServer->on(F("/upload"), HTTP_GET, handleUpload);
+  WebServer->httpServer->on(getURL(PATH_UPLOAD), HTTP_GET, []() { handleUpload(); });
+  // WebServer->httpServer->on(F("/upload"), HTTP_POST, handleFileUpload);
+  WebServer->httpServer->on(
       getURL(PATH_UPLOAD), HTTP_POST,
       []() {
-        if (WebServer->httpServer.hasArg("generateGUIDandAUTHKEY")) {
-          if (WebServer->httpServer.arg("generateGUIDandAUTHKEY") == "1") {
+        if (WebServer->httpServer->hasArg("generateGUIDandAUTHKEY")) {
+          if (WebServer->httpServer->arg("generateGUIDandAUTHKEY") == "1") {
             ConfigManager->setGUIDandAUTHKEY();
             ConfigManager->save();
           }
         }
-        WebServer->httpServer.send(200);
+        WebServer->httpServer->send(200);
       },
       handleFileUpload);
 }
 
 void handleUpload(int save) {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   webContentBuffer += SuplaSaveResult(save);
@@ -51,17 +51,17 @@ void handleUpload(int save) {
   webContentBuffer += F("</button></a><br><br>");
 
   WebServer->sendContent();
-  // WebServer->httpServer.send(200, PSTR("text/html"), FPSTR(uploadIndex));
+  // WebServer->httpServer->send(200, PSTR("text/html"), FPSTR(uploadIndex));
 }
 
 void handleFileUpload() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer.authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer.requestAuthentication();
+    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
+      return WebServer->httpServer->requestAuthentication();
   }
 
   if (LittleFS.begin()) {
-    HTTPUpload& upload = WebServer->httpServer.upload();
+    HTTPUpload& upload = WebServer->httpServer->upload();
 
     if (upload.status == UPLOAD_FILE_START) {
       dataFile = LittleFS.open(CONFIG_FILE_PATH, "w");
@@ -73,14 +73,14 @@ void handleFileUpload() {
     else if (upload.status == UPLOAD_FILE_END) {
       if (dataFile) {
         dataFile.close();
-        // WebServer->httpServer.sendHeader("Location", "/upload");
-        // WebServer->httpServer.send(303);
+        // WebServer->httpServer->sendHeader("Location", "/upload");
+        // WebServer->httpServer->send(303);
         ConfigManager->load();
         handleUpload(1);
       }
       else {
         handleUpload(6);
-        // WebServer->httpServer.send(500, "text/plain", "500: couldn't create file");
+        // WebServer->httpServer->send(500, "text/plain", "500: couldn't create file");
       }
     }
   }
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 85b57fc6..89313558 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -29,6 +29,8 @@
 String webContentBuffer;
 
 SuplaWebServer::SuplaWebServer() {
+  httpServer = new ESP8266WebServer(80);
+  httpUpdater = new ESP8266HTTPUpdateServer();
 }
 
 void SuplaWebServer::begin() {
@@ -37,28 +39,28 @@ void SuplaWebServer::begin() {
   strcpy(this->www_username, ConfigManager->get(KEY_LOGIN)->getValue());
   strcpy(this->www_password, ConfigManager->get(KEY_LOGIN_PASS)->getValue());
 
-  httpServer.onNotFound(std::bind(&SuplaWebServer::handleNotFound, this));
-  httpServer.begin(80);
+  httpServer->onNotFound(std::bind(&SuplaWebServer::handleNotFound, this));
+  httpServer->begin();
 }
 
 void SuplaWebServer::iterateAlways() {
-  httpServer.handleClient();
+  httpServer->handleClient();
 }
 
 void SuplaWebServer::createWebServer() {
   String path = PATH_START;
-  httpServer.on(path, HTTP_GET, std::bind(&SuplaWebServer::handle, this));
+  httpServer->on(path, HTTP_GET, std::bind(&SuplaWebServer::handle, this));
   path = PATH_START;
-  httpServer.on(path, std::bind(&SuplaWebServer::handleSave, this));
+  httpServer->on(path, std::bind(&SuplaWebServer::handleSave, this));
   path = PATH_START;
   path += PATH_REBOT;
-  httpServer.on(path, std::bind(&SuplaWebServer::supla_webpage_reboot, this));
+  httpServer->on(path, std::bind(&SuplaWebServer::supla_webpage_reboot, this));
   path = PATH_START;
   path += PATH_DEVICE_SETTINGS;
-  httpServer.on(path, std::bind(&SuplaWebServer::handleDeviceSettings, this));
+  httpServer->on(path, std::bind(&SuplaWebServer::handleDeviceSettings, this));
   path = PATH_START;
   path += PATH_SAVE_BOARD;
-  httpServer.on(path, std::bind(&SuplaWebServer::handleBoardSave, this));
+  httpServer->on(path, std::bind(&SuplaWebServer::handleBoardSave, this));
 
 #if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
   WebPageRelay->createWebPageRelay();
@@ -71,7 +73,7 @@ void SuplaWebServer::createWebServer() {
   WebPageConfig->createWebPageConfig();
 #endif
 #ifdef SUPLA_OTA
-  httpUpdater.setup(&httpServer, ConfigManager->get(KEY_LOGIN)->getValue(), ConfigManager->get(KEY_LOGIN_PASS)->getValue());
+  httpUpdater->setup(httpServer, ConfigManager->get(KEY_LOGIN)->getValue(), ConfigManager->get(KEY_LOGIN_PASS)->getValue());
 #endif
 
   createWebDownload();
@@ -84,8 +86,8 @@ void SuplaWebServer::createWebServer() {
 void SuplaWebServer::handle() {
   //  Serial.println(F("HTTP_GET - metoda handle"));
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer.authenticate(this->www_username, this->www_password))
-      return httpServer.requestAuthentication();
+    if (!httpServer->authenticate(this->www_username, this->www_password))
+      return httpServer->requestAuthentication();
   }
   supla_webpage_start(0);
 }
@@ -93,26 +95,26 @@ void SuplaWebServer::handle() {
 void SuplaWebServer::handleSave() {
   //  Serial.println(F("HTTP_POST - metoda handleSave"));
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer.authenticate(this->www_username, this->www_password))
-      return httpServer.requestAuthentication();
+    if (!httpServer->authenticate(this->www_username, this->www_password))
+      return httpServer->requestAuthentication();
   }
 
-  if (strcmp(httpServer.arg(PATH_REBOT).c_str(), "1") == 0) {
+  if (strcmp(httpServer->arg(PATH_REBOT).c_str(), "1") == 0) {
     ConfigESP->rebootESP();
     return;
   }
 
-  ConfigManager->set(KEY_WIFI_SSID, httpServer.arg(INPUT_WIFI_SSID).c_str());
-  ConfigManager->set(KEY_WIFI_PASS, httpServer.arg(INPUT_WIFI_PASS).c_str());
-  ConfigManager->set(KEY_SUPLA_SERVER, httpServer.arg(INPUT_SERVER).c_str());
-  ConfigManager->set(KEY_SUPLA_EMAIL, httpServer.arg(INPUT_EMAIL).c_str());
-  ConfigManager->set(KEY_HOST_NAME, httpServer.arg(INPUT_HOSTNAME).c_str());
-  ConfigManager->set(KEY_LOGIN, httpServer.arg(INPUT_MODUL_LOGIN).c_str());
-  ConfigManager->set(KEY_LOGIN_PASS, httpServer.arg(INPUT_MODUL_PASS).c_str());
+  ConfigManager->set(KEY_WIFI_SSID, httpServer->arg(INPUT_WIFI_SSID).c_str());
+  ConfigManager->set(KEY_WIFI_PASS, httpServer->arg(INPUT_WIFI_PASS).c_str());
+  ConfigManager->set(KEY_SUPLA_SERVER, httpServer->arg(INPUT_SERVER).c_str());
+  ConfigManager->set(KEY_SUPLA_EMAIL, httpServer->arg(INPUT_EMAIL).c_str());
+  ConfigManager->set(KEY_HOST_NAME, httpServer->arg(INPUT_HOSTNAME).c_str());
+  ConfigManager->set(KEY_LOGIN, httpServer->arg(INPUT_MODUL_LOGIN).c_str());
+  ConfigManager->set(KEY_LOGIN_PASS, httpServer->arg(INPUT_MODUL_PASS).c_str());
 
 #ifdef SUPLA_ROLLERSHUTTER
-  if (strcmp(WebServer->httpServer.arg(INPUT_ROLLERSHUTTER).c_str(), "") != 0) {
-    ConfigManager->set(KEY_MAX_ROLLERSHUTTER, httpServer.arg(INPUT_ROLLERSHUTTER).c_str());
+  if (strcmp(WebServer->httpServer->arg(INPUT_ROLLERSHUTTER).c_str(), "") != 0) {
+    ConfigManager->set(KEY_MAX_ROLLERSHUTTER, httpServer->arg(INPUT_ROLLERSHUTTER).c_str());
   }
 #endif
 
@@ -137,8 +139,8 @@ void SuplaWebServer::handleSave() {
 
 void SuplaWebServer::handleDeviceSettings() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer.authenticate(www_username, www_password))
-      return httpServer.requestAuthentication();
+    if (!httpServer->authenticate(www_username, www_password))
+      return httpServer->requestAuthentication();
   }
   deviceSettings(0);
 }
@@ -188,8 +190,8 @@ void SuplaWebServer::supla_webpage_start(int save) {
 
 void SuplaWebServer::supla_webpage_reboot() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer.authenticate(www_username, www_password))
-      return httpServer.requestAuthentication();
+    if (!httpServer->authenticate(www_username, www_password))
+      return httpServer->requestAuthentication();
   }
   supla_webpage_start(2);
   ConfigESP->rebootESP();
@@ -249,13 +251,13 @@ void SuplaWebServer::deviceSettings(int save) {
 
 void SuplaWebServer::handleBoardSave() {
   if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer.authenticate(this->www_username, this->www_password))
-      return httpServer.requestAuthentication();
+    if (!httpServer->authenticate(this->www_username, this->www_password))
+      return httpServer->requestAuthentication();
   }
   String input = INPUT_BOARD;
 
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") != 0) {
-    ConfigManager->set(KEY_BOARD, httpServer.arg(input).c_str());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->set(KEY_BOARD, httpServer->arg(input).c_str());
 
     int nr;
     uint8_t key;
@@ -264,7 +266,7 @@ void SuplaWebServer::handleBoardSave() {
       ConfigManager->set(key, "");
     }
 
-    chooseTemplateBoard(WebServer->httpServer.arg(input).toInt());
+    chooseTemplateBoard(WebServer->httpServer->arg(input).toInt());
   }
 
   switch (ConfigManager->save()) {
@@ -278,22 +280,22 @@ void SuplaWebServer::handleBoardSave() {
 }
 
 void SuplaWebServer::sendContent() {
-  // httpServer.send(200, "text/html", "");
+  // httpServer->send(200, "text/html", "");
   // const int bufferSize = 1000;
   // String _buffer;
   //_buffer.reserve(bufferSize);
   // int bufferCounter = 0;
 
-  httpServer.sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
-  httpServer.sendHeader(F("Pragma"), F("no-cache"));
-  httpServer.sendHeader(F("Expires"), F("-1"));
-  httpServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
-  httpServer.chunkedResponseModeStart(200, F("text/html"));
+  httpServer->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
+  httpServer->sendHeader(F("Pragma"), F("no-cache"));
+  httpServer->sendHeader(F("Expires"), F("-1"));
+  httpServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
+  httpServer->chunkedResponseModeStart(200, F("text/html"));
 
-  httpServer.sendContent_P(HTTP_META);
-  httpServer.sendContent_P(HTTP_FAVICON);
-  httpServer.sendContent_P(HTTP_STYLE);
-  httpServer.sendContent_P(HTTP_LOGO);
+  httpServer->sendContent_P(HTTP_META);
+  httpServer->sendContent_P(HTTP_FAVICON);
+  httpServer->sendContent_P(HTTP_STYLE);
+  httpServer->sendContent_P(HTTP_LOGO);
 
   String summary = FPSTR(HTTP_SUMMARY);
 
@@ -304,31 +306,31 @@ void SuplaWebServer::sendContent() {
   summary.replace(F("{m}"), ConfigESP->getMacAddress(true));
   summary.replace(F("{f}"), String(ESP.getFreeHeap() / 1024.0));
 
-  httpServer.sendContent(summary);
-  httpServer.sendContent_P(HTTP_COPYRIGHT);
+  httpServer->sendContent(summary);
+  httpServer->sendContent_P(HTTP_COPYRIGHT);
 
-  // httpServer.send(200, "text/html", "");
+  // httpServer->send(200, "text/html", "");
   /*for (int i = 0; i < fileSize; i++) {
     _buffer += content[i];
     bufferCounter++;
 
     if (bufferCounter >= bufferSize) {
-      httpServer.sendContent(_buffer);
+      httpServer->sendContent(_buffer);
       yield();
       bufferCounter = 0;
       _buffer = "";
     }
   }
   if (bufferCounter > 0) {
-    httpServer.sendContent(_buffer);
+    httpServer->sendContent(_buffer);
     yield();
     bufferCounter = 0;
     _buffer = "";
   }*/
 
-  httpServer.sendContent(webContentBuffer);
-  httpServer.sendContent_P(HTTP_RBT);
-  httpServer.chunkedResponseFinalize();
+  httpServer->sendContent(webContentBuffer);
+  httpServer->sendContent_P(HTTP_RBT);
+  httpServer->chunkedResponseFinalize();
 
 #ifdef DEBUG_MODE
   Serial.printf_P(PSTR("Content size=%d\n"), webContentBuffer.length());
@@ -339,8 +341,8 @@ void SuplaWebServer::sendContent() {
 }
 
 void SuplaWebServer::handleNotFound() {
-  httpServer.sendHeader("Location", "/", true);
-  // httpServer.send(302, "text/plane", "");
+  httpServer->sendHeader("Location", "/", true);
+  // httpServer->send(302, "text/plane", "");
 
   supla_webpage_reboot();
 }
@@ -357,10 +359,10 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
     nr = 1;
   }
 
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") == 0) {
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") == 0) {
     return true;
   }
-  gpioInput = WebServer->httpServer.arg(input).toInt();
+  gpioInput = WebServer->httpServer->arg(input).toInt();
   key = KEY_GPIO + gpioInput;
 
   if (ConfigESP->getGpio(nr, function) != gpioInput || gpioInput == OFF_GPIO) {
@@ -385,7 +387,7 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   }
 
   if (input_max != "\n") {
-    current_value = WebServer->httpServer.arg(input_max).toInt();
+    current_value = WebServer->httpServer->arg(input_max).toInt();
     if (ConfigManager->get(key)->getElement(NR).toInt() > current_value) {
       ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
     }
@@ -397,13 +399,13 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
   uint8_t key, address, addressInput, gpio, gpioInput, functionElementInput;
   String input = _input + nr;
 
-  if (strcmp(WebServer->httpServer.arg(input).c_str(), "") == 0) {
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") == 0) {
     return true;
   }
 
-  addressInput = WebServer->httpServer.arg(INPUT_ADRESS_MCP23017).toInt();
+  addressInput = WebServer->httpServer->arg(INPUT_ADRESS_MCP23017).toInt();
 
-  gpioInput = WebServer->httpServer.arg(input).toInt();
+  gpioInput = WebServer->httpServer->arg(input).toInt();
   key = KEY_GPIO + gpioInput;
   functionElementInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
   gpio = ConfigESP->getGpioMCP23017(nr, function);
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index ce5e8d77..ef62f484 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -50,11 +50,10 @@
 #define INPUT_ROLLERSHUTTER "irsr"
 #define INPUT_BOARD         "board"
 
-
 extern String webContentBuffer;
 
-//https://www.esp8266.com/viewtopic.php?p=84249#p84249
-class MyWebServer : public ESP8266WebServer {
+// https://www.esp8266.com/viewtopic.php?p=84249#p84249
+/*class MyWebServer : public ESP8266WebServer {
   public:
   virtual ~MyWebServer() {
     if (this->_currentArgs) {
@@ -67,7 +66,7 @@ class MyWebServer : public ESP8266WebServer {
       this->_postArgs = nullptr;
     }
   }
-};
+};*/
 
 class SuplaWebServer : public Supla::Element {
  public:
@@ -79,15 +78,13 @@ class SuplaWebServer : public Supla::Element {
 
   void supla_webpage_start(int save);
 
-  //void sendContent(const String& content);
   void sendContent();
 
-  MyWebServer httpServer;
+  ESP8266WebServer* httpServer;
 
 #ifdef SUPLA_OTA
-  ESP8266HTTPUpdateServer httpUpdater;
+  ESP8266HTTPUpdateServer* httpUpdater;
 #endif
-
   bool saveGPIO(const String& _input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
   bool saveGpioMCP23017(const String& _input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
 

From 0014b708d04b7bfa0874265782d4e476b1e51abf Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 15 Feb 2021 18:23:53 +0100
Subject: [PATCH 078/165] isLoggedIn()

---
 src/SuplaHTTPUpdateServer.cpp |  5 ++---
 src/SuplaWebPageConfig.cpp    | 10 ++++-----
 src/SuplaWebPageControl.cpp   | 40 ++++++++++++++---------------------
 src/SuplaWebPageDownload.cpp  |  5 ++---
 src/SuplaWebPageOther.cpp     | 30 +++++++++++---------------
 src/SuplaWebPageRelay.cpp     | 30 +++++++++++---------------
 src/SuplaWebPageSensor.cpp    | 40 +++++++----------------------------
 src/SuplaWebPageStatusLed.cpp | 10 ++++-----
 src/SuplaWebPageTools.cpp     | 10 ++++-----
 src/SuplaWebPageUpload.cpp    | 10 ++++-----
 src/SuplaWebServer.cpp        | 38 ++++++++++++++++-----------------
 src/SuplaWebServer.h          |  6 +-----
 12 files changed, 88 insertions(+), 146 deletions(-)

diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index 20534dc8..f59c8c93 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -140,9 +140,8 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
 }
 
 void ESP8266HTTPUpdateServer::handleFirmwareUp() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   suplaWebPageUpddate();
 }
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index 6f56cade..901ed01c 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -21,17 +21,15 @@ void SuplaWebPageConfig::createWebPageConfig() {
 }
 
 void SuplaWebPageConfig::handleConfig() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_webpage_config(0);
 }
 
 void SuplaWebPageConfig::handleConfigSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   if (!WebServer->saveGPIO(INPUT_CFG_LED_GPIO, FUNCTION_CFG_LED)) {
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 2925beae..02db167d 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -51,9 +51,8 @@ void SuplaWebPageControl::createWebPageControl() {
 }
 
 void SuplaWebPageControl::handleControl() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_webpage_control(0);
 }
@@ -61,9 +60,8 @@ void SuplaWebPageControl::handleControl() {
 void SuplaWebPageControl::handleControlSave() {
   //  Serial.println(F("HTTP_POST - metoda handleControlSave"));
 
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   uint8_t nr, last_value;
@@ -144,18 +142,16 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
 
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
 void SuplaWebPageControl::handleButtonSet() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_webpage_button_set(0);
 }
 
 void SuplaWebPageControl::handleButtonSaveSet() {
   //  Serial.println(F("HTTP_POST - metoda handleRelaySaveSet"));
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   String readUrl, nr_button, input, path;
@@ -243,17 +239,15 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
 
 #ifdef SUPLA_LIMIT_SWITCH
 void SuplaWebPageControl::handleLimitSwitch() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   suplaWebpageLimitSwitch(0);
 }
 
 void SuplaWebPageControl::handleLimitSwitchSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   uint8_t nr, last_value;
@@ -325,9 +319,8 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
 #endif
 
 void SuplaWebPageControl::handleButtonSetMCP23017() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_webpage_button_set_MCP23017(0);
 }
@@ -359,9 +352,8 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
 }
 
 void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   String input;
diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
index 48940f3b..d4dbf3ff 100644
--- a/src/SuplaWebPageDownload.cpp
+++ b/src/SuplaWebPageDownload.cpp
@@ -7,9 +7,8 @@ void createWebDownload() {
 }
 
 void handleDownload() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   File dataFile = LittleFS.open(F(CONFIG_FILE_PATH), "r");
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 74379438..3453e9d3 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -23,17 +23,15 @@ void createWebPageOther() {
 
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
 void handleOther() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   suplaWebPageOther(0);
 }
 
 void handleOtherSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   uint8_t nr, last_value;
@@ -171,17 +169,15 @@ void suplaWebPageOther(int save) {
 
 #ifdef SUPLA_IMPULSE_COUNTER
 void handleImpulseCounterSet() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_impulse_counter_set(0);
 }
 
 void handleImpulseCounterSaveSet() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   String readUrl, nr, input;
@@ -315,17 +311,15 @@ void supla_impulse_counter_set(int save) {
 
 #if defined(SUPLA_HLW8012)
 void handleHLW8012Calibrate() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   suplaWebpageHLW8012Calibrate(0);
 }
 
 void handleHLW8012CalibrateSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   double calibPower, calibVoltage = 0;
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index f6f895c3..dfdc2c98 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -48,17 +48,15 @@ void SuplaWebPageRelay::createWebPageRelay() {
 }
 
 void SuplaWebPageRelay::handleRelay() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_webpage_relay(0);
 }
 
 void SuplaWebPageRelay::handleRelaySave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   uint8_t nr, last_value;
@@ -135,17 +133,15 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
 }
 
 void SuplaWebPageRelay::handleRelaySet() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_webpage_relay_set(0);
 }
 
 void SuplaWebPageRelay::handleRelaySaveSet() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   String readUrl, nr_relay, input, path;
@@ -293,9 +289,8 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
 }
 
 void SuplaWebPageRelay::handleRelaySetMCP23017() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   supla_webpage_relay_set_MCP23017(0);
 }
@@ -348,9 +343,8 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
 }
 
 void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   String input;
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 4e930db9..864fdb5c 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -52,18 +52,12 @@ void SuplaWebPageSensor::createWebPageSensor() {
 
 #ifdef SUPLA_DS18B20
 void SuplaWebPageSensor::handleSearchDS() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
   supla_webpage_search(0);
 }
 
 void SuplaWebPageSensor::handleDSSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
   for (uint8_t i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); i++) {
     String dsAddr = INPUT_DS18B20_ADDR;
     String dsName = INPUT_DS18B20_NAME;
@@ -225,18 +219,12 @@ void SuplaWebPageSensor::showDS18B20(bool readonly) {
 
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
 void SuplaWebPageSensor::handle1Wire() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
   supla_webpage_1wire(0);
 }
 
 void SuplaWebPageSensor::handle1WireSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
 
   uint8_t nr, last_value;
 
@@ -357,18 +345,12 @@ void SuplaWebPageSensor::supla_webpage_1wire(int save) {
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
 void SuplaWebPageSensor::handlei2c() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
   supla_webpage_i2c(0);
 }
 
 void SuplaWebPageSensor::handlei2cSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
 
   String input;
   uint8_t key;
@@ -541,18 +523,12 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 
 #if defined(SUPLA_MAX6675)
 void SuplaWebPageSensor::handleSpi() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
   supla_webpage_spi(0);
 }
 
 void SuplaWebPageSensor::handleSpiSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
-  }
+if (!WebServer->isLoggedIn()) { return; }
 
   String input;
   uint8_t key;
diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
index bf44c047..e84a5e1b 100644
--- a/src/SuplaWebPageStatusLed.cpp
+++ b/src/SuplaWebPageStatusLed.cpp
@@ -10,9 +10,8 @@ void createWebStatusLed() {
 }
 
 void handleStatusLed() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
   webStatusLed(0);
 }
@@ -20,9 +19,8 @@ void handleStatusLed() {
 void handleStatusLedSave() {
   uint8_t nr;
 
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   if (strcmp(WebServer->httpServer->arg(INPUT_LEVEL_LED).c_str(), "") != 0) {
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index 8f8ffd61..f77d8b07 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -5,9 +5,8 @@ void createWebTools() {
   WebServer->httpServer->on(getURL(PATH_TOOLS), handleTools);
 
   WebServer->httpServer->on(getURL(PATH_FACTORY_RESET), [&]() {
-    if (ConfigESP->configModeESP == NORMAL_MODE) {
-      if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-        return WebServer->httpServer->requestAuthentication();
+    if (!WebServer->isLoggedIn()) {
+      return;
     }
     WebServer->httpServer->sendHeader("Location", "/");
     WebServer->httpServer->send(303);
@@ -17,9 +16,8 @@ void createWebTools() {
 }
 
 void handleTools() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   addFormHeader(webContentBuffer, F("Narzędzia"));
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index 6e0acee3..c3bbe7c2 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -30,9 +30,8 @@ void createWebUpload() {
 }
 
 void handleUpload(int save) {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   webContentBuffer += SuplaSaveResult(save);
@@ -55,9 +54,8 @@ void handleUpload(int save) {
 }
 
 void handleFileUpload() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!WebServer->httpServer->authenticate(WebServer->www_username, WebServer->www_password))
-      return WebServer->httpServer->requestAuthentication();
+  if (!WebServer->isLoggedIn()) {
+    return;
   }
 
   if (LittleFS.begin()) {
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 89313558..ce5181d6 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -36,9 +36,6 @@ SuplaWebServer::SuplaWebServer() {
 void SuplaWebServer::begin() {
   this->createWebServer();
 
-  strcpy(this->www_username, ConfigManager->get(KEY_LOGIN)->getValue());
-  strcpy(this->www_password, ConfigManager->get(KEY_LOGIN_PASS)->getValue());
-
   httpServer->onNotFound(std::bind(&SuplaWebServer::handleNotFound, this));
   httpServer->begin();
 }
@@ -84,19 +81,16 @@ void SuplaWebServer::createWebServer() {
 }
 
 void SuplaWebServer::handle() {
-  //  Serial.println(F("HTTP_GET - metoda handle"));
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer->authenticate(this->www_username, this->www_password))
-      return httpServer->requestAuthentication();
+  if (!isLoggedIn()) {
+    return;
   }
   supla_webpage_start(0);
 }
 
 void SuplaWebServer::handleSave() {
   //  Serial.println(F("HTTP_POST - metoda handleSave"));
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer->authenticate(this->www_username, this->www_password))
-      return httpServer->requestAuthentication();
+  if (!isLoggedIn()) {
+    return;
   }
 
   if (strcmp(httpServer->arg(PATH_REBOT).c_str(), "1") == 0) {
@@ -138,9 +132,8 @@ void SuplaWebServer::handleSave() {
 }
 
 void SuplaWebServer::handleDeviceSettings() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer->authenticate(www_username, www_password))
-      return httpServer->requestAuthentication();
+  if (!isLoggedIn()) {
+    return;
   }
   deviceSettings(0);
 }
@@ -189,9 +182,8 @@ void SuplaWebServer::supla_webpage_start(int save) {
 }
 
 void SuplaWebServer::supla_webpage_reboot() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer->authenticate(www_username, www_password))
-      return httpServer->requestAuthentication();
+  if (!isLoggedIn()) {
+    return;
   }
   supla_webpage_start(2);
   ConfigESP->rebootESP();
@@ -250,9 +242,8 @@ void SuplaWebServer::deviceSettings(int save) {
 }
 
 void SuplaWebServer::handleBoardSave() {
-  if (ConfigESP->configModeESP == NORMAL_MODE) {
-    if (!httpServer->authenticate(this->www_username, this->www_password))
-      return httpServer->requestAuthentication();
+  if (!isLoggedIn()) {
+    return;
   }
   String input = INPUT_BOARD;
 
@@ -347,6 +338,15 @@ void SuplaWebServer::handleNotFound() {
   supla_webpage_reboot();
 }
 
+bool SuplaWebServer::isLoggedIn() {
+  if (ConfigESP->configModeESP == NORMAL_MODE) {
+    if (!httpServer->authenticate(ConfigManager->get(KEY_LOGIN)->getValue(), ConfigManager->get(KEY_LOGIN_PASS)->getValue()))
+      httpServer->requestAuthentication();
+    return true;
+  }
+  return true;
+}
+
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
   uint8_t gpioInput, current_value, key;
   String input;
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index ef62f484..a05ab0dc 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -72,12 +72,7 @@ class SuplaWebServer : public Supla::Element {
  public:
   SuplaWebServer();
   void begin();
-
-  char www_username[MAX_MLOGIN];
-  char www_password[MAX_MPASSWORD];
-
   void supla_webpage_start(int save);
-
   void sendContent();
 
   ESP8266WebServer* httpServer;
@@ -85,6 +80,7 @@ class SuplaWebServer : public Supla::Element {
 #ifdef SUPLA_OTA
   ESP8266HTTPUpdateServer* httpUpdater;
 #endif
+  bool isLoggedIn();
   bool saveGPIO(const String& _input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
   bool saveGpioMCP23017(const String& _input, uint8_t function, uint8_t nr = 0, const String& input_max = "\n");
 

From acb8bfaf3b6e43b367c7757720414772fa6a2bee Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 15 Feb 2021 20:14:21 +0100
Subject: [PATCH 079/165] aktualizacja ESPWifi

---
 src/SuplaGuiWiFi.h | 61 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/SuplaGuiWiFi.h b/src/SuplaGuiWiFi.h
index c9a4d9cf..320b1a52 100644
--- a/src/SuplaGuiWiFi.h
+++ b/src/SuplaGuiWiFi.h
@@ -19,17 +19,29 @@ class GUIESPWifi : public Supla::ESPWifi {
         client = new WiFiClientSecure();
         if (fingerprint.length() > 0) {
           message += " with certificate matching";
+#ifdef ARDUINO_ARCH_ESP8266
           ((WiFiClientSecure *)client)->setFingerprint(fingerprint.c_str());
+#else
+          message += " - NOT SUPPORTED ON ESP32 implmentation";
+#endif
         }
         else {
           message += " without certificate matching";
+#ifdef ARDUINO_ARCH_ESP8266
           ((WiFiClientSecure *)client)->setInsecure();
+#else
+          message += " - NOT SUPPORTED ON ESP32 implmentation";
+#endif
         }
       }
       else {
         message = "unsecured connection";
         client = new WiFiClient();
       }
+
+      if (isBuffer) {
+        ((WiFiClientSecure *)client)->setBufferSizes(256, 256);  // EXPERIMENTAL
+      }
     }
 
     int connectionPort = (isSecured ? 2016 : 2015);
@@ -39,11 +51,6 @@ class GUIESPWifi : public Supla::ESPWifi {
 
     supla_log(LOG_DEBUG, "Establishing %s with: %s (port: %d)", message.c_str(), server, connectionPort);
 
-    if (isBuffer) {
-      static_cast<WiFiClientSecure *>(client)->setBufferSizes(256, 256);  // EXPERIMENTAL
-    }
-    static_cast<WiFiClientSecure *>(client)->setTimeout(500);
-
     bool result = client->connect(server, connectionPort);
 
     if (result && isSecured) {
@@ -61,7 +68,9 @@ class GUIESPWifi : public Supla::ESPWifi {
     if (ConfigESP->configModeESP == NORMAL_MODE) {
       if (!wifiConfigured) {
         wifiConfigured = true;
+#ifdef ARDUINO_ARCH_ESP8266
         gotIpEventHandler = WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) {
+          (void)(event);
           Serial.print(F("local IP: "));
           Serial.println(WiFi.localIP());
           Serial.print(F("subnetMask: "));
@@ -73,23 +82,40 @@ class GUIESPWifi : public Supla::ESPWifi {
           Serial.print(rssi);
           Serial.println(F(" dBm"));
         });
-        disconnectedEventHandler =
-            WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected &event) { Serial.println(F("WiFi station disconnected")); });
-
+        disconnectedEventHandler = WiFi.onStationModeDisconnected([](const WiFiEventStationModeDisconnected &event) {
+          (void)(event);
+          Serial.println(F("WiFi station disconnected"));
+        });
+#else
+        WiFiEventId_t event_gotIP = WiFi.onEvent(
+            [](WiFiEvent_t event, WiFiEventInfo_t info) {
+              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"));
+            },
+            WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
+
+        WiFiEventId_t event_disconnected =
+            WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info) { Serial.println(F("wifi Station disconnected")); },
+                         WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
+#endif
         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());
-
+        if (hostname) {
+          WiFi.hostname(hostname);
+        }
         WiFi.softAPdisconnect(true);
         WiFi.setAutoConnect(false);
         WiFi.mode(WIFI_STA);
-
-        if (!isReady()) {
-          WiFi.begin(ssid, password);
-        }
+        WiFi.begin(ssid, password);
       }
       else {
         Serial.println(F("WiFi: resetting WiFi connection"));
@@ -99,8 +125,9 @@ class GUIESPWifi : public Supla::ESPWifi {
         }
         WiFi.reconnect();
       }
+
+      yield();
     }
-    yield();
   }
 
   void enableBuffer(bool value) {

From 06c4aa459f782f42e933873ad09269a685f3549f Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 15 Feb 2021 20:35:24 +0100
Subject: [PATCH 080/165] =?UTF-8?q?poprawa=20defin=C3=B3w=20dla=20SUPLA=5F?=
 =?UTF-8?q?MCP23017?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaConfigESP.cpp     | 14 +++++++++++---
 src/SuplaWebPageSensor.cpp |  4 ++--
 src/SuplaWebPageSensor.h   |  3 +--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 1e850336..e1d13d6b 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -254,9 +254,10 @@ int SuplaConfigESP::getGpio(int nr, int function) {
         return gpio;
       }
     }
-    // return OFF_GPIO;
-    //"Pin 100 - 115"
-    // Pin 116 - 131"
+// return OFF_GPIO;
+//"Pin 100 - 115"
+// Pin 116 - 131"
+#ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
@@ -279,6 +280,7 @@ int SuplaConfigESP::getGpio(int nr, int function) {
           break;
       }
     }
+#endif
   }
   return OFF_GPIO;
 }
@@ -295,6 +297,7 @@ int SuplaConfigESP::getLevel(int nr, int function) {
       }
     }
 
+#ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
@@ -329,6 +332,7 @@ int SuplaConfigESP::getLevel(int nr, int function) {
           break;
       }
     }
+#endif
   }
   return OFF_GPIO;
 }
@@ -342,6 +346,7 @@ int SuplaConfigESP::getMemory(int nr, int function) {
       }
     }
 
+#ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
@@ -367,6 +372,7 @@ int SuplaConfigESP::getMemory(int nr, int function) {
           break;
       }
     }
+#endif
   }
   return OFF_GPIO;
 }
@@ -380,6 +386,7 @@ int SuplaConfigESP::getAction(int nr, int function) {
       }
     }
 
+#ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       switch (getAdressMCP23017(nr, function)) {
         case 0:
@@ -405,6 +412,7 @@ int SuplaConfigESP::getAction(int nr, int function) {
           break;
       }
     }
+#endif
   }
   return OFF_GPIO;
 }
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 864fdb5c..b3c3148f 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -412,7 +412,7 @@ if (!WebServer->isLoggedIn()) { return; }
   ConfigManager->set(KEY_OLED_BACK_LIGHT_TIME, WebServer->httpServer->arg(input).c_str());
 
   for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
-    input = INPUT_DS18B20_NAME;
+    input = INPUT_OLED_NAME;
     input += i;
     if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
       ConfigManager->setElement(KEY_NAME_SENSOR, i, WebServer->httpServer->arg(input).c_str());
@@ -495,7 +495,7 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 
       for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
         sensorName = String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
-        input = INPUT_DS18B20_NAME;
+        input = INPUT_OLED_NAME;
         input += i;
         name = F("EKRAN ");
         name += i + 1;
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index c0ce222a..8d6b0cca 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -39,8 +39,8 @@
 #define INPUT_CS_GPIO         "cs"
 #define INPUT_D0_GPIO         "d0"
 #define INPUT_MAX6675         "max6675"
+#define INPUT_OLED_NAME       "ion"
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MAX6675) || defined(SUPLA_MCP23017)
 enum _sensorI2C
 {
   SENSOR_I2C_BME280,
@@ -50,7 +50,6 @@ enum _sensorI2C
   SENSOR_I2C_OLED,
   SENSOR_I2C_MCP23017
 };
-#endif
 
 #ifdef SUPLA_BME280
 enum _bmeAdress

From b2d4e4dcfb8ab03b608bcc1537f0310143654036 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 16 Feb 2021 16:54:08 +0100
Subject: [PATCH 081/165] MCP23017

---
 platformio.ini              |   2 +-
 src/SuplaConfigESP.cpp      | 213 +++++++++++++-----------------------
 src/SuplaConfigESP.h        |   7 +-
 src/SuplaConfigManager.cpp  |   4 +-
 src/SuplaConfigManager.h    |   8 +-
 src/SuplaDeviceGUI.cpp      |   5 +-
 src/SuplaWebPageControl.cpp |  17 +--
 src/SuplaWebPageRelay.cpp   |   9 +-
 src/SuplaWebServer.cpp      |  38 ++++---
 9 files changed, 130 insertions(+), 173 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index dd4e8d5c..0979fffa 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.7"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.8-testowa"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index e1d13d6b..f1317713 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -272,12 +272,6 @@ int SuplaConfigESP::getGpio(int nr, int function) {
             return gpio + 100 + 16;
           }
           break;
-        case 2:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function &&
-              ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-            return gpio + 100 + 16 + 16;
-          }
-          break;
       }
     }
 #endif
@@ -299,37 +293,14 @@ int SuplaConfigESP::getLevel(int nr, int function) {
 
 #ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-      switch (getAdressMCP23017(nr, function)) {
-        case 0:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-              if (function == FUNCTION_BUTTON)
-                return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-              else
-                return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
-            }
-          }
-          break;
-        case 1:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-              if (function == FUNCTION_BUTTON)
-                return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-              else
-                return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
-            }
-          }
-          break;
-        case 2:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-              if (function == FUNCTION_BUTTON)
-                return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-              else
-                return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
-            }
-          }
-          break;
+      uint8_t address = getAdressMCP23017(nr, function);
+      if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
+        if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
+          if (function == FUNCTION_BUTTON)
+            return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
+          else
+            return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
+        }
       }
     }
 #endif
@@ -348,28 +319,11 @@ int SuplaConfigESP::getMemory(int nr, int function) {
 
 #ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-      switch (getAdressMCP23017(nr, function)) {
-        case 0:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(MEMORY).toInt();
-            }
-          }
-          break;
-        case 1:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(MEMORY).toInt();
-            }
-          }
-          break;
-        case 2:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(MEMORY).toInt();
-            }
-          }
-          break;
+      uint8_t address = getAdressMCP23017(nr, function);
+      if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
+        if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
+          return ConfigManager->get(key)->getElement(MEMORY).toInt();
+        }
       }
     }
 #endif
@@ -388,28 +342,11 @@ int SuplaConfigESP::getAction(int nr, int function) {
 
 #ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-      switch (getAdressMCP23017(nr, function)) {
-        case 0:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
-            }
-          }
-          break;
-        case 1:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
-            }
-          }
-          break;
-        case 2:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-            if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-              return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
-            }
-          }
-          break;
+      uint8_t address = getAdressMCP23017(nr, function);
+      if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
+        if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
+          return ConfigManager->get(key)->getElement(ACTION_BUTTON).toInt();
+        }
       }
     }
 #endif
@@ -417,6 +354,28 @@ int SuplaConfigESP::getAction(int nr, int function) {
   return OFF_GPIO;
 }
 
+int SuplaConfigESP::getEvent(int nr, int function) {
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
+        return ConfigManager->get(key)->getElement(EVENT_BUTTON).toInt();
+      }
+    }
+
+#ifdef SUPLA_MCP23017
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
+      uint8_t address = getAdressMCP23017(nr, function);
+      if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
+        if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
+          return ConfigManager->get(key)->getElement(EVENT_BUTTON).toInt();
+        }
+      }
+    }
+#endif
+  }
+  return OFF_GPIO;
+}
 bool SuplaConfigESP::checkBusyCfg(int gpio) {
   uint8_t key = KEY_GPIO + gpio;
   if (ConfigManager->get(key)->getElement(CFG).toInt() == 1) {
@@ -460,13 +419,13 @@ void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function, uint8_t
 
   if (function == FUNCTION_BUTTON) {
     ConfigManager->setElement(key, LEVEL_BUTTON, level);
+    ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
+    ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
   }
   else {
     ConfigManager->setElement(key, LEVEL_RELAY, level);
+    ConfigManager->setElement(key, MEMORY, memory);
   }
-
-  ConfigManager->setElement(key, MEMORY, memory);
-  ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
 }
 
 void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
@@ -476,12 +435,19 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
     ConfigManager->setElement(key, CFG, 0);
     return;
   }
+
   ConfigManager->setElement(key, NR, 0);
   ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
-  ConfigManager->setElement(key, LEVEL_RELAY, 0);
-  ConfigManager->setElement(key, LEVEL_BUTTON, 1);
-  ConfigManager->setElement(key, MEMORY, 2);
-  ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
+
+  if (function == FUNCTION_BUTTON) {
+    ConfigManager->setElement(key, LEVEL_BUTTON, 1);
+    ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
+    ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
+  }
+  else {
+    ConfigManager->setElement(key, LEVEL_RELAY, 0);
+    ConfigManager->setElement(key, MEMORY, 2);
+  }
 }
 
 uint8_t SuplaConfigESP::countFreeGpio(uint8_t exception) {
@@ -539,13 +505,6 @@ uint8_t SuplaConfigESP::getGpioMCP23017(uint8_t nr, uint8_t function) {
           }
         }
         break;
-      case 2:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-            return gpio;
-          }
-        }
-        break;
     }
   }
   return OFF_GPIO;
@@ -554,6 +513,7 @@ uint8_t SuplaConfigESP::getGpioMCP23017(uint8_t nr, uint8_t function) {
 uint8_t SuplaConfigESP::getAdressMCP23017(uint8_t nr, uint8_t function) {
   for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
     uint8_t key = KEY_GPIO + gpio;
+
     if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
       if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
         return 0;
@@ -564,59 +524,48 @@ uint8_t SuplaConfigESP::getAdressMCP23017(uint8_t nr, uint8_t function) {
         return 1;
       }
     }
-    if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
-      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function) {
-        return 2;
-      }
-    }
   }
   return OFF_MCP23017;
 }
 
-void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory) {
-  uint8_t key = KEY_GPIO + gpio;
+void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function) {
+  uint8_t key, level, memory, action, event;
+  key = KEY_GPIO + gpio;
 
-  uint8_t _gpio = ConfigESP->getGpioMCP23017(nr, function);
-  ConfigESP->clearGpioMCP23017(_gpio, nr, function);
+  // dla MCP23017 zawsze ustawiać taką samą wartość level, memory, action, event jak dla pierwszego elementu
+  level = ConfigESP->getLevel(1, function);
+  memory = ConfigESP->getMemory(1, function);
+  action = ConfigESP->getAction(1, function);
+  event = ConfigESP->getEvent(1, function);
 
-  if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
-    ConfigManager->setElement(key, LEVEL_RELAY, 0);
-    ConfigManager->setElement(key, MEMORY, 2);
-    ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
+  if (function == FUNCTION_BUTTON) {
+    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+    ConfigManager->setElement(key, ACTION_BUTTON, action);
+    ConfigManager->setElement(key, EVENT_BUTTON, event);
   }
   else {
     ConfigManager->setElement(key, LEVEL_RELAY, level);
     ConfigManager->setElement(key, MEMORY, memory);
-    ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
-  }
-
-  switch (adress) {
-    case 0:
-      ConfigManager->setElement(key, MCP23017_NR_1, nr);
-      ConfigManager->setElement(key, MCP23017_FUNCTION_1, function);
-      break;
-    case 1:
-      ConfigManager->setElement(key, MCP23017_NR_2, nr);
-      ConfigManager->setElement(key, MCP23017_FUNCTION_2, function);
-      break;
-    case 2:
-      ConfigManager->setElement(key, MCP23017_NR_3, nr);
-      ConfigManager->setElement(key, MCP23017_FUNCTION_3, function);
-      break;
   }
+  ConfigManager->setElement(key, getNrMCP23017(adress), nr);
+  ConfigManager->setElement(key, getFunctionMCP23017(adress), function);
 }
 
 void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function) {
   uint8_t key = KEY_GPIO + gpio;
   uint8_t adress = getAdressMCP23017(nr, function);
 
-  if (adress != OFF_MCP23017) {
-    ConfigManager->setElement(key, getNrMCP23017(adress), 0);
-    ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
-    ConfigManager->setElement(key, LEVEL_RELAY, 0);
+  Serial.println(adress);
+  ConfigManager->setElement(key, getNrMCP23017(adress), 0);
+  ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
+  if (function == FUNCTION_BUTTON) {
     ConfigManager->setElement(key, LEVEL_BUTTON, 1);
+    ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
+    ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
+  }
+  else {
+    ConfigManager->setElement(key, LEVEL_RELAY, 0);
     ConfigManager->setElement(key, MEMORY, 2);
-    ConfigManager->setElement(key, ACTION_BUTTON, Supla::TOGGLE);
   }
 }
 
@@ -639,9 +588,6 @@ uint8_t SuplaConfigESP::getFunctionMCP23017(uint8_t adress) {
     case 1:
       return MCP23017_FUNCTION_2;
       break;
-    case 2:
-      return MCP23017_FUNCTION_3;
-      break;
   }
   return FUNCTION_OFF;
 }
@@ -654,9 +600,6 @@ uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
     case 1:
       return MCP23017_NR_2;
       break;
-    case 2:
-      return MCP23017_NR_3;
-      break;
   }
   return FUNCTION_OFF;
 }
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 61c3e614..b8a3cf2a 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -37,7 +37,7 @@ enum _ConfigMode
   FACTORYRESET
 };
 
-#define OFF_GPIO 17
+#define OFF_GPIO     17
 #define OFF_MCP23017 2
 
 typedef struct {
@@ -83,10 +83,12 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
   bool checkBusyCfg(int gpio);
   int checkBusyGpio(int gpio, int function);
   uint8_t countFreeGpio(uint8_t exception = 0);
+
   void setGpio(uint8_t gpio, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory = 0);
   void setGpio(uint8_t gpio, uint8_t function, uint8_t level = 0) {
     setGpio(gpio, 1, function, level);
   }
+  
   void clearGpio(uint8_t gpio, uint8_t function = 0);
 
   int getMemory(int nr, int function);
@@ -95,13 +97,14 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
   }
 
   int getAction(int nr, int function);
+  int getEvent(int nr, int function);
   void factoryReset(bool forceReset = false);
   const String getConfigNameAP();
 
   bool checkBusyGpioMCP23017(uint8_t gpio, uint8_t function);
   uint8_t getGpioMCP23017(uint8_t nr, uint8_t function);
   uint8_t getAdressMCP23017(uint8_t nr, uint8_t function);
-  void setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory);
+  void setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function);
   void clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function);
   void clearFunctionGpio(uint8_t function);
   uint8_t getFunctionMCP23017(uint8_t adress);
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index a474e8ec..59811507 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -104,7 +104,7 @@ const String ConfigOption::replaceElement(int index, int newvalue) {
     else {
       table += this->getElement(i);
     }
-    
+
     if (i < lenght - 1)
       table += SEPARATOR;
   }
@@ -174,7 +174,7 @@ SuplaConfigManager::SuplaConfigManager() {
   uint8_t nr, key;
   for (nr = 0; nr <= MAX_GPIO; nr++) {
     key = KEY_GPIO + nr;
-    this->addKey(key, "", SETTINGSCOUNT * 3);
+    this->addKey(key, "", SETTINGSCOUNT * 2);
   }
 
   this->addKey(KEY_LEVEL_LED, "0", 1);
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 60e5479c..588236d4 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -101,9 +101,11 @@ enum _settings
   NR,
   FUNCTION,
   LEVEL_RELAY,
-  MEMORY,  // for the button EVENT
-  CFG,
+  LEVEL_BUTTON,
+  MEMORY,
   ACTION_BUTTON,
+  EVENT_BUTTON,
+  CFG,
   MCP23017_NR_1,
   MCP23017_FUNCTION_1,
   MCP23017_NR_2,
@@ -112,8 +114,6 @@ enum _settings
   MCP23017_FUNCTION_3,
   MCP23017_NR_4,
   MCP23017_FUNCTION_4,
-  EVENT_BUTTON,
-  LEVEL_BUTTON,
   SETTINGSCOUNT
 };
 
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 18dd10f5..ade06a40 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -95,7 +95,7 @@ void addRelayButton(uint8_t nr) {
 
       Serial.println(ConfigESP->getLevel(nr, FUNCTION_BUTTON));
 
-      button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getMemory(nr, FUNCTION_BUTTON));
+      button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getEvent(nr, FUNCTION_BUTTON));
       button->setSwNoiseFilterDelay(50);
     }
 
@@ -312,6 +312,8 @@ void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
   eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_IMPULSE_COUNTER_SEK * 1000);
 }
 #endif
+
+#if defined(SUPLA_RELAY)
 void addConditionsTurnON(int function, Supla::ChannelElement *client) {
   if (Supla::GUI::relay.size() == 0)
     return;
@@ -371,6 +373,7 @@ void addConditionsTurnOFF(int function, Supla::ChannelElement *client) {
     }
   }
 }
+#endif
 
 }  // namespace GUI
 }  // namespace Supla
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 02db167d..95392288 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -174,7 +174,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
 
   input = INPUT_BUTTON_EVENT;
   input += nr_button;
-  ConfigManager->setElement(key, MEMORY, WebServer->httpServer->arg(input).toInt());
+  ConfigManager->setElement(key, EVENT_BUTTON, WebServer->httpServer->arg(input).toInt());
 
   input = INPUT_RELAY_LEVEL;
   input += nr_button;
@@ -222,7 +222,7 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   selected = ConfigESP->getLevel(nr_button.toInt(), FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, S_STATE_CONTROL, LEVEL_P, 2, selected);
 
-  selected = ConfigESP->getMemory(nr_button.toInt(), FUNCTION_BUTTON);
+  selected = ConfigESP->getEvent(nr_button.toInt(), FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
 
   selected = ConfigESP->getAction(nr_button.toInt(), FUNCTION_BUTTON);
@@ -337,7 +337,7 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   selected = ConfigESP->getLevel(1, FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_RELAY_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
 
-  selected = ConfigESP->getMemory(1, FUNCTION_BUTTON);
+  selected = ConfigESP->getEvent(1, FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT, S_REACTION_TO, TRIGGER_P, 3, selected);
 
   selected = ConfigESP->getAction(1, FUNCTION_BUTTON);
@@ -357,7 +357,7 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   }
 
   String input;
-  uint8_t key, gpio, level, event, action;
+  uint8_t key, gpio, level, event, action, address;
 
   input.reserve(10);
 
@@ -370,11 +370,14 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   input = INPUT_BUTTON_ACTION;
   action = WebServer->httpServer->arg(input).toInt();
 
+  address = ConfigESP->getAdressMCP23017(1, FUNCTION_BUTTON);
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
-    ConfigManager->setElement(key, LEVEL_BUTTON, level);
-    ConfigManager->setElement(key, MEMORY, event);
-    ConfigManager->setElement(key, ACTION_BUTTON, action);
+    if (ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(address)).toInt() == FUNCTION_BUTTON) {
+      ConfigManager->setElement(key, LEVEL_BUTTON, level);
+      ConfigManager->setElement(key, EVENT_BUTTON, event);
+      ConfigManager->setElement(key, ACTION_BUTTON, action);
+    }
   }
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index dfdc2c98..7f470a13 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -348,7 +348,7 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
   }
 
   String input;
-  uint8_t key, gpio, memory, level;
+  uint8_t key, gpio, memory, level, address;
 
   input.reserve(9);
 
@@ -358,10 +358,13 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
   input = INPUT_RELAY_LEVEL;
   level = WebServer->httpServer->arg(input).toInt();
 
+  address = ConfigESP->getAdressMCP23017(1, FUNCTION_RELAY);
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
-    ConfigManager->setElement(key, MEMORY, memory);
-    ConfigManager->setElement(key, LEVEL_RELAY, level);
+    if (ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(address)).toInt() == FUNCTION_RELAY) {
+      ConfigManager->setElement(key, MEMORY, memory);
+      ConfigManager->setElement(key, LEVEL_RELAY, level);
+    }
   }
 
 #if defined(SUPLA_PUSHOVER)
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index ce5181d6..c155e4f4 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -348,7 +348,7 @@ bool SuplaWebServer::isLoggedIn() {
 }
 
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t gpioInput, current_value, key;
+  uint8_t gpio, gpioInput, current_value, key;
   String input;
   input = _input;
 
@@ -362,20 +362,22 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") == 0) {
     return true;
   }
+
+  gpio = ConfigESP->getGpio(nr, function);
   gpioInput = WebServer->httpServer->arg(input).toInt();
+
   key = KEY_GPIO + gpioInput;
 
-  if (ConfigESP->getGpio(nr, function) != gpioInput || gpioInput == OFF_GPIO) {
-    ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
+  if (gpio != gpioInput || gpioInput == OFF_GPIO) {
+    ConfigESP->clearGpio(gpio, function);
   }
 
   if (gpioInput != OFF_GPIO) {
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
       ConfigESP->clearGpio(gpioInput, function);
-      ConfigESP->setGpio(gpioInput, nr, function, ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt(),
-                         ConfigManager->get(key)->getElement(MEMORY).toInt());
+      ConfigESP->setGpio(gpioInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
     }
-    else if (ConfigESP->getGpio(nr, function) == gpioInput && ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+    else if (gpio == gpioInput && ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       ConfigESP->setGpio(gpioInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
     }
     else if (function == FUNCTION_CFG_BUTTON) {
@@ -389,39 +391,39 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   if (input_max != "\n") {
     current_value = WebServer->httpServer->arg(input_max).toInt();
     if (ConfigManager->get(key)->getElement(NR).toInt() > current_value) {
-      ConfigESP->clearGpio(ConfigESP->getGpio(nr, function), function);
+      ConfigESP->clearGpio(gpio, function);
     }
   }
   return true;
 }
 
 bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t key, address, addressInput, gpio, gpioInput, functionElementInput;
+  uint8_t key, address, addressInput, gpio, gpioInput, functionElement;
   String input = _input + nr;
 
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") == 0) {
     return true;
   }
 
+  address = ConfigESP->getAdressMCP23017(nr, function);
   addressInput = WebServer->httpServer->arg(INPUT_ADRESS_MCP23017).toInt();
 
+  gpio = ConfigESP->getGpioMCP23017(nr, function);
   gpioInput = WebServer->httpServer->arg(input).toInt();
+
   key = KEY_GPIO + gpioInput;
-  functionElementInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
-  gpio = ConfigESP->getGpioMCP23017(nr, function);
-  if (addressInput == OFF_MCP23017 || gpioInput == OFF_GPIO) {
+  functionElement = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
+
+  if (gpio != gpioInput || gpioInput == OFF_GPIO || address != addressInput || addressInput == OFF_MCP23017) {
     ConfigESP->clearGpioMCP23017(gpio, nr, function);
-    return true;
   }
 
   if (gpioInput != OFF_GPIO) {
-    if (functionElementInput == FUNCTION_OFF) {
-      ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
-      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt(),
-                                 ConfigManager->get(key)->getElement(MEMORY).toInt());
+    if (functionElement == FUNCTION_OFF) {
+      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
     }
-    else if (gpio == gpioInput && functionElementInput == function) {
-      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
+    else if (gpio == gpioInput && functionElement == function) {
+      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
     }
     else {
       return false;

From 4a05afafba6743cab6a3d623a1ace8216a6c30f5 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 10:58:02 +0100
Subject: [PATCH 082/165] MCP23017

---
 src/Markup.cpp             |  20 +++---
 src/SuplaCommonPROGMEM.h   |   2 +-
 src/SuplaConfigESP.cpp     | 133 ++++++++++++++++++++++---------------
 src/SuplaConfigESP.h       |  10 +--
 src/SuplaDeviceGUI.cpp     |   2 -
 src/SuplaTemplateBoard.cpp |  14 ++--
 src/SuplaWebServer.cpp     |  33 +++++----
 7 files changed, 121 insertions(+), 93 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index ffe6a30a..9f271bf2 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -141,7 +141,7 @@ void addLinkBox(String& html, const String& name, const String& url) {
   html += url;
   html += F("'>");
   html += name;
-  // html += PGMT(ICON_EDIT);
+  // html += FPSTR(ICON_EDIT);
   html += F("</a>");
   html += F("</label>");
   html += F("</i>");
@@ -169,7 +169,7 @@ void addListGPIOBox(String& html, const String& input_id, const String& name, ui
 void addListMCP23017GPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr) {
   if (nr == 1) {
     uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
-    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address);
+    addListBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 5, address);
   }
 
   html += F("<i><label>");
@@ -187,7 +187,7 @@ void addListMCP23017GPIOBox(String& html, const String& input_id, const String&
 void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr) {
   if (nr == 1) {
     uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
-    addListLinkBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 3, address, url);
+    addListLinkBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 5, address, url);
   }
 
   html += F("<i><label>");
@@ -227,7 +227,7 @@ void addListGPIOLinkBox(String& html, const String& input_id, const String& name
   }
   html += name;
   if (ConfigESP->getGpio(_nr, function) != OFF_GPIO) {
-    // html += PGMT(ICON_EDIT);
+    // html += FPSTR(ICON_EDIT);
     html += F("</a>");
   }
   html += F("</label>");
@@ -258,7 +258,7 @@ void addListBox(String& html, const String& input_id, const String& name, const
     else {
       html += F("'>");
     }
-    html += PGMT(array_P[suported]);
+    html += FPSTR(array_P[suported]);
   }
   html += F("</select></i>");
 }
@@ -298,7 +298,7 @@ void addListLinkBox(String& html,
     else {
       html += F("'>");
     }
-    html += PGMT(array_P[suported]);
+    html += FPSTR(array_P[suported]);
   }
   html += F("</select></i>");
 }
@@ -332,7 +332,7 @@ void addListGPIOSelect(String& html, const String& input_id, uint8_t function, u
 
   uint8_t selected = ConfigESP->getGpio(nr, function);
 
-  for (uint8_t suported = 0; suported < sizeof(GPIO_P) / sizeof(GPIO_P[0]); suported++) {
+  for (uint8_t suported = 0; suported < 18; suported++) {
     if (ConfigESP->checkBusyGpio(suported, function) || selected == suported) {
       html += F("<option value='");
       html += suported;
@@ -342,7 +342,7 @@ void addListGPIOSelect(String& html, const String& input_id, uint8_t function, u
       else {
         html += F("'>");
       }
-      html += PGMT(GPIO_P[suported]);
+      html += FPSTR(GPIO_P[suported]);
     }
   }
   html += F("</select>");
@@ -356,7 +356,7 @@ void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function,
 
   uint8_t selected = ConfigESP->getGpioMCP23017(nr, function);
 
-  for (uint8_t suported = 0; suported < sizeof(GPIO_MCP23017_P) / sizeof(GPIO_MCP23017_P[0]); suported++) {
+  for (uint8_t suported = 0; suported < 18; suported++) {
     if (ConfigESP->checkBusyGpioMCP23017(suported, function) || selected == suported) {
       html += F("<option value='");
       html += suported;
@@ -366,7 +366,7 @@ void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function,
       else {
         html += F("'>");
       }
-      html += PGMT(GPIO_MCP23017_P[suported]);
+      html += FPSTR(GPIO_MCP23017_P[suported]);
     }
   }
   html += F("</select>");
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 19246c94..eb9bccbc 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -131,7 +131,7 @@ const char ADR20[] PROGMEM = "0x20";
 const char ADR21[] PROGMEM = "0x21";
 const char ADR22[] PROGMEM = "0x22";
 const char ADR23[] PROGMEM = "0x23";
-const char* const MCP23017_P[] PROGMEM = {ADR20, ADR21, OFF};
+const char* const MCP23017_P[] PROGMEM = {ADR20, ADR21, ADR22, ADR23, OFF};
 
 const char* const STATE_P[] PROGMEM = {OFF, ON};
 
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index f1317713..344a8989 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -259,20 +259,15 @@ int SuplaConfigESP::getGpio(int nr, int function) {
 // Pin 116 - 131"
 #ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-      switch (getAdressMCP23017(nr, function)) {
-        case 0:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function &&
-              ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-            return gpio + 100;
-          }
-          break;
-        case 1:
-          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function &&
-              ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-            return gpio + 100 + 16;
-          }
-          break;
-      }
+      uint8_t address = getAdressMCP23017(nr, function);
+      if (address == 0)
+        return gpio + 100;
+      if (address == 1)
+        return gpio + 100 + 16;
+      if (address == 2)
+        return gpio + 100 + 16 + 16;
+      if (address == 3)
+        return gpio + 100 + 16 + 16 + 16;
     }
 #endif
   }
@@ -406,25 +401,45 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
   }
 }
 
-void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory) {
-  uint8_t key = KEY_GPIO + gpio;
+void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function, int level, int memory, int action, int event) {
+  uint8_t _key, _level, _memory, _action, _event;
+  _key = KEY_GPIO + gpio;
 
   if (function == FUNCTION_CFG_BUTTON) {
-    ConfigManager->setElement(key, CFG, 1);
+    ConfigManager->setElement(_key, CFG, 1);
     return;
   }
 
-  ConfigManager->setElement(key, NR, nr);
-  ConfigManager->setElement(key, FUNCTION, function);
+  ConfigManager->setElement(_key, NR, nr);
+  ConfigManager->setElement(_key, FUNCTION, function);
+
+  if (level == -1)
+    _level = ConfigESP->getLevel(nr, function);
+  else
+    _level = level;
+  if (memory == -1)
+    _memory = ConfigESP->getMemory(nr, function);
+  else
+    _memory = memory;
+
+  if (action == -1)
+    _action = ConfigESP->getAction(nr, function);
+  else
+    _action = action;
+
+  if (event == -1)
+    _event = ConfigESP->getEvent(nr, function);
+  else
+    _event = event;
 
   if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, LEVEL_BUTTON, level);
-    ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
-    ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
+    ConfigManager->setElement(_key, LEVEL_BUTTON, _level);
+    ConfigManager->setElement(_key, ACTION_BUTTON, _action);
+    ConfigManager->setElement(_key, EVENT_BUTTON, _event);
   }
-  else {
-    ConfigManager->setElement(key, LEVEL_RELAY, level);
-    ConfigManager->setElement(key, MEMORY, memory);
+  if (function == FUNCTION_RELAY) {
+    ConfigManager->setElement(_key, LEVEL_RELAY, _level);
+    ConfigManager->setElement(_key, MEMORY, _memory);
   }
 }
 
@@ -444,7 +459,7 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
     ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
     ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
   }
-  else {
+  if (function == FUNCTION_RELAY) {
     ConfigManager->setElement(key, LEVEL_RELAY, 0);
     ConfigManager->setElement(key, MEMORY, 2);
   }
@@ -487,24 +502,15 @@ bool SuplaConfigESP::checkBusyGpioMCP23017(uint8_t gpio, uint8_t function) {
 }
 
 uint8_t SuplaConfigESP::getGpioMCP23017(uint8_t nr, uint8_t function) {
+  uint8_t key, address;
   for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
-    uint8_t key = KEY_GPIO + gpio;
+    key = KEY_GPIO + gpio;
+    address = getAdressMCP23017(nr, function);
 
-    switch (getAdressMCP23017(nr, function)) {
-      case 0:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-            return gpio;
-          }
-        }
-        break;
-      case 1:
-        if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
-          if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-            return gpio;
-          }
-        }
-        break;
+    if (address != OFF_MCP23017) {
+      if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function)
+        if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr)
+          return gpio;
     }
   }
   return OFF_GPIO;
@@ -514,16 +520,21 @@ uint8_t SuplaConfigESP::getAdressMCP23017(uint8_t nr, uint8_t function) {
   for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
     uint8_t key = KEY_GPIO + gpio;
 
-    if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
-      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function) {
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr)
+      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function)
         return 0;
-      }
-    }
-    if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
-      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function) {
+
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr)
+      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function)
         return 1;
-      }
-    }
+
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr)
+      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function)
+        return 2;
+
+    if (ConfigManager->get(key)->getElement(MCP23017_NR_4).toInt() == nr)
+      if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_4).toInt() == function)
+        return 3;
   }
   return OFF_MCP23017;
 }
@@ -532,6 +543,9 @@ void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, u
   uint8_t key, level, memory, action, event;
   key = KEY_GPIO + gpio;
 
+  ConfigManager->setElement(key, getNrMCP23017(adress), nr);
+  ConfigManager->setElement(key, getFunctionMCP23017(adress), function);
+
   // dla MCP23017 zawsze ustawiać taką samą wartość level, memory, action, event jak dla pierwszego elementu
   level = ConfigESP->getLevel(1, function);
   memory = ConfigESP->getMemory(1, function);
@@ -543,19 +557,16 @@ void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, u
     ConfigManager->setElement(key, ACTION_BUTTON, action);
     ConfigManager->setElement(key, EVENT_BUTTON, event);
   }
-  else {
+  if (function == FUNCTION_RELAY) {
     ConfigManager->setElement(key, LEVEL_RELAY, level);
     ConfigManager->setElement(key, MEMORY, memory);
   }
-  ConfigManager->setElement(key, getNrMCP23017(adress), nr);
-  ConfigManager->setElement(key, getFunctionMCP23017(adress), function);
 }
 
 void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function) {
   uint8_t key = KEY_GPIO + gpio;
   uint8_t adress = getAdressMCP23017(nr, function);
 
-  Serial.println(adress);
   ConfigManager->setElement(key, getNrMCP23017(adress), 0);
   ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
   if (function == FUNCTION_BUTTON) {
@@ -563,7 +574,7 @@ void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t functio
     ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
     ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
   }
-  else {
+  if (function == FUNCTION_RELAY) {
     ConfigManager->setElement(key, LEVEL_RELAY, 0);
     ConfigManager->setElement(key, MEMORY, 2);
   }
@@ -588,6 +599,12 @@ uint8_t SuplaConfigESP::getFunctionMCP23017(uint8_t adress) {
     case 1:
       return MCP23017_FUNCTION_2;
       break;
+    case 2:
+      return MCP23017_FUNCTION_3;
+      break;
+    case 3:
+      return MCP23017_FUNCTION_4;
+      break;
   }
   return FUNCTION_OFF;
 }
@@ -600,6 +617,12 @@ uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
     case 1:
       return MCP23017_NR_2;
       break;
+    case 2:
+      return MCP23017_NR_3;
+      break;
+    case 3:
+      return MCP23017_NR_4;
+      break;
   }
   return FUNCTION_OFF;
 }
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index b8a3cf2a..e0772fbd 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -38,7 +38,7 @@ enum _ConfigMode
 };
 
 #define OFF_GPIO     17
-#define OFF_MCP23017 2
+#define OFF_MCP23017 4
 
 typedef struct {
   int status;
@@ -84,11 +84,11 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
   int checkBusyGpio(int gpio, int function);
   uint8_t countFreeGpio(uint8_t exception = 0);
 
-  void setGpio(uint8_t gpio, uint8_t nr, uint8_t function, uint8_t level, uint8_t memory = 0);
-  void setGpio(uint8_t gpio, uint8_t function, uint8_t level = 0) {
-    setGpio(gpio, 1, function, level);
+  void setGpio(uint8_t gpio, uint8_t nr, uint8_t function, int level = -1, int memory = -1, int action = -1, int event = -1);
+  void setGpio(uint8_t gpio, uint8_t function) {
+    setGpio(gpio, 1, function);
   }
-  
+
   void clearGpio(uint8_t gpio, uint8_t function = 0);
 
   int getMemory(int nr, int function);
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index ade06a40..e1c265cb 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -93,8 +93,6 @@ void addRelayButton(uint8_t nr) {
         button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON));
       }
 
-      Serial.println(ConfigESP->getLevel(nr, FUNCTION_BUTTON));
-
       button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getEvent(nr, FUNCTION_BUTTON));
       button->setSwNoiseFilterDelay(50);
     }
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 0d26cca0..7ce53ae6 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -5,7 +5,7 @@
 void addButton(uint8_t gpio, uint8_t event) {
   uint8_t nr = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   nr++;
-  ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON, event);
+  ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON, -1, -1, -1, event);
   ConfigManager->set(KEY_MAX_BUTTON, nr++);
 }
 
@@ -19,8 +19,8 @@ void addRelay(uint8_t gpio, uint8_t level) {
 void addLimitSwitch(uint8_t gpio) {
   uint8_t nr = ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt();
   nr++;
-  ConfigESP->setGpio(gpio, nr, FUNCTION_LIMIT_SWITCH, 0);
-  ConfigESP->setGpio(4, 1, FUNCTION_LIMIT_SWITCH, 0);
+  ConfigESP->setGpio(gpio, nr, FUNCTION_LIMIT_SWITCH);
+  ConfigESP->setGpio(4, 1, FUNCTION_LIMIT_SWITCH);
   ConfigManager->set(KEY_MAX_LIMIT_SWITCH, nr++);
 }
 
@@ -48,10 +48,10 @@ void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
 void addRGBW(int8_t redPin, int8_t greenPin, int8_t bluePin, int8_t brightnessPin) {
   uint8_t nr = ConfigManager->get(KEY_MAX_RGBW)->getValueInt();
   nr++;
-  ConfigESP->setGpio(redPin, nr, FUNCTION_RGBW_RED, 0);
-  ConfigESP->setGpio(greenPin, nr, FUNCTION_RGBW_GREEN, 0);
-  ConfigESP->setGpio(bluePin, nr, FUNCTION_RGBW_BLUE, 0);
-  ConfigESP->setGpio(brightnessPin, nr, FUNCTION_RGBW_BRIGHTNESS, 0);
+  ConfigESP->setGpio(redPin, nr, FUNCTION_RGBW_RED);
+  ConfigESP->setGpio(greenPin, nr, FUNCTION_RGBW_GREEN);
+  ConfigESP->setGpio(bluePin, nr, FUNCTION_RGBW_BLUE);
+  ConfigESP->setGpio(brightnessPin, nr, FUNCTION_RGBW_BRIGHTNESS);
   ConfigManager->set(KEY_MAX_RGBW, nr++);
 }
 
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index c155e4f4..35f15e05 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -328,7 +328,8 @@ void SuplaWebServer::sendContent() {
   Serial.printf_P(PSTR("Sent INDEX...Free mem=%d\n"), ESP.getFreeHeap());
   checkRAM();
 #endif
-  webContentBuffer = "";
+  webContentBuffer.clear();
+  //webContentBuffer.reserve(0);
 }
 
 void SuplaWebServer::handleNotFound() {
@@ -348,7 +349,7 @@ bool SuplaWebServer::isLoggedIn() {
 }
 
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t gpio, gpioInput, current_value, key;
+  uint8_t gpio, gpioInput, functionElement, current_value, key;
   String input;
   input = _input;
 
@@ -367,18 +368,21 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   gpioInput = WebServer->httpServer->arg(input).toInt();
 
   key = KEY_GPIO + gpioInput;
+  functionElement = ConfigManager->get(key)->getElement(FUNCTION).toInt();
 
-  if (gpio != gpioInput || gpioInput == OFF_GPIO) {
-    ConfigESP->clearGpio(gpio, function);
-  }
+  // if (gpio != gpioInput)
+  //  ConfigESP->clearGpio(gpio, function);
+
+  if (gpioInput == OFF_GPIO)
+    ConfigESP->clearGpio(gpioInput, function);
 
   if (gpioInput != OFF_GPIO) {
-    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == FUNCTION_OFF) {
+    if (functionElement == FUNCTION_OFF) {
       ConfigESP->clearGpio(gpioInput, function);
-      ConfigESP->setGpio(gpioInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
+      ConfigESP->setGpio(gpioInput, nr, function);
     }
-    else if (gpio == gpioInput && ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
-      ConfigESP->setGpio(gpioInput, nr, function, ConfigESP->getLevel(nr, function), ConfigESP->getMemory(nr, function));
+    else if (gpio == gpioInput && functionElement == function) {
+      ConfigESP->setGpio(gpioInput, nr, function);
     }
     else if (function == FUNCTION_CFG_BUTTON) {
       ConfigESP->setGpio(gpioInput, FUNCTION_CFG_BUTTON);
@@ -414,12 +418,15 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
   key = KEY_GPIO + gpioInput;
   functionElement = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
 
-  if (gpio != gpioInput || gpioInput == OFF_GPIO || address != addressInput || addressInput == OFF_MCP23017) {
-    ConfigESP->clearGpioMCP23017(gpio, nr, function);
-  }
+  // if (gpio != gpioInput || address != addressInput)
+  //  ConfigESP->clearGpioMCP23017(gpio, nr, function);
 
-  if (gpioInput != OFF_GPIO) {
+  if (gpioInput == OFF_GPIO || addressInput == OFF_MCP23017)
+    ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
+
+  if (gpioInput != OFF_GPIO && addressInput != OFF_MCP23017) {
     if (functionElement == FUNCTION_OFF) {
+      ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
       ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
     }
     else if (gpio == gpioInput && functionElement == function) {

From a2916aa63d887532a4a90e9fe0137ebf2f2fdbb4 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 17:45:41 +0100
Subject: [PATCH 083/165] Update SuplaGuiWiFi.h

---
 src/SuplaGuiWiFi.h | 111 ++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/src/SuplaGuiWiFi.h b/src/SuplaGuiWiFi.h
index 320b1a52..c75d7720 100644
--- a/src/SuplaGuiWiFi.h
+++ b/src/SuplaGuiWiFi.h
@@ -65,69 +65,66 @@ class GUIESPWifi : public Supla::ESPWifi {
   }
 
   void setup() {
-    if (ConfigESP->configModeESP == NORMAL_MODE) {
-      if (!wifiConfigured) {
-        wifiConfigured = true;
+    if (!wifiConfigured) {
+      wifiConfigured = true;
 #ifdef ARDUINO_ARCH_ESP8266
-        gotIpEventHandler = WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) {
-          (void)(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) {
-          (void)(event);
-          Serial.println(F("WiFi station disconnected"));
-        });
+      gotIpEventHandler = WiFi.onStationModeGotIP([](const WiFiEventStationModeGotIP &event) {
+        (void)(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) {
+        (void)(event);
+        Serial.println(F("WiFi station disconnected"));
+      });
 #else
-        WiFiEventId_t event_gotIP = WiFi.onEvent(
-            [](WiFiEvent_t event, WiFiEventInfo_t info) {
-              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"));
-            },
-            WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
-
-        WiFiEventId_t event_disconnected =
-            WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info) { Serial.println(F("wifi Station disconnected")); },
-                         WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
+      WiFiEventId_t event_gotIP = WiFi.onEvent(
+          [](WiFiEvent_t event, WiFiEventInfo_t info) {
+            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"));
+          },
+          WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
+
+      WiFiEventId_t event_disconnected = WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info) { Serial.println(F("wifi Station disconnected")); },
+                                                      WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
 #endif
-        Serial.print(F("WiFi: establishing connection with SSID: \""));
-        Serial.print(ssid);
-        Serial.println(F("\""));
-        if (hostname) {
-          WiFi.hostname(hostname);
-        }
-        WiFi.softAPdisconnect(true);
-        WiFi.setAutoConnect(false);
-        WiFi.mode(WIFI_STA);
-        WiFi.begin(ssid, password);
+      Serial.print(F("WiFi: establishing connection with SSID: \""));
+      Serial.print(ssid);
+      Serial.println(F("\""));
+      if (hostname) {
+        WiFi.hostname(hostname);
       }
-      else {
-        Serial.println(F("WiFi: resetting WiFi connection"));
-        if (client) {
-          delete client;
-          client = nullptr;
-        }
-        WiFi.reconnect();
+      WiFi.softAPdisconnect(true);
+      WiFi.setAutoConnect(false);
+      WiFi.mode(WIFI_STA);
+      WiFi.begin(ssid, password);
+    }
+    else if (ConfigESP->configModeESP == NORMAL_MODE) {
+      Serial.println(F("WiFi: resetting WiFi connection"));
+      if (client) {
+        delete client;
+        client = nullptr;
       }
-
-      yield();
+      WiFi.reconnect();
     }
+
+    yield();
   }
 
   void enableBuffer(bool value) {

From ca2cc94fbf3fca52e74701b4b1c932607e2aa300 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 17:45:49 +0100
Subject: [PATCH 084/165] MyWebServer

---
 src/SuplaWebServer.cpp | 7 ++++---
 src/SuplaWebServer.h   | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 35f15e05..a3e22b01 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -29,7 +29,7 @@
 String webContentBuffer;
 
 SuplaWebServer::SuplaWebServer() {
-  httpServer = new ESP8266WebServer(80);
+  httpServer = new MyWebServer();
   httpUpdater = new ESP8266HTTPUpdateServer();
 }
 
@@ -37,7 +37,7 @@ void SuplaWebServer::begin() {
   this->createWebServer();
 
   httpServer->onNotFound(std::bind(&SuplaWebServer::handleNotFound, this));
-  httpServer->begin();
+  httpServer->begin(80);
 }
 
 void SuplaWebServer::iterateAlways() {
@@ -329,7 +329,8 @@ void SuplaWebServer::sendContent() {
   checkRAM();
 #endif
   webContentBuffer.clear();
-  //webContentBuffer.reserve(0);
+  httpServer->client().flush();
+  httpServer->client().stop();
 }
 
 void SuplaWebServer::handleNotFound() {
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index a05ab0dc..2637ab6b 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -53,8 +53,8 @@
 extern String webContentBuffer;
 
 // https://www.esp8266.com/viewtopic.php?p=84249#p84249
-/*class MyWebServer : public ESP8266WebServer {
-  public:
+class MyWebServer : public ESP8266WebServer {
+ public:
   virtual ~MyWebServer() {
     if (this->_currentArgs) {
       delete[] this->_currentArgs;
@@ -66,7 +66,7 @@ extern String webContentBuffer;
       this->_postArgs = nullptr;
     }
   }
-};*/
+};
 
 class SuplaWebServer : public Supla::Element {
  public:
@@ -75,7 +75,7 @@ class SuplaWebServer : public Supla::Element {
   void supla_webpage_start(int save);
   void sendContent();
 
-  ESP8266WebServer* httpServer;
+  MyWebServer* httpServer;
 
 #ifdef SUPLA_OTA
   ESP8266HTTPUpdateServer* httpUpdater;

From 3a73260766f4dece5957676196a5e8ca4af574a3 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 17:48:03 +0100
Subject: [PATCH 085/165] ESP8266WebServer

---
 src/SuplaWebServer.cpp | 4 ++--
 src/SuplaWebServer.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index a3e22b01..8e998073 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -29,7 +29,7 @@
 String webContentBuffer;
 
 SuplaWebServer::SuplaWebServer() {
-  httpServer = new MyWebServer();
+  httpServer = new ESP8266WebServer(80);
   httpUpdater = new ESP8266HTTPUpdateServer();
 }
 
@@ -37,7 +37,7 @@ void SuplaWebServer::begin() {
   this->createWebServer();
 
   httpServer->onNotFound(std::bind(&SuplaWebServer::handleNotFound, this));
-  httpServer->begin(80);
+  httpServer->begin();
 }
 
 void SuplaWebServer::iterateAlways() {
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 2637ab6b..97dc3346 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -52,7 +52,7 @@
 
 extern String webContentBuffer;
 
-// https://www.esp8266.com/viewtopic.php?p=84249#p84249
+/*// https://www.esp8266.com/viewtopic.php?p=84249#p84249
 class MyWebServer : public ESP8266WebServer {
  public:
   virtual ~MyWebServer() {
@@ -66,7 +66,7 @@ class MyWebServer : public ESP8266WebServer {
       this->_postArgs = nullptr;
     }
   }
-};
+};*/
 
 class SuplaWebServer : public Supla::Element {
  public:
@@ -75,7 +75,7 @@ class SuplaWebServer : public Supla::Element {
   void supla_webpage_start(int save);
   void sendContent();
 
-  MyWebServer* httpServer;
+  ESP8266WebServer* httpServer;
 
 #ifdef SUPLA_OTA
   ESP8266HTTPUpdateServer* httpUpdater;

From def73514bb9a134e47dd5a021164d4ef8e7e373a Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 18:33:30 +0100
Subject: [PATCH 086/165] Update platformio.ini

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 0979fffa..8ca937f8 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.8-testowa"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.9"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC

From f1ff3b8613fd139f20b0df71ffd5b0785e04f977 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 20:11:00 +0100
Subject: [PATCH 087/165] =?UTF-8?q?Wy=C5=82=C4=85czenie=20GPIO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini         |  2 +-
 src/SuplaConfigESP.cpp | 11 +++++++----
 src/SuplaWebServer.cpp |  5 +++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 8ca937f8..1ae73ebc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.2.9"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.0"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 344a8989..6d838a8e 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -567,8 +567,11 @@ void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t functio
   uint8_t key = KEY_GPIO + gpio;
   uint8_t adress = getAdressMCP23017(nr, function);
 
-  ConfigManager->setElement(key, getNrMCP23017(adress), 0);
-  ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
+  if (getNrMCP23017(adress) != OFF_MCP23017)
+    ConfigManager->setElement(key, getNrMCP23017(adress), 0);
+  if (getFunctionMCP23017(adress) != OFF_MCP23017)
+    ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
+
   if (function == FUNCTION_BUTTON) {
     ConfigManager->setElement(key, LEVEL_BUTTON, 1);
     ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
@@ -606,7 +609,7 @@ uint8_t SuplaConfigESP::getFunctionMCP23017(uint8_t adress) {
       return MCP23017_FUNCTION_4;
       break;
   }
-  return FUNCTION_OFF;
+  return OFF_MCP23017;
 }
 
 uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
@@ -624,7 +627,7 @@ uint8_t SuplaConfigESP::getNrMCP23017(uint8_t adress) {
       return MCP23017_NR_4;
       break;
   }
-  return FUNCTION_OFF;
+  return OFF_MCP23017;
 }
 
 void SuplaConfigESP::factoryReset(bool forceReset) {
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 8e998073..2c98fb25 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -329,6 +329,7 @@ void SuplaWebServer::sendContent() {
   checkRAM();
 #endif
   webContentBuffer.clear();
+  webContentBuffer = String();
   httpServer->client().flush();
   httpServer->client().stop();
 }
@@ -375,7 +376,7 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   //  ConfigESP->clearGpio(gpio, function);
 
   if (gpioInput == OFF_GPIO)
-    ConfigESP->clearGpio(gpioInput, function);
+    ConfigESP->clearGpio(gpio, function);
 
   if (gpioInput != OFF_GPIO) {
     if (functionElement == FUNCTION_OFF) {
@@ -423,7 +424,7 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
   //  ConfigESP->clearGpioMCP23017(gpio, nr, function);
 
   if (gpioInput == OFF_GPIO || addressInput == OFF_MCP23017)
-    ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
+    ConfigESP->clearGpioMCP23017(gpio, nr, function);
 
   if (gpioInput != OFF_GPIO && addressInput != OFF_MCP23017) {
     if (functionElement == FUNCTION_OFF) {

From 95d2dda0eeac410549915b2ee1da4758e36512ac Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 22:28:30 +0100
Subject: [PATCH 088/165] LittleFS->SPIFFS

---
 platformio.ini               |  2 +-
 src/SuplaConfigManager.cpp   | 24 ++++++++++++------------
 src/SuplaWebPageDownload.cpp |  4 ++--
 src/SuplaWebPageUpload.cpp   |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 1ae73ebc..5624f63c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.0"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.1"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index 59811507..d6500b37 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -21,7 +21,7 @@
 #include <IPAddress.h>
 #include <supla-common/proto.h>
 
-#include "LittleFS.h"
+#include "FS.h"
 #include "SuplaConfigManager.h"
 #include "SuplaDeviceGUI.h"
 
@@ -139,10 +139,10 @@ void ConfigOption::setValue(const char *value) {
 // class SuplaConfigManager
 //
 SuplaConfigManager::SuplaConfigManager() {
-  if (LittleFS.begin()) {
-    //    Serial.println(F("\nLittleFS mounted"));
+  if (SPIFFS.begin()) {
+    //    Serial.println(F("\nSPIFFS mounted"));
     //  } else {
-    //    Serial.println(F("\nFailed to mount LittleFS"));
+    //    Serial.println(F("\nFailed to mount SPIFFS"));
   }
   _optionCount = 0;
 
@@ -251,9 +251,9 @@ uint8_t SuplaConfigManager::deleteKey(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::load() {
-  if (LittleFS.begin()) {
-    if (LittleFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
+  if (SPIFFS.begin()) {
+    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -296,9 +296,9 @@ uint8_t SuplaConfigManager::load() {
 }
 
 uint8_t SuplaConfigManager::loadItem(uint8_t key) {
-  if (LittleFS.begin()) {
-    if (LittleFS.exists(CONFIG_FILE_PATH)) {
-      File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
+  if (SPIFFS.begin()) {
+    if (SPIFFS.exists(CONFIG_FILE_PATH)) {
+      File configFile = SPIFFS.open(CONFIG_FILE_PATH, "r");
 
       if (configFile) {
         int i = 0;
@@ -339,7 +339,7 @@ uint8_t SuplaConfigManager::loadItem(uint8_t key) {
 }
 
 uint8_t SuplaConfigManager::save() {
-  if (LittleFS.begin()) {
+  if (SPIFFS.begin()) {
     int i = 0;
     int offset = 0;
     int length = 0;
@@ -348,7 +348,7 @@ uint8_t SuplaConfigManager::save() {
       length += _options[i]->getLength();
     }
 
-    File configFile = LittleFS.open(CONFIG_FILE_PATH, "w+");
+    File configFile = SPIFFS.open(CONFIG_FILE_PATH, "w+");
     if (configFile) {
       uint8_t *content = (uint8_t *)malloc(sizeof(uint8_t) * length);
       for (i = 0; i < _optionCount; i++) {
diff --git a/src/SuplaWebPageDownload.cpp b/src/SuplaWebPageDownload.cpp
index d4dbf3ff..51292f02 100644
--- a/src/SuplaWebPageDownload.cpp
+++ b/src/SuplaWebPageDownload.cpp
@@ -1,6 +1,6 @@
 #include "SuplaWebPageDownload.h"
 #include "SuplaDeviceGUI.h"
-#include "LittleFS.h"
+#include "FS.h"
 
 void createWebDownload() {
   WebServer->httpServer->on(getURL(PATH_DOWNLOAD), handleDownload);
@@ -11,7 +11,7 @@ void handleDownload() {
     return;
   }
 
-  File dataFile = LittleFS.open(F(CONFIG_FILE_PATH), "r");
+  File dataFile = SPIFFS.open(F(CONFIG_FILE_PATH), "r");
 
   if (!dataFile) {
     return;
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index c3bbe7c2..a533bd74 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -1,6 +1,6 @@
 #include "SuplaWebPageUpload.h"
 #include "SuplaDeviceGUI.h"
-#include "LittleFS.h"
+#include "FS.h"
 
 static const char uploadIndex[] PROGMEM =
     R"(<form class="formcenter" method="POST" action="/upload" enctype="multipart/form-data">
@@ -58,11 +58,11 @@ void handleFileUpload() {
     return;
   }
 
-  if (LittleFS.begin()) {
+  if (SPIFFS.begin()) {
     HTTPUpload& upload = WebServer->httpServer->upload();
 
     if (upload.status == UPLOAD_FILE_START) {
-      dataFile = LittleFS.open(CONFIG_FILE_PATH, "w");
+      dataFile = SPIFFS.open(CONFIG_FILE_PATH, "w");
     }
     else if (upload.status == UPLOAD_FILE_WRITE) {
       if (dataFile)

From 5f1387adf23be4322b175df294b6d5dab288be76 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 17 Feb 2021 22:28:42 +0100
Subject: [PATCH 089/165] poprawki dla MCP

---
 src/SuplaConfigESP.cpp | 46 +++++++++++++++++++++++++++++++-----------
 src/SuplaDeviceGUI.cpp |  9 ++-------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 6d838a8e..e4822fee 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -259,15 +259,33 @@ int SuplaConfigESP::getGpio(int nr, int function) {
 // Pin 116 - 131"
 #ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-      uint8_t address = getAdressMCP23017(nr, function);
-      if (address == 0)
-        return gpio + 100;
-      if (address == 1)
-        return gpio + 100 + 16;
-      if (address == 2)
-        return gpio + 100 + 16 + 16;
-      if (address == 3)
-        return gpio + 100 + 16 + 16 + 16;
+      
+      switch (getAdressMCP23017(nr, function)) {
+        case 0:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function &&
+              ConfigManager->get(key)->getElement(MCP23017_NR_1).toInt() == nr) {
+            return gpio + 100;
+          }
+          break;
+        case 1:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_2).toInt() == function &&
+              ConfigManager->get(key)->getElement(MCP23017_NR_2).toInt() == nr) {
+            return gpio + 100 + 16;
+          }
+          break;
+        case 2:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_3).toInt() == function &&
+              ConfigManager->get(key)->getElement(MCP23017_NR_3).toInt() == nr) {
+            return gpio + 100 + 16 + 16;
+          }
+          break;
+        case 3:
+          if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_4).toInt() == function &&
+              ConfigManager->get(key)->getElement(MCP23017_NR_4).toInt() == nr) {
+            return gpio + 100 + 16 + 16 + 16;
+          }
+          break;
+      }
     }
 #endif
   }
@@ -275,8 +293,9 @@ int SuplaConfigESP::getGpio(int nr, int function) {
 }
 
 int SuplaConfigESP::getLevel(int nr, int function) {
+  uint8_t key;
   for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
-    uint8_t key = KEY_GPIO + gpio;
+    key = KEY_GPIO + gpio;
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
         if (function == FUNCTION_BUTTON)
@@ -289,12 +308,15 @@ int SuplaConfigESP::getLevel(int nr, int function) {
 #ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
       uint8_t address = getAdressMCP23017(nr, function);
+
       if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
         if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
-          if (function == FUNCTION_BUTTON)
+          if (function == FUNCTION_BUTTON) {
             return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-          else
+          }
+          else {
             return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
+          }
         }
       }
     }
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index e1c265cb..82785ac4 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -85,13 +85,8 @@ void addRelayButton(uint8_t nr) {
     relay[size]->keepTurnOnDuration();
 
     if (pinButton != OFF_GPIO) {
-      Supla::Control::Button *button;
-      if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-        button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON), false);
-      }
-      else {
-        button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON));
-      }
+      Serial.println(ConfigESP->getLevel(nr, FUNCTION_BUTTON));
+      auto button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON));
 
       button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getEvent(nr, FUNCTION_BUTTON));
       button->setSwNoiseFilterDelay(50);

From 45d691ffa279d4597e36470d611464498766d0f4 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 18 Feb 2021 13:49:30 +0100
Subject: [PATCH 090/165] Update SuplaWebServer.cpp

---
 src/SuplaWebServer.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 2c98fb25..65a9af0f 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -372,14 +372,12 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   key = KEY_GPIO + gpioInput;
   functionElement = ConfigManager->get(key)->getElement(FUNCTION).toInt();
 
-  // if (gpio != gpioInput)
-  //  ConfigESP->clearGpio(gpio, function);
-
   if (gpioInput == OFF_GPIO)
     ConfigESP->clearGpio(gpio, function);
 
   if (gpioInput != OFF_GPIO) {
-    if (functionElement == FUNCTION_OFF) {
+    if (functionElement == FUNCTION_OFF && gpio != gpioInput) {
+      ConfigESP->clearGpio(gpio, function);
       ConfigESP->clearGpio(gpioInput, function);
       ConfigESP->setGpio(gpioInput, nr, function);
     }
@@ -420,14 +418,12 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
   key = KEY_GPIO + gpioInput;
   functionElement = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
 
-  // if (gpio != gpioInput || address != addressInput)
-  //  ConfigESP->clearGpioMCP23017(gpio, nr, function);
-
   if (gpioInput == OFF_GPIO || addressInput == OFF_MCP23017)
     ConfigESP->clearGpioMCP23017(gpio, nr, function);
 
   if (gpioInput != OFF_GPIO && addressInput != OFF_MCP23017) {
-    if (functionElement == FUNCTION_OFF) {
+    if (functionElement == FUNCTION_OFF && (gpio != gpioInput || address != addressInput)) {
+      ConfigESP->clearGpioMCP23017(gpio, nr, function);
       ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
       ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
     }

From f5276bf1ed9a2cdef6a4a32a7404ae34220c5130 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 18 Feb 2021 13:49:33 +0100
Subject: [PATCH 091/165] Update SuplaDeviceGUI.cpp

---
 src/SuplaDeviceGUI.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 82785ac4..49c8a747 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -83,6 +83,7 @@ void addRelayButton(uint8_t nr) {
     }
 
     relay[size]->keepTurnOnDuration();
+    relay[size]->getChannel()->setDefault(SUPLA_CHANNELFNC_POWERSWITCH);
 
     if (pinButton != OFF_GPIO) {
       Serial.println(ConfigESP->getLevel(nr, FUNCTION_BUTTON));

From be21d84f65a967cb63adfd971d4315e758211750 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 19 Feb 2021 10:03:25 +0100
Subject: [PATCH 092/165] =?UTF-8?q?nowy=20spos=C3=B3b=20przesy=C5=82ania?=
 =?UTF-8?q?=20strony?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Markup.cpp                |  3 ++
 src/SuplaWebPageControl.cpp   |  8 +++-
 src/SuplaWebPageRelay.cpp     |  6 ++-
 src/SuplaWebPageStatusLed.cpp |  4 +-
 src/SuplaWebServer.cpp        | 79 +++++++++++++++++++++--------------
 src/SuplaWebServer.h          | 34 ++++++++-------
 6 files changed, 81 insertions(+), 53 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index 9f271bf2..7c7dc6b1 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -260,6 +260,7 @@ void addListBox(String& html, const String& input_id, const String& name, const
     }
     html += FPSTR(array_P[suported]);
   }
+  WebServer->sendHeader();
   html += F("</select></i>");
 }
 
@@ -345,6 +346,7 @@ void addListGPIOSelect(String& html, const String& input_id, uint8_t function, u
       html += FPSTR(GPIO_P[suported]);
     }
   }
+  WebServer->sendHeader();
   html += F("</select>");
 }
 
@@ -369,6 +371,7 @@ void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function,
       html += FPSTR(GPIO_MCP23017_P[suported]);
     }
   }
+  WebServer->sendHeader();
   html += F("</select>");
 }
 
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 95392288..4828a308 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -106,6 +106,8 @@ void SuplaWebPageControl::handleControlSave() {
 void SuplaWebPageControl::supla_webpage_control(int save) {
   uint8_t nr, countFreeGpio;
 
+  WebServer->sendHeaderStart();
+
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_CONTROL);
   addForm(webContentBuffer, F("post"), PATH_SAVE_CONTROL);
@@ -137,7 +139,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
@@ -285,6 +287,8 @@ void SuplaWebPageControl::handleLimitSwitchSave() {
 void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
   uint8_t nr, countFreeGpio;
 
+  WebServer->sendHeaderStart();
+
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_SWITCH);
   addForm(webContentBuffer, F("post"), PATH_SAVE_SWITCH);
@@ -314,7 +318,7 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 #endif
 
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 7f470a13..ae8aab8a 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -100,6 +100,8 @@ void SuplaWebPageRelay::handleRelaySave() {
 void SuplaWebPageRelay::supla_webpage_relay(int save) {
   uint8_t nr, countFreeGpio;
 
+  WebServer->sendHeaderStart();
+  
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_RELAY);
 
@@ -107,7 +109,7 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
   addFormHeader(webContentBuffer, S_GPIO_SETTINGS_FOR_RELAYS);
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
-    countFreeGpio = 16;
+    countFreeGpio = 32;
   }
   else {
     countFreeGpio = ConfigESP->countFreeGpio(FUNCTION_RELAY);
@@ -129,7 +131,7 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 
 void SuplaWebPageRelay::handleRelaySet() {
diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
index e84a5e1b..e12763fd 100644
--- a/src/SuplaWebPageStatusLed.cpp
+++ b/src/SuplaWebPageStatusLed.cpp
@@ -47,6 +47,7 @@ void handleStatusLedSave() {
 void webStatusLed(int save) {
   uint8_t nr, selected;
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_LED);
   addForm(webContentBuffer, F("post"), PATH_SAVE_LED);
@@ -64,6 +65,5 @@ void webStatusLed(int save) {
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
-
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
\ No newline at end of file
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 65a9af0f..73c56e5c 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -190,6 +190,8 @@ void SuplaWebServer::supla_webpage_reboot() {
 }
 
 void SuplaWebServer::deviceSettings(int save) {
+  WebServer->sendHeaderStart();
+
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_DEVICE_SETTINGS);
 
@@ -238,7 +240,7 @@ void SuplaWebServer::deviceSettings(int save) {
   addFormHeaderEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, "");
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 
 void SuplaWebServer::handleBoardSave() {
@@ -270,13 +272,9 @@ void SuplaWebServer::handleBoardSave() {
   }
 }
 
-void SuplaWebServer::sendContent() {
-  // httpServer->send(200, "text/html", "");
-  // const int bufferSize = 1000;
-  // String _buffer;
-  //_buffer.reserve(bufferSize);
-  // int bufferCounter = 0;
-
+void SuplaWebServer::sendHeaderStart() {
+  chunkedSendHeader = true;
+  tcpCleanup();
   httpServer->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
   httpServer->sendHeader(F("Pragma"), F("no-cache"));
   httpServer->sendHeader(F("Expires"), F("-1"));
@@ -299,44 +297,50 @@ void SuplaWebServer::sendContent() {
 
   httpServer->sendContent(summary);
   httpServer->sendContent_P(HTTP_COPYRIGHT);
+}
 
-  // httpServer->send(200, "text/html", "");
-  /*for (int i = 0; i < fileSize; i++) {
-    _buffer += content[i];
-    bufferCounter++;
-
-    if (bufferCounter >= bufferSize) {
-      httpServer->sendContent(_buffer);
-      yield();
-      bufferCounter = 0;
-      _buffer = "";
-    }
-  }
-  if (bufferCounter > 0) {
-    httpServer->sendContent(_buffer);
-    yield();
-    bufferCounter = 0;
-    _buffer = "";
-  }*/
+void SuplaWebServer::sendHeader() {
+  if (!chunkedSendHeader)
+    return;
 
   httpServer->sendContent(webContentBuffer);
-  httpServer->sendContent_P(HTTP_RBT);
-  httpServer->chunkedResponseFinalize();
 
 #ifdef DEBUG_MODE
   Serial.printf_P(PSTR("Content size=%d\n"), webContentBuffer.length());
   Serial.printf_P(PSTR("Sent INDEX...Free mem=%d\n"), ESP.getFreeHeap());
-  checkRAM();
 #endif
+
   webContentBuffer.clear();
   webContentBuffer = String();
+  delay(0);
+}
+
+void SuplaWebServer::sendHeaderEnd() {
+  if (!chunkedSendHeader)
+    return;
+
+  WebServer->sendHeader();
+  httpServer->sendContent_P(HTTP_RBT);
+  httpServer->chunkedResponseFinalize();
+
+  tcpCleanup();
   httpServer->client().flush();
   httpServer->client().stop();
+  chunkedSendHeader = false;
+
+#ifdef DEBUG_MODE
+  checkRAM();
+#endif
+}
+
+void SuplaWebServer::sendContent() {
+  sendHeaderStart();
+  sendHeader();
+  sendHeaderEnd();
 }
 
 void SuplaWebServer::handleNotFound() {
   httpServer->sendHeader("Location", "/", true);
-  // httpServer->send(302, "text/plane", "");
 
   supla_webpage_reboot();
 }
@@ -435,4 +439,17 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
     }
   }
   return true;
-}
\ No newline at end of file
+}
+
+#if defined(ESP8266)
+
+struct tcp_pcb;
+extern struct tcp_pcb* tcp_tw_pcbs;
+extern "C" void tcp_abort(struct tcp_pcb* pcb);
+
+void tcpCleanup() {
+  while (tcp_tw_pcbs != NULL) {
+    tcp_abort(tcp_tw_pcbs);
+  }
+}
+#endif
\ No newline at end of file
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 97dc3346..0f236c1d 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -52,27 +52,17 @@
 
 extern String webContentBuffer;
 
-/*// https://www.esp8266.com/viewtopic.php?p=84249#p84249
-class MyWebServer : public ESP8266WebServer {
- public:
-  virtual ~MyWebServer() {
-    if (this->_currentArgs) {
-      delete[] this->_currentArgs;
-      this->_currentArgs = nullptr;
-    }
-
-    if (this->_postArgs) {
-      delete[] this->_postArgs;
-      this->_postArgs = nullptr;
-    }
-  }
-};*/
-
 class SuplaWebServer : public Supla::Element {
  public:
   SuplaWebServer();
   void begin();
   void supla_webpage_start(int save);
+
+  bool chunkedSendHeader = false;
+  void sendHeaderStart();
+  void sendHeader();
+  void sendHeaderEnd();
+
   void sendContent();
 
   ESP8266WebServer* httpServer;
@@ -100,4 +90,16 @@ class SuplaWebServer : public Supla::Element {
 
   void handleNotFound();
 };
+
+#if defined(ESP8266)
+#include <md5.h>
+#endif
+#if defined(ESP8266)
+
+struct tcp_pcb;
+extern struct tcp_pcb* tcp_tw_pcbs;
+extern "C" void tcp_abort(struct tcp_pcb* pcb);
+
+void tcpCleanup();
+#endif
 #endif  // SuplaWebServer_h

From b333c2bc9d9ec5b548867a1448c79520fdb7d08f Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 19 Feb 2021 19:32:58 +0100
Subject: [PATCH 093/165] =?UTF-8?q?umo=C5=BCliwienie=20dodania=2032=20prze?=
 =?UTF-8?q?ka=C5=BAnik=C3=B3w=20przycisk=C3=B3w=20oraz=20sensor=C3=B3w=20d?=
 =?UTF-8?q?la=20MCP23017?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Markup.cpp              | 11 ++++++++---
 src/SuplaConfigESP.cpp      | 10 +++++++---
 src/SuplaConfigESP.h        |  2 +-
 src/SuplaDeviceGUI.cpp      |  4 +++-
 src/SuplaWebPageControl.cpp | 13 +++++--------
 src/SuplaWebPageRelay.cpp   |  9 +++------
 src/SuplaWebServer.cpp      | 35 ++++++++++++++++++++---------------
 7 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index 7c7dc6b1..49c1215a 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -185,9 +185,14 @@ void addListMCP23017GPIOBox(String& html, const String& input_id, const String&
 }
 
 void addListMCP23017GPIOLinkBox(String& html, const String& input_id, const String& name, uint8_t function, const String& url, uint8_t nr) {
+  uint8_t address;
   if (nr == 1) {
-    uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
-    addListLinkBox(html, INPUT_ADRESS_MCP23017, F("MCP23017 Adres"), MCP23017_P, 5, address, url);
+    address = ConfigESP->getAdressMCP23017(nr, function);
+    addListLinkBox(html, String(INPUT_ADRESS_MCP23017) + nr, F("MCP23017 Adres 1"), MCP23017_P, 5, address, url);
+  }
+  if (nr == 17) {
+    address = ConfigESP->getAdressMCP23017(nr, function);
+    addListBox(html, String(INPUT_ADRESS_MCP23017) + nr, F("MCP23017 Adres 2"), MCP23017_P, 5, address);
   }
 
   html += F("<i><label>");
@@ -359,7 +364,7 @@ void addListMCP23017GPIO(String& html, const String& input_id, uint8_t function,
   uint8_t selected = ConfigESP->getGpioMCP23017(nr, function);
 
   for (uint8_t suported = 0; suported < 18; suported++) {
-    if (ConfigESP->checkBusyGpioMCP23017(suported, function) || selected == suported) {
+    if (ConfigESP->checkBusyGpioMCP23017(suported, nr, function) || selected == suported) {
       html += F("<option value='");
       html += suported;
       if (selected == suported) {
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index e4822fee..d6e0c54f 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -259,7 +259,6 @@ int SuplaConfigESP::getGpio(int nr, int function) {
 // Pin 116 - 131"
 #ifdef SUPLA_MCP23017
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
-      
       switch (getAdressMCP23017(nr, function)) {
         case 0:
           if (ConfigManager->get(key)->getElement(MCP23017_FUNCTION_1).toInt() == function &&
@@ -501,7 +500,7 @@ uint8_t SuplaConfigESP::countFreeGpio(uint8_t exception) {
   return count;
 }
 
-bool SuplaConfigESP::checkBusyGpioMCP23017(uint8_t gpio, uint8_t function) {
+bool SuplaConfigESP::checkBusyGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function) {
   if (gpio == OFF_GPIO) {
     return true;
   }
@@ -510,7 +509,12 @@ bool SuplaConfigESP::checkBusyGpioMCP23017(uint8_t gpio, uint8_t function) {
   }
   else {
     uint8_t key = KEY_GPIO + gpio;
-    uint8_t address = ConfigESP->getAdressMCP23017(1, function);
+    uint8_t address = ConfigESP->getAdressMCP23017(nr, function);
+
+    if (nr <= 16)
+      address = ConfigESP->getAdressMCP23017(1, function);
+    if (nr >= 17)
+      address = ConfigESP->getAdressMCP23017(17, function);
 
     if (address == OFF_MCP23017) {
       return true;
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index e0772fbd..9e67ddc5 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -101,7 +101,7 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
   void factoryReset(bool forceReset = false);
   const String getConfigNameAP();
 
-  bool checkBusyGpioMCP23017(uint8_t gpio, uint8_t function);
+  bool checkBusyGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function);
   uint8_t getGpioMCP23017(uint8_t nr, uint8_t function);
   uint8_t getAdressMCP23017(uint8_t nr, uint8_t function);
   void setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function);
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 49c8a747..3c0838ca 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -86,7 +86,6 @@ void addRelayButton(uint8_t nr) {
     relay[size]->getChannel()->setDefault(SUPLA_CHANNELFNC_POWERSWITCH);
 
     if (pinButton != OFF_GPIO) {
-      Serial.println(ConfigESP->getLevel(nr, FUNCTION_BUTTON));
       auto button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON));
 
       button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getEvent(nr, FUNCTION_BUTTON));
@@ -130,6 +129,7 @@ void addRelayButton(uint8_t nr) {
     }
 #endif
   }
+  delay(0);
 }
 #endif
 
@@ -191,6 +191,7 @@ void addRolleShutter(uint8_t nr) {
   if (pinLedDown != OFF_GPIO) {
     new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, !levelLed);
   }
+  delay(0);
 }
 
 void addRolleShutterMomentary(uint8_t nr) {
@@ -226,6 +227,7 @@ void addRolleShutterMomentary(uint8_t nr) {
   if (pinLedDown != OFF_GPIO) {
     new Supla::Control::PinStatusLed(pinRelayDown, pinLedDown, !levelLed);
   }
+  delay(0);
 }
 #endif
 
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 4828a308..faf504aa 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -116,7 +116,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_BUTTONS));
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
-    countFreeGpio = 16;
+    countFreeGpio = 32;
   }
   else {
     countFreeGpio = ConfigESP->countFreeGpio(FUNCTION_BUTTON);
@@ -296,7 +296,7 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
-    countFreeGpio = 16;
+    countFreeGpio = 32;
   }
   else {
     countFreeGpio = ConfigESP->countFreeGpio(FUNCTION_LIMIT_SWITCH);
@@ -374,14 +374,11 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   input = INPUT_BUTTON_ACTION;
   action = WebServer->httpServer->arg(input).toInt();
 
-  address = ConfigESP->getAdressMCP23017(1, FUNCTION_BUTTON);
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
-    if (ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(address)).toInt() == FUNCTION_BUTTON) {
-      ConfigManager->setElement(key, LEVEL_BUTTON, level);
-      ConfigManager->setElement(key, EVENT_BUTTON, event);
-      ConfigManager->setElement(key, ACTION_BUTTON, action);
-    }
+    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+    ConfigManager->setElement(key, EVENT_BUTTON, event);
+    ConfigManager->setElement(key, ACTION_BUTTON, action);
   }
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index ae8aab8a..90ea4b40 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -101,7 +101,7 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
   uint8_t nr, countFreeGpio;
 
   WebServer->sendHeaderStart();
-  
+
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_RELAY);
 
@@ -360,13 +360,10 @@ void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
   input = INPUT_RELAY_LEVEL;
   level = WebServer->httpServer->arg(input).toInt();
 
-  address = ConfigESP->getAdressMCP23017(1, FUNCTION_RELAY);
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
-    if (ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(address)).toInt() == FUNCTION_RELAY) {
-      ConfigManager->setElement(key, MEMORY, memory);
-      ConfigManager->setElement(key, LEVEL_RELAY, level);
-    }
+    ConfigManager->setElement(key, MEMORY, memory);
+    ConfigManager->setElement(key, LEVEL_RELAY, level);
   }
 
 #if defined(SUPLA_PUSHOVER)
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 73c56e5c..db649729 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -303,23 +303,24 @@ void SuplaWebServer::sendHeader() {
   if (!chunkedSendHeader)
     return;
 
-  httpServer->sendContent(webContentBuffer);
+  if (!webContentBuffer.isEmpty()) {
+    httpServer->sendContent(webContentBuffer);
+    webContentBuffer.clear();
+    webContentBuffer = String();
+    delay(0);
+  }
 
 #ifdef DEBUG_MODE
   Serial.printf_P(PSTR("Content size=%d\n"), webContentBuffer.length());
   Serial.printf_P(PSTR("Sent INDEX...Free mem=%d\n"), ESP.getFreeHeap());
 #endif
-
-  webContentBuffer.clear();
-  webContentBuffer = String();
-  delay(0);
 }
 
 void SuplaWebServer::sendHeaderEnd() {
   if (!chunkedSendHeader)
     return;
 
-  WebServer->sendHeader();
+  sendHeader();
   httpServer->sendContent_P(HTTP_RBT);
   httpServer->chunkedResponseFinalize();
 
@@ -355,7 +356,7 @@ bool SuplaWebServer::isLoggedIn() {
 }
 
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t gpio, gpioInput, functionElement, current_value, key;
+  uint8_t gpio, gpioInput, functionInput, current_value, key;
   String input;
   input = _input;
 
@@ -374,18 +375,18 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   gpioInput = WebServer->httpServer->arg(input).toInt();
 
   key = KEY_GPIO + gpioInput;
-  functionElement = ConfigManager->get(key)->getElement(FUNCTION).toInt();
+  functionInput = ConfigManager->get(key)->getElement(FUNCTION).toInt();
 
   if (gpioInput == OFF_GPIO)
     ConfigESP->clearGpio(gpio, function);
 
   if (gpioInput != OFF_GPIO) {
-    if (functionElement == FUNCTION_OFF && gpio != gpioInput) {
+    if (functionInput == FUNCTION_OFF && gpio != gpioInput) {
       ConfigESP->clearGpio(gpio, function);
       ConfigESP->clearGpio(gpioInput, function);
       ConfigESP->setGpio(gpioInput, nr, function);
     }
-    else if (gpio == gpioInput && functionElement == function) {
+    else if (gpio == gpioInput && functionInput == function) {
       ConfigESP->setGpio(gpioInput, nr, function);
     }
     else if (function == FUNCTION_CFG_BUTTON) {
@@ -406,7 +407,7 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
 }
 
 bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t key, address, addressInput, gpio, gpioInput, functionElement;
+  uint8_t key, address, addressInput, gpio, gpioInput, functionInput, nrInput;
   String input = _input + nr;
 
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") == 0) {
@@ -414,24 +415,28 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
   }
 
   address = ConfigESP->getAdressMCP23017(nr, function);
-  addressInput = WebServer->httpServer->arg(INPUT_ADRESS_MCP23017).toInt();
+  if (nr <= 16)
+    addressInput = WebServer->httpServer->arg(String(INPUT_ADRESS_MCP23017) + 1).toInt();
+  if (nr >= 17)
+    addressInput = WebServer->httpServer->arg(String(INPUT_ADRESS_MCP23017) + 17).toInt();
 
   gpio = ConfigESP->getGpioMCP23017(nr, function);
   gpioInput = WebServer->httpServer->arg(input).toInt();
 
   key = KEY_GPIO + gpioInput;
-  functionElement = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
+  functionInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
+  nrInput = ConfigManager->get(key)->getElement(ConfigESP->getNrMCP23017(addressInput)).toInt();
 
   if (gpioInput == OFF_GPIO || addressInput == OFF_MCP23017)
     ConfigESP->clearGpioMCP23017(gpio, nr, function);
 
   if (gpioInput != OFF_GPIO && addressInput != OFF_MCP23017) {
-    if (functionElement == FUNCTION_OFF && (gpio != gpioInput || address != addressInput)) {
+    if (functionInput == FUNCTION_OFF && nrInput == FUNCTION_OFF) {
       ConfigESP->clearGpioMCP23017(gpio, nr, function);
       ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
       ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
     }
-    else if (gpio == gpioInput && functionElement == function) {
+    else if (gpio == gpioInput && function == functionInput && nr == nrInput) {
       ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
     }
     else {

From c4f2a7aa95b7512c7188c9073bd2b6d3124e3767 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 19 Feb 2021 20:36:30 +0100
Subject: [PATCH 094/165] poprawa nazewnictw

---
 src/SuplaWebServer.cpp | 53 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index db649729..694d2692 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -356,7 +356,7 @@ bool SuplaWebServer::isLoggedIn() {
 }
 
 bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t gpio, gpioInput, functionInput, current_value, key;
+  uint8_t gpio, _gpio, _function, _nr, current_value, key;
   String input;
   input = _input;
 
@@ -372,25 +372,26 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
   }
 
   gpio = ConfigESP->getGpio(nr, function);
-  gpioInput = WebServer->httpServer->arg(input).toInt();
+  _gpio = WebServer->httpServer->arg(input).toInt();
 
-  key = KEY_GPIO + gpioInput;
-  functionInput = ConfigManager->get(key)->getElement(FUNCTION).toInt();
+  key = KEY_GPIO + _gpio;
+  _function = ConfigManager->get(key)->getElement(FUNCTION).toInt();
+  _nr = ConfigManager->get(key)->getElement(NR).toInt();
 
-  if (gpioInput == OFF_GPIO)
+  if (_gpio == OFF_GPIO)
     ConfigESP->clearGpio(gpio, function);
 
-  if (gpioInput != OFF_GPIO) {
-    if (functionInput == FUNCTION_OFF && gpio != gpioInput) {
+  if (_gpio != OFF_GPIO) {
+    if (_function == FUNCTION_OFF && _nr == FUNCTION_OFF) {
       ConfigESP->clearGpio(gpio, function);
-      ConfigESP->clearGpio(gpioInput, function);
-      ConfigESP->setGpio(gpioInput, nr, function);
+      ConfigESP->clearGpio(_gpio, function);
+      ConfigESP->setGpio(_gpio, nr, function);
     }
-    else if (gpio == gpioInput && functionInput == function) {
-      ConfigESP->setGpio(gpioInput, nr, function);
+    else if (gpio == _gpio && _function == function && _nr == nr) {
+      ConfigESP->setGpio(_gpio, nr, function);
     }
     else if (function == FUNCTION_CFG_BUTTON) {
-      ConfigESP->setGpio(gpioInput, FUNCTION_CFG_BUTTON);
+      ConfigESP->setGpio(_gpio, FUNCTION_CFG_BUTTON);
     }
     else {
       return false;
@@ -407,7 +408,7 @@ bool SuplaWebServer::saveGPIO(const String& _input, uint8_t function, uint8_t nr
 }
 
 bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, uint8_t nr, const String& input_max) {
-  uint8_t key, address, addressInput, gpio, gpioInput, functionInput, nrInput;
+  uint8_t key, address, _address, gpio, _gpio, _function, _nr;
   String input = _input + nr;
 
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") == 0) {
@@ -416,28 +417,28 @@ bool SuplaWebServer::saveGpioMCP23017(const String& _input, uint8_t function, ui
 
   address = ConfigESP->getAdressMCP23017(nr, function);
   if (nr <= 16)
-    addressInput = WebServer->httpServer->arg(String(INPUT_ADRESS_MCP23017) + 1).toInt();
+    _address = WebServer->httpServer->arg(String(INPUT_ADRESS_MCP23017) + 1).toInt();
   if (nr >= 17)
-    addressInput = WebServer->httpServer->arg(String(INPUT_ADRESS_MCP23017) + 17).toInt();
+    _address = WebServer->httpServer->arg(String(INPUT_ADRESS_MCP23017) + 17).toInt();
 
   gpio = ConfigESP->getGpioMCP23017(nr, function);
-  gpioInput = WebServer->httpServer->arg(input).toInt();
+  _gpio = WebServer->httpServer->arg(input).toInt();
 
-  key = KEY_GPIO + gpioInput;
-  functionInput = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(addressInput)).toInt();
-  nrInput = ConfigManager->get(key)->getElement(ConfigESP->getNrMCP23017(addressInput)).toInt();
+  key = KEY_GPIO + _gpio;
+  _function = ConfigManager->get(key)->getElement(ConfigESP->getFunctionMCP23017(_address)).toInt();
+  _nr = ConfigManager->get(key)->getElement(ConfigESP->getNrMCP23017(_address)).toInt();
 
-  if (gpioInput == OFF_GPIO || addressInput == OFF_MCP23017)
+  if (_gpio == OFF_GPIO || _address == OFF_MCP23017)
     ConfigESP->clearGpioMCP23017(gpio, nr, function);
 
-  if (gpioInput != OFF_GPIO && addressInput != OFF_MCP23017) {
-    if (functionInput == FUNCTION_OFF && nrInput == FUNCTION_OFF) {
+  if (_gpio != OFF_GPIO && _address != OFF_MCP23017) {
+    if (_function == FUNCTION_OFF && _nr == FUNCTION_OFF) {
       ConfigESP->clearGpioMCP23017(gpio, nr, function);
-      ConfigESP->clearGpioMCP23017(gpioInput, nr, function);
-      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
+      ConfigESP->clearGpioMCP23017(_gpio, nr, function);
+      ConfigESP->setGpioMCP23017(_gpio, _address, nr, function);
     }
-    else if (gpio == gpioInput && function == functionInput && nr == nrInput) {
-      ConfigESP->setGpioMCP23017(gpioInput, addressInput, nr, function);
+    else if (gpio == _gpio && function == _function && nr == _nr) {
+      ConfigESP->setGpioMCP23017(_gpio, _address, nr, function);
     }
     else {
       return false;

From ae0014cc7b73e651404b9a5fe7ec0f2d43c7a35e Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 19 Feb 2021 20:36:39 +0100
Subject: [PATCH 095/165] 1.3.2

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 5624f63c..cc70f785 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.1"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.2"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC

From e29eaaf75a6c33015036135c983c5fbbedc12936 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 19 Feb 2021 21:40:28 +0100
Subject: [PATCH 096/165] =?UTF-8?q?poprawa=20defin=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaDeviceGUI.cpp      | 6 ++++--
 src/SuplaOled.cpp           | 5 +++++
 src/SuplaOled.h             | 2 ++
 src/SuplaWebPageControl.cpp | 7 +++----
 src/SuplaWebPageOther.cpp   | 2 ++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 3c0838ca..c873c036 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -309,8 +309,8 @@ void addHLW8012(int8_t pinCF, int8_t pinCF1, int8_t pinSEL) {
 }
 #endif
 
-#if defined(SUPLA_RELAY)
 void addConditionsTurnON(int function, Supla::ChannelElement *client) {
+#if defined(SUPLA_RELAY)
   if (Supla::GUI::relay.size() == 0)
     return;
 
@@ -338,9 +338,11 @@ void addConditionsTurnON(int function, Supla::ChannelElement *client) {
       }
     }
   }
+#endif
 }
 
 void addConditionsTurnOFF(int function, Supla::ChannelElement *client) {
+#if defined(SUPLA_RELAY)
   if (Supla::GUI::relay.size() == 0)
     return;
 
@@ -368,8 +370,8 @@ void addConditionsTurnOFF(int function, Supla::ChannelElement *client) {
       }
     }
   }
-}
 #endif
+}
 
 }  // namespace GUI
 }  // namespace Supla
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 35599844..d05fb556 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -70,6 +70,7 @@ void displayUiSignal(OLEDDisplay* display) {
   }
 }
 
+#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 void displayUiRelayState(OLEDDisplay* display) {
   int y = 0;
   int x = 0;
@@ -92,12 +93,16 @@ void displayUiRelayState(OLEDDisplay* display) {
   display->setColor(WHITE);
   display->drawHorizontalLine(0, 14, display->getWidth());
 }
+#endif
 
 void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state) {
   displayUiSignal(display);
+
+#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
   if (Supla::GUI::relay.size()) {
     displayUiRelayState(display);
   }
+#endif
 }
 
 void displayUiSuplaStatus(OLEDDisplay* display) {
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index da33d3e6..d65a9885 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -40,7 +40,9 @@ int32_t getQuality();
 void msOverlay(OLEDDisplay* display, OLEDDisplayUiState* state);
 
 void displayUiSignal(OLEDDisplay* display);
+#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 void displayUiRelayState(OLEDDisplay* display);
+#endif
 void displayUiSuplaStatus(OLEDDisplay* display);
 void displayUiConfigMode(OLEDDisplay* display);
 void displayUiBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y);
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index faf504aa..73e9d9c8 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -50,6 +50,7 @@ void SuplaWebPageControl::createWebPageControl() {
 #endif
 }
 
+#ifdef SUPLA_BUTTON
 void SuplaWebPageControl::handleControl() {
   if (!WebServer->isLoggedIn()) {
     return;
@@ -65,7 +66,7 @@ void SuplaWebPageControl::handleControlSave() {
   }
 
   uint8_t nr, last_value;
-#ifdef SUPLA_BUTTON
+
   last_value = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   for (nr = 1; nr <= last_value; nr++) {
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
@@ -85,7 +86,6 @@ void SuplaWebPageControl::handleControlSave() {
   if (strcmp(WebServer->httpServer->arg(INPUT_MAX_BUTTON).c_str(), "") != 0) {
     ConfigManager->set(KEY_MAX_BUTTON, WebServer->httpServer->arg(INPUT_MAX_BUTTON).c_str());
   }
-#endif
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:
@@ -112,7 +112,6 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
   webContentBuffer += SuplaJavaScript(PATH_CONTROL);
   addForm(webContentBuffer, F("post"), PATH_SAVE_CONTROL);
 
-#if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_BUTTONS));
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
@@ -133,7 +132,6 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
     }
   }
   addFormHeaderEnd(webContentBuffer);
-#endif
 
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
@@ -141,6 +139,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
 
   WebServer->sendHeaderEnd();
 }
+#endif
 
 #if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
 void SuplaWebPageControl::handleButtonSet() {
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 3453e9d3..4e47b1e6 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -334,9 +334,11 @@ void handleHLW8012CalibrateSave() {
   }
 
   if (calibPower && calibVoltage) {
+#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
     for (int i = 0; i < Supla::GUI::relay.size(); i++) {
       Supla::GUI::relay[i]->turnOn();
     }
+#endif
     Supla::GUI::counterHLW8012->calibrate(calibPower, calibVoltage);
     suplaWebpageHLW8012Calibrate(1);
   }

From 33257b3541a99a8780889e192f0fd5b95fb08d98 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Fri, 19 Feb 2021 21:43:56 +0100
Subject: [PATCH 097/165] Update SuplaDeviceGUI.cpp

..\SuplaDeviceGUI.cpp: In function 'void Supla::GUI::begin()':
..\SuplaDeviceGUI.cpp:45:28: error: 'BUILD_VERSION' was not declared in this scope
---
 src/SuplaDeviceGUI.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 3c0838ca..dbe9a6c8 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -42,7 +42,9 @@ void begin() {
 
   SuplaDevice.setName(ConfigManager->get(KEY_HOST_NAME)->getValue());
 
+#ifdef BUILD_VERSION
   SuplaDevice.setSwVersion(BUILD_VERSION);
+#endif
 
   SuplaDevice.begin((char *)ConfigManager->get(KEY_SUPLA_GUID)->getValue(),      // Global Unique Identifier
                     ConfigManager->get(KEY_SUPLA_SERVER)->getValue(),            // SUPLA server address

From 8ffa49f07726187b0cd2b5dcb00b396775b1261c Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Fri, 19 Feb 2021 21:43:56 +0100
Subject: [PATCH 098/165] Update SuplaDeviceGUI.cpp

..\SuplaDeviceGUI.cpp: In function 'void Supla::GUI::begin()':
..\SuplaDeviceGUI.cpp:45:28: error: 'BUILD_VERSION' was not declared in this scope
---
 src/SuplaDeviceGUI.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index c873c036..40700f71 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -42,7 +42,9 @@ void begin() {
 
   SuplaDevice.setName(ConfigManager->get(KEY_HOST_NAME)->getValue());
 
+#ifdef BUILD_VERSION
   SuplaDevice.setSwVersion(BUILD_VERSION);
+#endif
 
   SuplaDevice.begin((char *)ConfigManager->get(KEY_SUPLA_GUID)->getValue(),      // Global Unique Identifier
                     ConfigManager->get(KEY_SUPLA_SERVER)->getValue(),            // SUPLA server address

From caae61e2b1f3b99894d38cf24e1e245fd32d2064 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Fri, 19 Feb 2021 22:03:51 +0100
Subject: [PATCH 099/165] Update SuplaWebServer.cpp

Poprawka warunkowania SUPLA_OTA
---
 src/SuplaWebServer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 694d2692..1eba6672 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -30,7 +30,9 @@ String webContentBuffer;
 
 SuplaWebServer::SuplaWebServer() {
   httpServer = new ESP8266WebServer(80);
+#ifdef SUPLA_OTA
   httpUpdater = new ESP8266HTTPUpdateServer();
+#endif
 }
 
 void SuplaWebServer::begin() {
@@ -458,4 +460,4 @@ void tcpCleanup() {
     tcp_abort(tcp_tw_pcbs);
   }
 }
-#endif
\ No newline at end of file
+#endif

From 5afbfb459994e25823976ee7ead94b32508680ec Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Fri, 19 Feb 2021 23:57:08 +0100
Subject: [PATCH 100/165] =?UTF-8?q?Dodanie=20font=C3=B3w=20z=20polskimi=20?=
 =?UTF-8?q?znakami=20(WIN1250)=20oraz=20konwerter=20UTF-8=20do=20WIN1250?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ArialMT_Win1250_Plain_10.h | 432 +++++++++++++++++++++++++++++++++
 src/ArialMT_Win1250_Plain_16.h | 432 +++++++++++++++++++++++++++++++++
 src/ArialMT_Win1250_Plain_24.h | 432 +++++++++++++++++++++++++++++++++
 src/CharsetConverter.cpp       |  76 ++++++
 src/CharsetConverter.h         | 140 +++++++++++
 src/GUI-Generic_Config.h       |   4 +-
 src/SuplaOled.cpp              |  35 +--
 7 files changed, 1534 insertions(+), 17 deletions(-)
 create mode 100644 src/ArialMT_Win1250_Plain_10.h
 create mode 100644 src/ArialMT_Win1250_Plain_16.h
 create mode 100644 src/ArialMT_Win1250_Plain_24.h
 create mode 100644 src/CharsetConverter.cpp
 create mode 100644 src/CharsetConverter.h

diff --git a/src/ArialMT_Win1250_Plain_10.h b/src/ArialMT_Win1250_Plain_10.h
new file mode 100644
index 00000000..9a026ef2
--- /dev/null
+++ b/src/ArialMT_Win1250_Plain_10.h
@@ -0,0 +1,432 @@
+// Created by php script OLEDFontsToool by Goral64
+#ifndef ARIALMT_WIN1250_PLAIN_10_H
+#define ARIALMT_WIN1250_PLAIN_10_H
+
+const uint8_t ArialMT_Win1250_Plain_10[] PROGMEM = {
+  0x0A, // Width: 10
+  0x0D, // Height: 13
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table
+  0xFF, 0xFF, 0x00, 0x03, // 32:65535
+  0x00, 0x00, 0x04, 0x03, // 33:0
+  0x00, 0x04, 0x05, 0x04, // 34:4
+  0x00, 0x09, 0x09, 0x06, // 35:9
+  0x00, 0x12, 0x0A, 0x06, // 36:18
+  0x00, 0x1C, 0x10, 0x09, // 37:28
+  0x00, 0x2C, 0x0E, 0x07, // 38:44
+  0x00, 0x3A, 0x01, 0x02, // 39:58
+  0x00, 0x3B, 0x06, 0x03, // 40:59
+  0x00, 0x41, 0x06, 0x03, // 41:65
+  0x00, 0x47, 0x05, 0x04, // 42:71
+  0x00, 0x4C, 0x09, 0x06, // 43:76
+  0x00, 0x55, 0x04, 0x03, // 44:85
+  0x00, 0x59, 0x03, 0x03, // 45:89
+  0x00, 0x5C, 0x04, 0x03, // 46:92
+  0x00, 0x60, 0x05, 0x03, // 47:96
+  0x00, 0x65, 0x0A, 0x06, // 48:101
+  0x00, 0x6F, 0x08, 0x06, // 49:111
+  0x00, 0x77, 0x0A, 0x06, // 50:119
+  0x00, 0x81, 0x0A, 0x06, // 51:129
+  0x00, 0x8B, 0x0B, 0x06, // 52:139
+  0x00, 0x96, 0x0A, 0x06, // 53:150
+  0x00, 0xA0, 0x0A, 0x06, // 54:160
+  0x00, 0xAA, 0x09, 0x06, // 55:170
+  0x00, 0xB3, 0x0A, 0x06, // 56:179
+  0x00, 0xBD, 0x0A, 0x06, // 57:189
+  0x00, 0xC7, 0x04, 0x03, // 58:199
+  0x00, 0xCB, 0x04, 0x03, // 59:203
+  0x00, 0xCF, 0x0A, 0x06, // 60:207
+  0x00, 0xD9, 0x09, 0x06, // 61:217
+  0x00, 0xE2, 0x09, 0x06, // 62:226
+  0x00, 0xEB, 0x0B, 0x06, // 63:235
+  0x00, 0xF6, 0x14, 0x0A, // 64:246
+  0x01, 0x0A, 0x0E, 0x07, // 65:266
+  0x01, 0x18, 0x0C, 0x07, // 66:280
+  0x01, 0x24, 0x0C, 0x07, // 67:292
+  0x01, 0x30, 0x0B, 0x07, // 68:304
+  0x01, 0x3B, 0x0C, 0x07, // 69:315
+  0x01, 0x47, 0x09, 0x06, // 70:327
+  0x01, 0x50, 0x0D, 0x08, // 71:336
+  0x01, 0x5D, 0x0C, 0x07, // 72:349
+  0x01, 0x69, 0x04, 0x03, // 73:361
+  0x01, 0x6D, 0x08, 0x05, // 74:365
+  0x01, 0x75, 0x0E, 0x07, // 75:373
+  0x01, 0x83, 0x0C, 0x06, // 76:387
+  0x01, 0x8F, 0x10, 0x08, // 77:399
+  0x01, 0x9F, 0x0C, 0x07, // 78:415
+  0x01, 0xAB, 0x0E, 0x08, // 79:427
+  0x01, 0xB9, 0x0B, 0x07, // 80:441
+  0x01, 0xC4, 0x0E, 0x08, // 81:452
+  0x01, 0xD2, 0x0C, 0x07, // 82:466
+  0x01, 0xDE, 0x0C, 0x07, // 83:478
+  0x01, 0xEA, 0x0B, 0x06, // 84:490
+  0x01, 0xF5, 0x0C, 0x07, // 85:501
+  0x02, 0x01, 0x0D, 0x07, // 86:513
+  0x02, 0x0E, 0x11, 0x09, // 87:526
+  0x02, 0x1F, 0x0E, 0x07, // 88:543
+  0x02, 0x2D, 0x0D, 0x07, // 89:557
+  0x02, 0x3A, 0x0C, 0x06, // 90:570
+  0x02, 0x46, 0x06, 0x03, // 91:582
+  0x02, 0x4C, 0x06, 0x03, // 92:588
+  0x02, 0x52, 0x04, 0x03, // 93:594
+  0x02, 0x56, 0x09, 0x05, // 94:598
+  0x02, 0x5F, 0x0C, 0x06, // 95:607
+  0x02, 0x6B, 0x03, 0x03, // 96:619
+  0x02, 0x6E, 0x0A, 0x06, // 97:622
+  0x02, 0x78, 0x0A, 0x06, // 98:632
+  0x02, 0x82, 0x0A, 0x05, // 99:642
+  0x02, 0x8C, 0x0A, 0x06, // 100:652
+  0x02, 0x96, 0x0A, 0x06, // 101:662
+  0x02, 0xA0, 0x05, 0x03, // 102:672
+  0x02, 0xA5, 0x0A, 0x06, // 103:677
+  0x02, 0xAF, 0x0A, 0x06, // 104:687
+  0x02, 0xB9, 0x04, 0x02, // 105:697
+  0x02, 0xBD, 0x04, 0x02, // 106:701
+  0x02, 0xC1, 0x08, 0x05, // 107:705
+  0x02, 0xC9, 0x04, 0x02, // 108:713
+  0x02, 0xCD, 0x10, 0x08, // 109:717
+  0x02, 0xDD, 0x0A, 0x06, // 110:733
+  0x02, 0xE7, 0x0A, 0x06, // 111:743
+  0x02, 0xF1, 0x0A, 0x06, // 112:753
+  0x02, 0xFB, 0x0A, 0x06, // 113:763
+  0x03, 0x05, 0x05, 0x03, // 114:773
+  0x03, 0x0A, 0x08, 0x05, // 115:778
+  0x03, 0x12, 0x06, 0x03, // 116:786
+  0x03, 0x18, 0x0A, 0x06, // 117:792
+  0x03, 0x22, 0x09, 0x05, // 118:802
+  0x03, 0x2B, 0x0E, 0x07, // 119:811
+  0x03, 0x39, 0x0A, 0x05, // 120:825
+  0x03, 0x43, 0x09, 0x05, // 121:835
+  0x03, 0x4C, 0x0A, 0x05, // 122:844
+  0x03, 0x56, 0x06, 0x03, // 123:854
+  0x03, 0x5C, 0x04, 0x03, // 124:860
+  0x03, 0x60, 0x05, 0x03, // 125:864
+  0x03, 0x65, 0x09, 0x06, // 126:869
+  0xFF, 0xFF, 0x00, 0x00, // 127:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 128:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 129:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 130:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 131:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 132:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 133:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 134:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 135:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 136:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 137:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 138:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 139:65535
+  0x03, 0x6E, 0x0C, 0x07, // 140:878
+  0xFF, 0xFF, 0x00, 0x0A, // 141:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 142:65535
+  0x03, 0x7A, 0x0C, 0x06, // 143:890
+  0xFF, 0xFF, 0x00, 0x0A, // 144:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 145:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 146:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 147:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 148:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 149:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 150:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 151:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 152:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 153:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 154:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 155:65535
+  0x03, 0x86, 0x08, 0x05, // 156:902
+  0xFF, 0xFF, 0x00, 0x0A, // 157:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 158:65535
+  0x03, 0x8E, 0x0A, 0x05, // 159:910
+  0xFF, 0xFF, 0x00, 0x03, // 160:65535
+  0x03, 0x98, 0x04, 0x03, // 161:920
+  0x03, 0x9C, 0x0A, 0x06, // 162:924
+  0x03, 0xA6, 0x0C, 0x06, // 163:934
+  0x03, 0xB2, 0x0A, 0x06, // 164:946
+  0x03, 0xBC, 0x0E, 0x07, // 165:956
+  0x03, 0xCA, 0x04, 0x03, // 166:970
+  0x03, 0xCE, 0x0A, 0x06, // 167:974
+  0x03, 0xD8, 0x05, 0x03, // 168:984
+  0x03, 0xDD, 0x0D, 0x07, // 169:989
+  0x03, 0xEA, 0x07, 0x04, // 170:1002
+  0x03, 0xF1, 0x0A, 0x06, // 171:1009
+  0x03, 0xFB, 0x09, 0x06, // 172:1019
+  0x04, 0x04, 0x03, 0x03, // 173:1028
+  0x04, 0x07, 0x0D, 0x07, // 174:1031
+  0x04, 0x14, 0x0C, 0x06, // 175:1044
+  0x04, 0x20, 0x07, 0x04, // 176:1056
+  0x04, 0x27, 0x0A, 0x05, // 177:1063
+  0x04, 0x31, 0x05, 0x03, // 178:1073
+  0x04, 0x36, 0x05, 0x03, // 179:1078
+  0x04, 0x3B, 0x05, 0x03, // 180:1083
+  0x04, 0x40, 0x0A, 0x06, // 181:1088
+  0x04, 0x4A, 0x09, 0x05, // 182:1098
+  0x04, 0x53, 0x03, 0x03, // 183:1107
+  0x04, 0x56, 0x06, 0x03, // 184:1110
+  0x04, 0x5C, 0x0A, 0x06, // 185:1116
+  0x04, 0x66, 0x07, 0x04, // 186:1126
+  0x04, 0x6D, 0x0A, 0x06, // 187:1133
+  0x04, 0x77, 0x10, 0x08, // 188:1143
+  0x04, 0x87, 0x10, 0x08, // 189:1159
+  0x04, 0x97, 0x10, 0x08, // 190:1175
+  0x04, 0xA7, 0x0A, 0x05, // 191:1191
+  0x04, 0xB1, 0x0E, 0x07, // 192:1201
+  0x04, 0xBF, 0x0E, 0x07, // 193:1215
+  0x04, 0xCD, 0x0E, 0x07, // 194:1229
+  0x04, 0xDB, 0x0E, 0x07, // 195:1243
+  0x04, 0xE9, 0x0E, 0x07, // 196:1257
+  0x04, 0xF7, 0x0E, 0x07, // 197:1271
+  0x05, 0x05, 0x0C, 0x07, // 198:1285
+  0x05, 0x11, 0x0C, 0x07, // 199:1297
+  0x05, 0x1D, 0x0C, 0x07, // 200:1309
+  0x05, 0x29, 0x0C, 0x07, // 201:1321
+  0x05, 0x35, 0x0C, 0x07, // 202:1333
+  0x05, 0x41, 0x0C, 0x07, // 203:1345
+  0x05, 0x4D, 0x05, 0x03, // 204:1357
+  0x05, 0x52, 0x04, 0x03, // 205:1362
+  0x05, 0x56, 0x04, 0x03, // 206:1366
+  0x05, 0x5A, 0x05, 0x03, // 207:1370
+  0x05, 0x5F, 0x0B, 0x07, // 208:1375
+  0x05, 0x6A, 0x0C, 0x07, // 209:1386
+  0x05, 0x76, 0x0E, 0x08, // 210:1398
+  0x05, 0x84, 0x0E, 0x08, // 211:1412
+  0x05, 0x92, 0x0E, 0x08, // 212:1426
+  0x05, 0xA0, 0x0E, 0x08, // 213:1440
+  0x05, 0xAE, 0x0E, 0x08, // 214:1454
+  0x05, 0xBC, 0x0A, 0x06, // 215:1468
+  0x05, 0xC6, 0x0D, 0x08, // 216:1478
+  0x05, 0xD3, 0x0C, 0x07, // 217:1491
+  0x05, 0xDF, 0x0C, 0x07, // 218:1503
+  0x05, 0xEB, 0x0C, 0x07, // 219:1515
+  0x05, 0xF7, 0x0C, 0x07, // 220:1527
+  0x06, 0x03, 0x0D, 0x07, // 221:1539
+  0x06, 0x10, 0x0B, 0x07, // 222:1552
+  0x06, 0x1B, 0x0C, 0x06, // 223:1563
+  0x06, 0x27, 0x0A, 0x06, // 224:1575
+  0x06, 0x31, 0x0A, 0x06, // 225:1585
+  0x06, 0x3B, 0x0A, 0x06, // 226:1595
+  0x06, 0x45, 0x0A, 0x06, // 227:1605
+  0x06, 0x4F, 0x0A, 0x06, // 228:1615
+  0x06, 0x59, 0x0A, 0x06, // 229:1625
+  0x06, 0x63, 0x0A, 0x05, // 230:1635
+  0x06, 0x6D, 0x0A, 0x05, // 231:1645
+  0x06, 0x77, 0x0A, 0x06, // 232:1655
+  0x06, 0x81, 0x0A, 0x06, // 233:1665
+  0x06, 0x8B, 0x0A, 0x06, // 234:1675
+  0x06, 0x95, 0x0A, 0x06, // 235:1685
+  0x06, 0x9F, 0x05, 0x03, // 236:1695
+  0x06, 0xA4, 0x04, 0x03, // 237:1700
+  0x06, 0xA8, 0x05, 0x03, // 238:1704
+  0x06, 0xAD, 0x05, 0x03, // 239:1709
+  0x06, 0xB2, 0x0A, 0x06, // 240:1714
+  0x06, 0xBC, 0x0A, 0x06, // 241:1724
+  0x06, 0xC6, 0x0A, 0x06, // 242:1734
+  0x06, 0xD0, 0x0A, 0x06, // 243:1744
+  0x06, 0xDA, 0x0A, 0x06, // 244:1754
+  0x06, 0xE4, 0x0A, 0x06, // 245:1764
+  0x06, 0xEE, 0x0A, 0x06, // 246:1774
+  0x06, 0xF8, 0x09, 0x05, // 247:1784
+  0x07, 0x01, 0x0A, 0x06, // 248:1793
+  0x07, 0x0B, 0x0A, 0x06, // 249:1803
+  0x07, 0x15, 0x0A, 0x06, // 250:1813
+  0x07, 0x1F, 0x0A, 0x06, // 251:1823
+  0x07, 0x29, 0x0A, 0x06, // 252:1833
+  0x07, 0x33, 0x09, 0x05, // 253:1843
+  0x07, 0x3C, 0x0A, 0x06, // 254:1852
+  0x07, 0x46, 0x09, 0x05, // 255:1862
+
+  // Font Data
+  0x00,0x00,0xF8,0x02, // 33
+  0x38,0x00,0x00,0x00,0x38, // 34
+  0xA0,0x03,0xE0,0x00,0xB8,0x03,0xE0,0x00,0xB8, // 35
+  0x30,0x01,0x28,0x02,0xF8,0x07,0x48,0x02,0x90,0x01, // 36
+  0x00,0x00,0x30,0x00,0x48,0x00,0x30,0x03,0xC0,0x00,0xB0,0x01,0x48,0x02,0x80,0x01, // 37
+  0x80,0x01,0x50,0x02,0x68,0x02,0xA8,0x02,0x18,0x01,0x80,0x03,0x80,0x02, // 38
+  0x38, // 39
+  0xE0,0x03,0x10,0x04,0x08,0x08, // 40
+  0x08,0x08,0x10,0x04,0xE0,0x03, // 41
+  0x28,0x00,0x18,0x00,0x28, // 42
+  0x40,0x00,0x40,0x00,0xF0,0x01,0x40,0x00,0x40, // 43
+  0x00,0x00,0x00,0x06, // 44
+  0x80,0x00,0x80, // 45
+  0x00,0x00,0x00,0x02, // 46
+  0x00,0x03,0xE0,0x00,0x18, // 47
+  0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01, // 48
+  0x00,0x00,0x20,0x00,0x10,0x00,0xF8,0x03, // 49
+  0x10,0x02,0x08,0x03,0x88,0x02,0x48,0x02,0x30,0x02, // 50
+  0x10,0x01,0x08,0x02,0x48,0x02,0x48,0x02,0xB0,0x01, // 51
+  0xC0,0x00,0xA0,0x00,0x90,0x00,0x88,0x00,0xF8,0x03,0x80, // 52
+  0x60,0x01,0x38,0x02,0x28,0x02,0x28,0x02,0xC8,0x01, // 53
+  0xF0,0x01,0x28,0x02,0x28,0x02,0x28,0x02,0xD0,0x01, // 54
+  0x08,0x00,0x08,0x03,0xC8,0x00,0x38,0x00,0x08, // 55
+  0xB0,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0xB0,0x01, // 56
+  0x70,0x01,0x88,0x02,0x88,0x02,0x88,0x02,0xF0,0x01, // 57
+  0x00,0x00,0x20,0x02, // 58
+  0x00,0x00,0x20,0x06, // 59
+  0x00,0x00,0x40,0x00,0xA0,0x00,0xA0,0x00,0x10,0x01, // 60
+  0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0, // 61
+  0x00,0x00,0x10,0x01,0xA0,0x00,0xA0,0x00,0x40, // 62
+  0x10,0x00,0x08,0x00,0x08,0x00,0xC8,0x02,0x48,0x00,0x30, // 63
+  0x00,0x00,0xC0,0x03,0x30,0x04,0xD0,0x09,0x28,0x0A,0x28,0x0A,0xC8,0x0B,0x68,0x0A,0x10,0x05,0xE0,0x04, // 64
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x00,0xC0,0x01,0x00,0x02, // 65
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0xF0,0x01, // 66
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x10,0x01, // 67
+  0x00,0x00,0xF8,0x03,0x08,0x02,0x08,0x02,0x10,0x01,0xE0, // 68
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0x48,0x02, // 69
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x08, // 70
+  0x00,0x00,0xE0,0x00,0x10,0x01,0x08,0x02,0x48,0x02,0x50,0x01,0xC0, // 71
+  0x00,0x00,0xF8,0x03,0x40,0x00,0x40,0x00,0x40,0x00,0xF8,0x03, // 72
+  0x00,0x00,0xF8,0x03, // 73
+  0x00,0x03,0x00,0x02,0x00,0x02,0xF8,0x01, // 74
+  0x00,0x00,0xF8,0x03,0x80,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02, // 75
+  0x00,0x00,0xF8,0x03,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, // 76
+  0x00,0x00,0xF8,0x03,0x30,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x30,0x00,0xF8,0x03, // 77
+  0x00,0x00,0xF8,0x03,0x30,0x00,0x40,0x00,0x80,0x01,0xF8,0x03, // 78
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01, // 79
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x48,0x00,0x30, // 80
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x03,0x08,0x03,0xF0,0x02, // 81
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0xC8,0x00,0x30,0x03, // 82
+  0x00,0x00,0x30,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0x90,0x01, // 83
+  0x00,0x00,0x08,0x00,0x08,0x00,0xF8,0x03,0x08,0x00,0x08, // 84
+  0x00,0x00,0xF8,0x01,0x00,0x02,0x00,0x02,0x00,0x02,0xF8,0x01, // 85
+  0x08,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x80,0x01,0x70,0x00,0x08, // 86
+  0x18,0x00,0xE0,0x01,0x00,0x02,0xF0,0x01,0x08,0x00,0xF0,0x01,0x00,0x02,0xE0,0x01,0x18, // 87
+  0x00,0x02,0x08,0x01,0x90,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02, // 88
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC0,0x03,0x20,0x00,0x10,0x00,0x08, // 89
+  0x08,0x03,0x88,0x03,0xC8,0x02,0x68,0x02,0x38,0x02,0x18,0x02, // 90
+  0x00,0x00,0xF8,0x0F,0x08,0x08, // 91
+  0x18,0x00,0xE0,0x00,0x00,0x03, // 92
+  0x08,0x08,0xF8,0x0F, // 93
+  0x40,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x40, // 94
+  0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08, // 95
+  0x08,0x00,0x10, // 96
+  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x02,0xE0,0x03, // 97
+  0x00,0x00,0xF8,0x03,0x20,0x02,0x20,0x02,0xC0,0x01, // 98
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0x40,0x01, // 99
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xF8,0x03, // 100
+  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02, // 101
+  0x20,0x00,0xF0,0x03,0x28, // 102
+  0x00,0x00,0xC0,0x05,0x20,0x0A,0x20,0x0A,0xE0,0x07, // 103
+  0x00,0x00,0xF8,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 104
+  0x00,0x00,0xE8,0x03, // 105
+  0x00,0x08,0xE8,0x07, // 106
+  0xF8,0x03,0x80,0x00,0xC0,0x01,0x20,0x02, // 107
+  0x00,0x00,0xF8,0x03, // 108
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 109
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 110
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xC0,0x01, // 111
+  0x00,0x00,0xE0,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01, // 112
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xE0,0x0F, // 113
+  0x00,0x00,0xE0,0x03,0x20, // 114
+  0x40,0x02,0xA0,0x02,0xA0,0x02,0x20,0x01, // 115
+  0x20,0x00,0xF8,0x03,0x20,0x02, // 116
+  0x00,0x00,0xE0,0x01,0x00,0x02,0x00,0x02,0xE0,0x03, // 117
+  0x20,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x20, // 118
+  0xE0,0x01,0x00,0x02,0xC0,0x01,0x20,0x00,0xC0,0x01,0x00,0x02,0xE0,0x01, // 119
+  0x20,0x02,0x40,0x01,0x80,0x00,0x40,0x01,0x20,0x02, // 120
+  0x20,0x00,0xC0,0x09,0x00,0x06,0xC0,0x01,0x20, // 121
+  0x20,0x02,0x20,0x03,0xA0,0x02,0x60,0x02,0x20,0x02, // 122
+  0x80,0x00,0x78,0x0F,0x08,0x08, // 123
+  0x00,0x00,0xF8,0x0F, // 124
+  0x08,0x08,0x78,0x0F,0x80, // 125
+  0xC0,0x00,0x40,0x00,0xC0,0x00,0x80,0x00,0xC0, // 126
+  0x00,0x00,0x30,0x01,0x48,0x02,0x4A,0x02,0x49,0x02,0x90,0x01, // 140
+  0x08,0x03,0x88,0x03,0xC8,0x02,0x6A,0x02,0x39,0x02,0x18,0x02, // 143
+  0x40,0x02,0xA8,0x02,0xA4,0x02,0x20,0x01, // 156
+  0x20,0x02,0x20,0x03,0xA8,0x02,0x64,0x02,0x20,0x02, // 159
+  0x00,0x00,0xA0,0x0F, // 161
+  0x00,0x00,0xC0,0x01,0xA0,0x0F,0x78,0x02,0x40,0x01, // 162
+  0x00,0x00,0xF8,0x03,0x40,0x02,0x20,0x02,0x10,0x02,0x00,0x02, // 163
+  0x00,0x00,0xE0,0x01,0x20,0x01,0x20,0x01,0xE0,0x01, // 164
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x14,0xC0,0x19,0x00,0x02, // 165
+  0x00,0x00,0x38,0x0F, // 166
+  0xD0,0x04,0x28,0x09,0x48,0x09,0x48,0x0A,0x90,0x05, // 167
+  0x08,0x00,0x00,0x00,0x08, // 168
+  0xE0,0x00,0x10,0x01,0x48,0x02,0xA8,0x02,0xA8,0x02,0x10,0x01,0xE0, // 169
+  0x68,0x00,0x68,0x00,0x68,0x00,0x78, // 170
+  0x00,0x00,0x80,0x01,0x40,0x02,0x80,0x01,0x40,0x02, // 171
+  0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0xE0, // 172
+  0x80,0x00,0x80, // 173
+  0xE0,0x00,0x10,0x01,0xE8,0x02,0x68,0x02,0xC8,0x02,0x10,0x01,0xE0, // 174
+  0x08,0x03,0x88,0x03,0xCA,0x02,0x6A,0x02,0x38,0x02,0x18,0x02, // 175
+  0x00,0x00,0x38,0x00,0x28,0x00,0x38, // 176
+  0x40,0x02,0x40,0x02,0xF0,0x03,0x40,0x02,0x40,0x02, // 177
+  0x48,0x00,0x68,0x00,0x58, // 178
+  0xC0,0x00,0xF8,0x03,0x30, // 179
+  0x00,0x00,0x10,0x00,0x08, // 180
+  0x00,0x00,0xE0,0x0F,0x00,0x02,0x00,0x02,0xE0,0x03, // 181
+  0x70,0x00,0xF8,0x0F,0x08,0x00,0xF8,0x0F,0x08, // 182
+  0x00,0x00,0x40, // 183
+  0x00,0x00,0x00,0x14,0x00,0x18, // 184
+  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x16,0xE0,0x1B, // 185
+  0x30,0x00,0x48,0x00,0x48,0x00,0x30, // 186
+  0x00,0x00,0x40,0x02,0x80,0x01,0x40,0x02,0x80,0x01, // 187
+  0x00,0x00,0x10,0x02,0x78,0x01,0xC0,0x00,0x20,0x01,0x90,0x01,0xC8,0x03,0x00,0x01, // 188
+  0x00,0x00,0x10,0x02,0x78,0x01,0x80,0x00,0x60,0x00,0x50,0x02,0x48,0x03,0xC0,0x02, // 189
+  0x48,0x00,0x58,0x00,0x68,0x03,0x80,0x00,0x60,0x01,0x90,0x01,0xC8,0x03,0x00,0x01, // 190
+  0x20,0x02,0x20,0x03,0xA8,0x02,0x68,0x02,0x20,0x02, // 191
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 192
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02, // 193
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 194
+  0x00,0x02,0xC2,0x01,0xB1,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02, // 195
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x88,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 196
+  0x00,0x02,0xC0,0x01,0xBE,0x00,0x8A,0x00,0xBE,0x00,0xC0,0x01,0x00,0x02, // 197
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x10,0x01, // 198
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x16,0x08,0x1A,0x10,0x01, // 199
+  0x00,0x00,0xF8,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02, // 200
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x4A,0x02,0x49,0x02,0x48,0x02, // 201
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x16,0x48,0x1A,0x48,0x02, // 202
+  0x00,0x00,0xF8,0x03,0x4A,0x02,0x48,0x02,0x4A,0x02,0x48,0x02, // 203
+  0x00,0x00,0xF9,0x03,0x02, // 204
+  0x02,0x00,0xF9,0x03, // 205
+  0x01,0x00,0xFA,0x03, // 206
+  0x02,0x00,0xF8,0x03,0x02, // 207
+  0x40,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x10,0x01,0xE0, // 208
+  0x00,0x00,0xF8,0x03,0x30,0x00,0x42,0x00,0x81,0x01,0xF8,0x03, // 209
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x09,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01, // 210
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x08,0x02,0xF0,0x01, // 211
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x0A,0x02,0xF0,0x01, // 212
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x09,0x02,0x0A,0x02,0x09,0x02,0xF0,0x01, // 213
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x08,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01, // 214
+  0x10,0x01,0xA0,0x00,0xE0,0x00,0xA0,0x00,0x10,0x01, // 215
+  0x00,0x00,0xF0,0x02,0x08,0x03,0xC8,0x02,0x28,0x02,0x18,0x03,0xE8, // 216
+  0x00,0x00,0xF8,0x01,0x01,0x02,0x02,0x02,0x00,0x02,0xF8,0x01, // 217
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x00,0x02,0xF8,0x01, // 218
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x02,0x02,0xF8,0x01, // 219
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x00,0x02,0x02,0x02,0xF8,0x01, // 220
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC2,0x03,0x21,0x00,0x10,0x00,0x08, // 221
+  0x00,0x00,0xF8,0x03,0x10,0x01,0x10,0x01,0x10,0x01,0xE0, // 222
+  0x00,0x00,0xF0,0x03,0x08,0x01,0x48,0x02,0xB0,0x02,0x80,0x01, // 223
+  0x00,0x00,0x00,0x03,0xA4,0x02,0xA8,0x02,0xE0,0x03, // 224
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE0,0x03, // 225
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE8,0x03, // 226
+  0x00,0x00,0x08,0x03,0xA4,0x02,0xA8,0x02,0xE4,0x03, // 227
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA0,0x02,0xE8,0x03, // 228
+  0x00,0x00,0x00,0x03,0xAE,0x02,0xAA,0x02,0xEE,0x03, // 229
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0x40,0x01, // 230
+  0x00,0x00,0xC0,0x01,0x20,0x16,0x20,0x1A,0x40,0x01, // 231
+  0x00,0x00,0xC0,0x01,0xA4,0x02,0xA8,0x02,0xC0,0x02, // 232
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC0,0x02, // 233
+  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x16,0xC0,0x1A, // 234
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA0,0x02,0xC8,0x02, // 235
+  0x00,0x00,0xE4,0x03,0x08, // 236
+  0x08,0x00,0xE4,0x03, // 237
+  0x08,0x00,0xE4,0x03,0x08, // 238
+  0x08,0x00,0xE0,0x03,0x08, // 239
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x38,0x02,0xE0,0x01, // 240
+  0x00,0x00,0xE0,0x03,0x28,0x00,0x24,0x00,0xC0,0x03, // 241
+  0x00,0x00,0xC0,0x01,0x24,0x02,0x28,0x02,0xC0,0x01, // 242
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC0,0x01, // 243
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC8,0x01, // 244
+  0x00,0x00,0xC8,0x01,0x24,0x02,0x28,0x02,0xC4,0x01, // 245
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x20,0x02,0xC8,0x01, // 246
+  0x40,0x00,0x40,0x00,0x50,0x01,0x40,0x00,0x40, // 247
+  0x00,0x00,0xC0,0x02,0xA0,0x03,0x60,0x02,0xA0,0x01, // 248
+  0x00,0x00,0xE0,0x01,0x04,0x02,0x08,0x02,0xE0,0x03, // 249
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x04,0x02,0xE0,0x03, // 250
+  0x00,0x00,0xE8,0x01,0x04,0x02,0x08,0x02,0xE0,0x03, // 251
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x00,0x02,0xE8,0x03, // 252
+  0x20,0x00,0xC0,0x09,0x08,0x06,0xC4,0x01,0x20, // 253
+  0x00,0x00,0xF8,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01, // 254
+  0x20,0x00,0xC8,0x09,0x00,0x06,0xC8,0x01,0x20 // 255
+};
+#endif // ARIALMT_WIN1250_PLAIN_10_H
diff --git a/src/ArialMT_Win1250_Plain_16.h b/src/ArialMT_Win1250_Plain_16.h
new file mode 100644
index 00000000..573bd13f
--- /dev/null
+++ b/src/ArialMT_Win1250_Plain_16.h
@@ -0,0 +1,432 @@
+// Created by php script OLEDFontsToool by Goral64
+#ifndef ARIALMT_WIN1250_PLAIN_16_H
+#define ARIALMT_WIN1250_PLAIN_16_H
+
+const uint8_t ArialMT_Win1250_Plain_16[] PROGMEM = {
+  0x10, // Width: 16
+  0x13, // Height: 19
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table
+  0xFF, 0xFF, 0x00, 0x04, // 32:65535
+  0x00, 0x00, 0x08, 0x04, // 33:0
+  0x00, 0x08, 0x0D, 0x06, // 34:8
+  0x00, 0x15, 0x1A, 0x09, // 35:21
+  0x00, 0x2F, 0x17, 0x09, // 36:47
+  0x00, 0x46, 0x26, 0x0E, // 37:70
+  0x00, 0x6C, 0x1D, 0x0B, // 38:108
+  0x00, 0x89, 0x04, 0x03, // 39:137
+  0x00, 0x8D, 0x0C, 0x05, // 40:141
+  0x00, 0x99, 0x0B, 0x05, // 41:153
+  0x00, 0xA4, 0x0D, 0x06, // 42:164
+  0x00, 0xB1, 0x17, 0x09, // 43:177
+  0x00, 0xC8, 0x09, 0x04, // 44:200
+  0x00, 0xD1, 0x0B, 0x05, // 45:209
+  0x00, 0xDC, 0x08, 0x04, // 46:220
+  0x00, 0xE4, 0x0A, 0x04, // 47:228
+  0x00, 0xEE, 0x17, 0x09, // 48:238
+  0x01, 0x05, 0x11, 0x09, // 49:261
+  0x01, 0x16, 0x17, 0x09, // 50:278
+  0x01, 0x2D, 0x17, 0x09, // 51:301
+  0x01, 0x44, 0x17, 0x09, // 52:324
+  0x01, 0x5B, 0x17, 0x09, // 53:347
+  0x01, 0x72, 0x17, 0x09, // 54:370
+  0x01, 0x89, 0x16, 0x09, // 55:393
+  0x01, 0x9F, 0x17, 0x09, // 56:415
+  0x01, 0xB6, 0x17, 0x09, // 57:438
+  0x01, 0xCD, 0x05, 0x04, // 58:461
+  0x01, 0xD2, 0x06, 0x04, // 59:466
+  0x01, 0xD8, 0x17, 0x09, // 60:472
+  0x01, 0xEF, 0x17, 0x09, // 61:495
+  0x02, 0x06, 0x17, 0x09, // 62:518
+  0x02, 0x1D, 0x16, 0x09, // 63:541
+  0x02, 0x33, 0x2F, 0x10, // 64:563
+  0x02, 0x62, 0x1D, 0x0B, // 65:610
+  0x02, 0x7F, 0x1D, 0x0B, // 66:639
+  0x02, 0x9C, 0x20, 0x0C, // 67:668
+  0x02, 0xBC, 0x20, 0x0C, // 68:700
+  0x02, 0xDC, 0x1D, 0x0B, // 69:732
+  0x02, 0xF9, 0x19, 0x0A, // 70:761
+  0x03, 0x12, 0x20, 0x0C, // 71:786
+  0x03, 0x32, 0x1D, 0x0C, // 72:818
+  0x03, 0x4F, 0x05, 0x04, // 73:847
+  0x03, 0x54, 0x14, 0x08, // 74:852
+  0x03, 0x68, 0x1D, 0x0B, // 75:872
+  0x03, 0x85, 0x17, 0x09, // 76:901
+  0x03, 0x9C, 0x23, 0x0D, // 77:924
+  0x03, 0xBF, 0x1D, 0x0C, // 78:959
+  0x03, 0xDC, 0x20, 0x0C, // 79:988
+  0x03, 0xFC, 0x1C, 0x0B, // 80:1020
+  0x04, 0x18, 0x20, 0x0C, // 81:1048
+  0x04, 0x38, 0x1D, 0x0C, // 82:1080
+  0x04, 0x55, 0x1D, 0x0B, // 83:1109
+  0x04, 0x72, 0x19, 0x0A, // 84:1138
+  0x04, 0x8B, 0x1D, 0x0C, // 85:1163
+  0x04, 0xA8, 0x1C, 0x0B, // 86:1192
+  0x04, 0xC4, 0x2B, 0x0F, // 87:1220
+  0x04, 0xEF, 0x20, 0x0B, // 88:1263
+  0x05, 0x0F, 0x19, 0x0B, // 89:1295
+  0x05, 0x28, 0x1A, 0x0A, // 90:1320
+  0x05, 0x42, 0x0C, 0x04, // 91:1346
+  0x05, 0x4E, 0x0B, 0x04, // 92:1358
+  0x05, 0x59, 0x09, 0x04, // 93:1369
+  0x05, 0x62, 0x14, 0x08, // 94:1378
+  0x05, 0x76, 0x1B, 0x09, // 95:1398
+  0x05, 0x91, 0x07, 0x05, // 96:1425
+  0x05, 0x98, 0x17, 0x09, // 97:1432
+  0x05, 0xAF, 0x17, 0x09, // 98:1455
+  0x05, 0xC6, 0x14, 0x08, // 99:1478
+  0x05, 0xDA, 0x17, 0x09, // 100:1498
+  0x05, 0xF1, 0x17, 0x09, // 101:1521
+  0x06, 0x08, 0x0A, 0x04, // 102:1544
+  0x06, 0x12, 0x17, 0x09, // 103:1554
+  0x06, 0x29, 0x14, 0x09, // 104:1577
+  0x06, 0x3D, 0x05, 0x04, // 105:1597
+  0x06, 0x42, 0x06, 0x04, // 106:1602
+  0x06, 0x48, 0x17, 0x08, // 107:1608
+  0x06, 0x5F, 0x05, 0x04, // 108:1631
+  0x06, 0x64, 0x23, 0x0D, // 109:1636
+  0x06, 0x87, 0x14, 0x09, // 110:1671
+  0x06, 0x9B, 0x17, 0x09, // 111:1691
+  0x06, 0xB2, 0x17, 0x09, // 112:1714
+  0x06, 0xC9, 0x18, 0x09, // 113:1737
+  0x06, 0xE1, 0x0D, 0x05, // 114:1761
+  0x06, 0xEE, 0x14, 0x08, // 115:1774
+  0x07, 0x02, 0x0B, 0x04, // 116:1794
+  0x07, 0x0D, 0x14, 0x09, // 117:1805
+  0x07, 0x21, 0x13, 0x08, // 118:1825
+  0x07, 0x34, 0x1F, 0x0C, // 119:1844
+  0x07, 0x53, 0x14, 0x08, // 120:1875
+  0x07, 0x67, 0x13, 0x08, // 121:1895
+  0x07, 0x7A, 0x14, 0x08, // 122:1914
+  0x07, 0x8E, 0x0F, 0x05, // 123:1934
+  0x07, 0x9D, 0x06, 0x04, // 124:1949
+  0x07, 0xA3, 0x0E, 0x05, // 125:1955
+  0x07, 0xB1, 0x17, 0x09, // 126:1969
+  0xFF, 0xFF, 0x00, 0x00, // 127:65535
+  0xFF, 0xFF, 0x00, 0x10, // 128:65535
+  0xFF, 0xFF, 0x00, 0x10, // 129:65535
+  0xFF, 0xFF, 0x00, 0x10, // 130:65535
+  0xFF, 0xFF, 0x00, 0x10, // 131:65535
+  0xFF, 0xFF, 0x00, 0x10, // 132:65535
+  0xFF, 0xFF, 0x00, 0x10, // 133:65535
+  0xFF, 0xFF, 0x00, 0x10, // 134:65535
+  0xFF, 0xFF, 0x00, 0x10, // 135:65535
+  0xFF, 0xFF, 0x00, 0x10, // 136:65535
+  0xFF, 0xFF, 0x00, 0x10, // 137:65535
+  0xFF, 0xFF, 0x00, 0x10, // 138:65535
+  0xFF, 0xFF, 0x00, 0x10, // 139:65535
+  0x07, 0xC8, 0x1D, 0x0B, // 140:1992
+  0xFF, 0xFF, 0x00, 0x10, // 141:65535
+  0xFF, 0xFF, 0x00, 0x10, // 142:65535
+  0x07, 0xE5, 0x1A, 0x0A, // 143:2021
+  0xFF, 0xFF, 0x00, 0x10, // 144:65535
+  0xFF, 0xFF, 0x00, 0x10, // 145:65535
+  0xFF, 0xFF, 0x00, 0x10, // 146:65535
+  0xFF, 0xFF, 0x00, 0x10, // 147:65535
+  0xFF, 0xFF, 0x00, 0x10, // 148:65535
+  0xFF, 0xFF, 0x00, 0x10, // 149:65535
+  0xFF, 0xFF, 0x00, 0x10, // 150:65535
+  0xFF, 0xFF, 0x00, 0x10, // 151:65535
+  0xFF, 0xFF, 0x00, 0x10, // 152:65535
+  0xFF, 0xFF, 0x00, 0x10, // 153:65535
+  0xFF, 0xFF, 0x00, 0x10, // 154:65535
+  0xFF, 0xFF, 0x00, 0x10, // 155:65535
+  0x07, 0xFF, 0x14, 0x08, // 156:2047
+  0xFF, 0xFF, 0x00, 0x10, // 157:65535
+  0xFF, 0xFF, 0x00, 0x10, // 158:65535
+  0x08, 0x13, 0x14, 0x08, // 159:2067
+  0xFF, 0xFF, 0x00, 0x04, // 160:65535
+  0x08, 0x27, 0x09, 0x05, // 161:2087
+  0x08, 0x30, 0x17, 0x09, // 162:2096
+  0x08, 0x47, 0x17, 0x09, // 163:2119
+  0x08, 0x5E, 0x14, 0x09, // 164:2142
+  0x08, 0x72, 0x1D, 0x0B, // 165:2162
+  0x08, 0x8F, 0x06, 0x04, // 166:2191
+  0x08, 0x95, 0x17, 0x09, // 167:2197
+  0x08, 0xAC, 0x07, 0x05, // 168:2220
+  0x08, 0xB3, 0x23, 0x0C, // 169:2227
+  0x08, 0xD6, 0x0E, 0x06, // 170:2262
+  0x08, 0xE4, 0x14, 0x09, // 171:2276
+  0x08, 0xF8, 0x17, 0x09, // 172:2296
+  0x09, 0x0F, 0x0B, 0x05, // 173:2319
+  0x09, 0x1A, 0x23, 0x0C, // 174:2330
+  0x09, 0x3D, 0x1A, 0x0A, // 175:2365
+  0x09, 0x57, 0x0D, 0x06, // 176:2391
+  0x09, 0x64, 0x17, 0x09, // 177:2404
+  0x09, 0x7B, 0x0E, 0x05, // 178:2427
+  0x09, 0x89, 0x0A, 0x04, // 179:2441
+  0x09, 0x93, 0x0A, 0x05, // 180:2451
+  0x09, 0x9D, 0x17, 0x09, // 181:2461
+  0x09, 0xB4, 0x19, 0x09, // 182:2484
+  0x09, 0xCD, 0x08, 0x05, // 183:2509
+  0x09, 0xD5, 0x0C, 0x05, // 184:2517
+  0x09, 0xE1, 0x17, 0x09, // 185:2529
+  0x09, 0xF8, 0x0D, 0x06, // 186:2552
+  0x0A, 0x05, 0x17, 0x09, // 187:2565
+  0x0A, 0x1C, 0x26, 0x0D, // 188:2588
+  0x0A, 0x42, 0x26, 0x0D, // 189:2626
+  0x0A, 0x68, 0x26, 0x0D, // 190:2664
+  0x0A, 0x8E, 0x14, 0x08, // 191:2702
+  0x0A, 0xA2, 0x1D, 0x0B, // 192:2722
+  0x0A, 0xBF, 0x1D, 0x0B, // 193:2751
+  0x0A, 0xDC, 0x1D, 0x0B, // 194:2780
+  0x0A, 0xF9, 0x1D, 0x0B, // 195:2809
+  0x0B, 0x16, 0x1D, 0x0B, // 196:2838
+  0x0B, 0x33, 0x1D, 0x0B, // 197:2867
+  0x0B, 0x50, 0x20, 0x0C, // 198:2896
+  0x0B, 0x70, 0x20, 0x0C, // 199:2928
+  0x0B, 0x90, 0x1D, 0x0B, // 200:2960
+  0x0B, 0xAD, 0x1D, 0x0B, // 201:2989
+  0x0B, 0xCA, 0x1D, 0x0B, // 202:3018
+  0x0B, 0xE7, 0x1D, 0x0B, // 203:3047
+  0x0C, 0x04, 0x05, 0x04, // 204:3076
+  0x0C, 0x09, 0x07, 0x04, // 205:3081
+  0x0C, 0x10, 0x0A, 0x04, // 206:3088
+  0x0C, 0x1A, 0x07, 0x04, // 207:3098
+  0x0C, 0x21, 0x20, 0x0C, // 208:3105
+  0x0C, 0x41, 0x1D, 0x0C, // 209:3137
+  0x0C, 0x5E, 0x20, 0x0C, // 210:3166
+  0x0C, 0x7E, 0x20, 0x0C, // 211:3198
+  0x0C, 0x9E, 0x20, 0x0C, // 212:3230
+  0x0C, 0xBE, 0x20, 0x0C, // 213:3262
+  0x0C, 0xDE, 0x20, 0x0C, // 214:3294
+  0x0C, 0xFE, 0x17, 0x09, // 215:3326
+  0x0D, 0x15, 0x20, 0x0C, // 216:3349
+  0x0D, 0x35, 0x1D, 0x0C, // 217:3381
+  0x0D, 0x52, 0x1D, 0x0C, // 218:3410
+  0x0D, 0x6F, 0x1D, 0x0C, // 219:3439
+  0x0D, 0x8C, 0x1D, 0x0C, // 220:3468
+  0x0D, 0xA9, 0x19, 0x0B, // 221:3497
+  0x0D, 0xC2, 0x1D, 0x0B, // 222:3522
+  0x0D, 0xDF, 0x17, 0x0A, // 223:3551
+  0x0D, 0xF6, 0x17, 0x09, // 224:3574
+  0x0E, 0x0D, 0x17, 0x09, // 225:3597
+  0x0E, 0x24, 0x17, 0x09, // 226:3620
+  0x0E, 0x3B, 0x17, 0x09, // 227:3643
+  0x0E, 0x52, 0x17, 0x09, // 228:3666
+  0x0E, 0x69, 0x17, 0x09, // 229:3689
+  0x0E, 0x80, 0x14, 0x08, // 230:3712
+  0x0E, 0x94, 0x14, 0x08, // 231:3732
+  0x0E, 0xA8, 0x17, 0x09, // 232:3752
+  0x0E, 0xBF, 0x17, 0x09, // 233:3775
+  0x0E, 0xD6, 0x17, 0x09, // 234:3798
+  0x0E, 0xED, 0x17, 0x09, // 235:3821
+  0x0F, 0x04, 0x05, 0x04, // 236:3844
+  0x0F, 0x09, 0x07, 0x04, // 237:3849
+  0x0F, 0x10, 0x0A, 0x04, // 238:3856
+  0x0F, 0x1A, 0x07, 0x04, // 239:3866
+  0x0F, 0x21, 0x17, 0x09, // 240:3873
+  0x0F, 0x38, 0x14, 0x09, // 241:3896
+  0x0F, 0x4C, 0x17, 0x09, // 242:3916
+  0x0F, 0x63, 0x17, 0x09, // 243:3939
+  0x0F, 0x7A, 0x17, 0x09, // 244:3962
+  0x0F, 0x91, 0x17, 0x09, // 245:3985
+  0x0F, 0xA8, 0x17, 0x09, // 246:4008
+  0x0F, 0xBF, 0x17, 0x09, // 247:4031
+  0x0F, 0xD6, 0x17, 0x0A, // 248:4054
+  0x0F, 0xED, 0x14, 0x09, // 249:4077
+  0x10, 0x01, 0x14, 0x09, // 250:4097
+  0x10, 0x15, 0x14, 0x09, // 251:4117
+  0x10, 0x29, 0x14, 0x09, // 252:4137
+  0x10, 0x3D, 0x13, 0x08, // 253:4157
+  0x10, 0x50, 0x17, 0x09, // 254:4176
+  0x10, 0x67, 0x13, 0x08, // 255:4199
+
+  // Font Data
+  0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x5F, // 33
+  0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78, // 34
+  0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08, // 35
+  0x00,0x00,0x00,0xE0,0x10,0x00,0x10,0x21,0x00,0x08,0x41,0x00,0xFC,0xFF,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 36
+  0x00,0x00,0x00,0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x61,0x00,0xF0,0x18,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x30,0x3C,0x00,0x08,0x42,0x00,0x00,0x42,0x00,0x00,0x42,0x00,0x00,0x3C, // 37
+  0x00,0x00,0x00,0x00,0x1C,0x00,0x70,0x22,0x00,0x88,0x41,0x00,0x08,0x43,0x00,0x88,0x44,0x00,0x70,0x28,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0x00,0x44, // 38
+  0x00,0x00,0x00,0x78, // 39
+  0x00,0x00,0x00,0x80,0x3F,0x00,0x70,0xC0,0x01,0x08,0x00,0x02, // 40
+  0x00,0x00,0x00,0x08,0x00,0x02,0x70,0xC0,0x01,0x80,0x3F, // 41
+  0x10,0x00,0x00,0xD0,0x00,0x00,0x38,0x00,0x00,0xD0,0x00,0x00,0x10, // 42
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0xC0,0x1F,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01, // 44
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40, // 46
+  0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 47
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xE0,0x1F, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0xF8,0x7F, // 49
+  0x00,0x00,0x00,0x20,0x40,0x00,0x10,0x60,0x00,0x08,0x50,0x00,0x08,0x48,0x00,0x08,0x44,0x00,0x10,0x43,0x00,0xE0,0x40, // 50
+  0x00,0x00,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x88,0x41,0x00,0xF0,0x22,0x00,0x00,0x1C, // 51
+  0x00,0x0C,0x00,0x00,0x0A,0x00,0x00,0x09,0x00,0xC0,0x08,0x00,0x20,0x08,0x00,0x10,0x08,0x00,0xF8,0x7F,0x00,0x00,0x08, // 52
+  0x00,0x00,0x00,0xC0,0x11,0x00,0xB8,0x20,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x08,0x21,0x00,0x08,0x1E, // 53
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x21,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x10,0x21,0x00,0x20,0x1E, // 54
+  0x00,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x78,0x00,0x08,0x07,0x00,0xC8,0x00,0x00,0x28,0x00,0x00,0x18, // 55
+  0x00,0x00,0x00,0x60,0x1C,0x00,0x90,0x22,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 56
+  0x00,0x00,0x00,0xE0,0x11,0x00,0x10,0x22,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x10,0x22,0x00,0xE0,0x1F, // 57
+  0x00,0x00,0x00,0x40,0x40, // 58
+  0x00,0x00,0x00,0x40,0xC0,0x01, // 59
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x40,0x10, // 60
+  0x00,0x00,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08, // 61
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x00,0x02, // 62
+  0x00,0x00,0x00,0x60,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x08,0x5C,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0, // 63
+  0x00,0x00,0x00,0x00,0x3F,0x00,0xC0,0x40,0x00,0x20,0x80,0x00,0x10,0x1E,0x01,0x10,0x21,0x01,0x88,0x40,0x02,0x48,0x40,0x02,0x48,0x40,0x02,0x48,0x20,0x02,0x88,0x7C,0x02,0xC8,0x43,0x02,0x10,0x40,0x02,0x10,0x20,0x01,0x60,0x10,0x01,0x80,0x8F, // 64
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 65
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 66
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 67
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 68
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 69
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08, // 70
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x12,0x00,0x00,0x0E, // 71
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0xF8,0x7F, // 72
+  0x00,0x00,0x00,0xF8,0x7F, // 73
+  0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0xF8,0x3F, // 74
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x04,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0x80,0x03,0x00,0x40,0x04,0x00,0x20,0x18,0x00,0x10,0x20,0x00,0x08,0x40, // 75
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 76
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0xF8,0x7F, // 77
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x04,0x00,0x00,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 78
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 79
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0, // 80
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x50,0x00,0x08,0x50,0x00,0x10,0x20,0x00,0x20,0x70,0x00,0xC0,0x4F, // 81
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x06,0x00,0x08,0x1A,0x00,0x10,0x21,0x00,0xE0,0x40, // 82
+  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 83
+  0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0x7F,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 84
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 85
+  0x00,0x00,0x00,0x18,0x00,0x00,0xE0,0x00,0x00,0x00,0x07,0x00,0x00,0x18,0x00,0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x07,0x00,0xE0,0x00,0x00,0x18, // 86
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x03,0x00,0x70,0x00,0x00,0x08,0x00,0x00,0x70,0x00,0x00,0x80,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 87
+  0x00,0x40,0x00,0x08,0x20,0x00,0x10,0x10,0x00,0x60,0x0C,0x00,0x80,0x02,0x00,0x00,0x01,0x00,0x80,0x02,0x00,0x60,0x0C,0x00,0x10,0x10,0x00,0x08,0x20,0x00,0x00,0x40, // 88
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x00,0x7E,0x00,0x80,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 89
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x88,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 90
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x08,0x00,0x02,0x08,0x00,0x02, // 91
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60, // 92
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF8,0xFF,0x03, // 93
+  0x00,0x01,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0x08,0x00,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x01, // 94
+  0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 95
+  0x00,0x00,0x00,0x08,0x00,0x00,0x10, // 96
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 97
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 98
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20, // 99
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xF8,0x7F, // 100
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 101
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x48,0x00,0x00,0x48, // 102
+  0x00,0x00,0x00,0x00,0x1F,0x01,0x80,0x20,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x80,0x20,0x01,0xC0,0xFF, // 103
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 104
+  0x00,0x00,0x00,0xC8,0x7F, // 105
+  0x00,0x00,0x02,0xC8,0xFF,0x01, // 106
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x06,0x00,0x00,0x19,0x00,0x80,0x20,0x00,0x40,0x40, // 107
+  0x00,0x00,0x00,0xF8,0x7F, // 108
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 109
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 110
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 111
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 112
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xC0,0xFF,0x03, // 113
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40, // 114
+  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x38, // 115
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x40,0x40,0x00,0x40,0x40, // 116
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 117
+  0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0, // 118
+  0xC0,0x00,0x00,0x00,0x1F,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1F,0x00,0xC0, // 119
+  0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x40,0x40, // 120
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x00,0xE0,0x01,0x00,0x38,0x00,0x00,0x07,0x00,0xC0, // 121
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x40,0x44,0x00,0x40,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 122
+  0x00,0x04,0x00,0x00,0x04,0x00,0xF0,0xFB,0x01,0x08,0x00,0x02,0x08,0x00,0x02, // 123
+  0x00,0x00,0x00,0xF8,0xFF,0x03, // 124
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF0,0xFB,0x01,0x00,0x04,0x00,0x00,0x04, // 125
+  0x00,0x02,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01, // 126
+  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 140
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x8A,0x40,0x00,0x69,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 143
+  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x40,0x44,0x00,0x80,0x38, // 156
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x50,0x44,0x00,0x48,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 159
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0xFF,0x03, // 161
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x03,0x40,0xF0,0x00,0x40,0x4E,0x00,0xC0,0x41,0x00,0xB8,0x20,0x00,0x00,0x11, // 162
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x42,0x00,0x00,0x41,0x00,0x80,0x40,0x00,0x40,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 163
+  0x00,0x00,0x00,0x40,0x0B,0x00,0x80,0x04,0x00,0x40,0x08,0x00,0x40,0x08,0x00,0x80,0x04,0x00,0x40,0x0B, // 164
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x02,0x80,0x87,0x02,0x00,0x1C,0x03,0x00,0x60, // 165
+  0x00,0x00,0x00,0xF8,0xF1,0x03, // 166
+  0x00,0x86,0x00,0x70,0x09,0x01,0xC8,0x10,0x02,0x88,0x10,0x02,0x08,0x21,0x02,0x08,0x61,0x02,0x30,0xD2,0x01,0x00,0x0C, // 167
+  0x08,0x00,0x00,0x00,0x00,0x00,0x08, // 168
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xC8,0x47,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x48,0x44,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 169
+  0xD0,0x00,0x00,0x48,0x01,0x00,0x28,0x01,0x00,0x28,0x01,0x00,0xF0,0x01, // 170
+  0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20, // 171
+  0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x0F, // 172
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 173
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xE8,0x4F,0x00,0x28,0x41,0x00,0x28,0x41,0x00,0x28,0x43,0x00,0x28,0x45,0x00,0xC8,0x48,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 174
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x0A,0x43,0x00,0x8A,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 175
+  0x00,0x00,0x00,0x30,0x00,0x00,0x48,0x00,0x00,0x48,0x00,0x00,0x30, // 176
+  0x00,0x00,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0xE0,0x4F,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41, // 177
+  0x10,0x01,0x00,0x88,0x01,0x00,0x48,0x01,0x00,0x48,0x01,0x00,0x30,0x01, // 178
+  0x00,0x06,0x00,0xF8,0x7F,0x00,0x80,0x01,0x00,0x40, // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08, // 180
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 181
+  0xF0,0x00,0x00,0xF8,0x00,0x00,0xF8,0x01,0x00,0xF8,0x01,0x00,0xF8,0xFF,0x03,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0xFF,0x03,0x08, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, // 183
+  0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x80,0x02,0x00,0x00,0x03, // 184
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x02,0x40,0xC2,0x02,0x40,0x22,0x03,0x80,0x7F, // 185
+  0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0xF0, // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04, // 187
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x21,0x00,0x00,0x10,0x00,0x00,0x0C,0x00,0x00,0x02,0x00,0x80,0x01,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20, // 188
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x31,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x60,0x44,0x00,0x10,0x62,0x00,0x08,0x52,0x00,0x00,0x52,0x00,0x00,0x4C, // 189
+  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x41,0x00,0x28,0x21,0x00,0xD8,0x18,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20, // 190
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x50,0x44,0x00,0x50,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 191
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x71,0x04,0x00,0x0A,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 192
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x0A,0x04,0x00,0x71,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 193
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x71,0x04,0x00,0x82,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 194
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x72,0x04,0x00,0x81,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 195
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x08,0x04,0x00,0x72,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 196
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x7E,0x04,0x00,0x0A,0x04,0x00,0x7E,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 197
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 198
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x02,0x08,0xC0,0x02,0x08,0x40,0x03,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 199
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 200
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 201
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x02,0x08,0xC1,0x02,0x08,0x41,0x03,0x08,0x41,0x00,0x08,0x40, // 202
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 203
+  0x01,0x00,0x00,0xFA,0x7F, // 204
+  0x00,0x00,0x00,0xFA,0x7F,0x00,0x01, // 205
+  0x02,0x00,0x00,0xF9,0x7F,0x00,0x01,0x00,0x00,0x02, // 206
+  0x02,0x00,0x00,0xF8,0x7F,0x00,0x02, // 207
+  0x00,0x02,0x00,0xF8,0x7F,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 208
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x02,0x04,0x00,0x01,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 209
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 210
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 211
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 212
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 213
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 214
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x07,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x40,0x10, // 215
+  0x00,0x00,0x00,0xC0,0x4F,0x00,0x20,0x30,0x00,0x10,0x30,0x00,0x08,0x4C,0x00,0x08,0x42,0x00,0x08,0x41,0x00,0xC8,0x40,0x00,0x30,0x20,0x00,0x30,0x10,0x00,0xC8,0x0F, // 216
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 217
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 218
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 219
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 220
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x02,0x7E,0x00,0x81,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 221
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x40,0x08,0x00,0x80,0x07, // 222
+  0x00,0x00,0x00,0xE0,0x7F,0x00,0x10,0x00,0x00,0x08,0x20,0x00,0x88,0x43,0x00,0x70,0x42,0x00,0x00,0x44,0x00,0x00,0x38, // 223
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 224
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 225
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x42,0x00,0x50,0x22,0x00,0x80,0x7F, // 226
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x48,0x22,0x00,0x80,0x7F, // 227
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 228
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x5C,0x44,0x00,0x54,0x44,0x00,0x5C,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 229
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20, // 230
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x02,0x40,0xC0,0x02,0x40,0x40,0x03,0x80,0x20, // 231
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x48,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 232
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 233
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x02,0x40,0xC4,0x02,0x80,0x24,0x03,0x00,0x17, // 234
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 235
+  0x08,0x00,0x00,0xD0,0x7F, // 236
+  0x00,0x00,0x00,0xD0,0x7F,0x00,0x08, // 237
+  0x10,0x00,0x00,0xC8,0x7F,0x00,0x08,0x00,0x00,0x10, // 238
+  0x10,0x00,0x00,0xC0,0x7F,0x00,0x10, // 239
+  0x00,0x00,0x00,0x00,0x1F,0x00,0xA0,0x20,0x00,0x68,0x40,0x00,0x58,0x40,0x00,0x70,0x40,0x00,0xE8,0x20,0x00,0x00,0x1F, // 240
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x50,0x00,0x00,0x48,0x00,0x00,0x80,0x7F, // 241
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 242
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 243
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x48,0x40,0x00,0x90,0x20,0x00,0x00,0x1F, // 244
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x88,0x20,0x00,0x00,0x1F, // 245
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 246
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x80,0x0A,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 247
+  0x00,0x00,0x00,0x00,0x5F,0x00,0x80,0x30,0x00,0x40,0x48,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x80,0x21,0x00,0x40,0x1F, // 248
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 249
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x08,0x20,0x00,0xC0,0x7F, // 250
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x10,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xC0,0x7F, // 251
+  0x00,0x00,0x00,0xD0,0x3F,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 252
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x10,0xE0,0x01,0x08,0x38,0x00,0x00,0x07,0x00,0xC0, // 253
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 254
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x10,0x38,0x02,0x00,0xE0,0x01,0x10,0x38,0x00,0x00,0x07,0x00,0xC0 // 255
+};
+#endif // ARIALMT_WIN1250_PLAIN_16_H
diff --git a/src/ArialMT_Win1250_Plain_24.h b/src/ArialMT_Win1250_Plain_24.h
new file mode 100644
index 00000000..799f2d7d
--- /dev/null
+++ b/src/ArialMT_Win1250_Plain_24.h
@@ -0,0 +1,432 @@
+// Created by php script OLEDFontsToool by Goral64
+#ifndef ARIALMT_WIN1250_PLAIN_24_H
+#define ARIALMT_WIN1250_PLAIN_24_H
+
+const uint8_t ArialMT_Win1250_Plain_24[] PROGMEM = {
+  0x18, // Width: 24
+  0x1C, // Height: 28
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table
+  0xFF, 0xFF, 0x00, 0x07, // 32:65535
+  0x00, 0x00, 0x13, 0x07, // 33:0
+  0x00, 0x13, 0x1A, 0x09, // 34:19
+  0x00, 0x2D, 0x33, 0x0D, // 35:45
+  0x00, 0x60, 0x2F, 0x0D, // 36:96
+  0x00, 0x8F, 0x4F, 0x15, // 37:143
+  0x00, 0xDE, 0x3B, 0x10, // 38:222
+  0x01, 0x19, 0x0A, 0x05, // 39:281
+  0x01, 0x23, 0x1C, 0x08, // 40:291
+  0x01, 0x3F, 0x1B, 0x08, // 41:319
+  0x01, 0x5A, 0x21, 0x09, // 42:346
+  0x01, 0x7B, 0x32, 0x0E, // 43:379
+  0x01, 0xAD, 0x10, 0x07, // 44:429
+  0x01, 0xBD, 0x1B, 0x08, // 45:445
+  0x01, 0xD8, 0x0F, 0x07, // 46:472
+  0x01, 0xE7, 0x19, 0x07, // 47:487
+  0x02, 0x00, 0x2F, 0x0D, // 48:512
+  0x02, 0x2F, 0x23, 0x0D, // 49:559
+  0x02, 0x52, 0x2F, 0x0D, // 50:594
+  0x02, 0x81, 0x2F, 0x0D, // 51:641
+  0x02, 0xB0, 0x2F, 0x0D, // 52:688
+  0x02, 0xDF, 0x2F, 0x0D, // 53:735
+  0x03, 0x0E, 0x2F, 0x0D, // 54:782
+  0x03, 0x3D, 0x2D, 0x0D, // 55:829
+  0x03, 0x6A, 0x2F, 0x0D, // 56:874
+  0x03, 0x99, 0x2F, 0x0D, // 57:921
+  0x03, 0xC8, 0x0F, 0x07, // 58:968
+  0x03, 0xD7, 0x10, 0x07, // 59:983
+  0x03, 0xE7, 0x2F, 0x0E, // 60:999
+  0x04, 0x16, 0x2F, 0x0E, // 61:1046
+  0x04, 0x45, 0x2E, 0x0E, // 62:1093
+  0x04, 0x73, 0x2E, 0x0D, // 63:1139
+  0x04, 0xA1, 0x5B, 0x18, // 64:1185
+  0x04, 0xFC, 0x3B, 0x10, // 65:1276
+  0x05, 0x37, 0x3B, 0x10, // 66:1335
+  0x05, 0x72, 0x3F, 0x11, // 67:1394
+  0x05, 0xB1, 0x3F, 0x11, // 68:1457
+  0x05, 0xF0, 0x3B, 0x10, // 69:1520
+  0x06, 0x2B, 0x35, 0x0F, // 70:1579
+  0x06, 0x60, 0x43, 0x13, // 71:1632
+  0x06, 0xA3, 0x3B, 0x11, // 72:1699
+  0x06, 0xDE, 0x0F, 0x07, // 73:1758
+  0x06, 0xED, 0x27, 0x0C, // 74:1773
+  0x07, 0x14, 0x3F, 0x10, // 75:1812
+  0x07, 0x53, 0x2F, 0x0D, // 76:1875
+  0x07, 0x82, 0x43, 0x14, // 77:1922
+  0x07, 0xC5, 0x3B, 0x11, // 78:1989
+  0x08, 0x00, 0x47, 0x13, // 79:2048
+  0x08, 0x47, 0x3A, 0x10, // 80:2119
+  0x08, 0x81, 0x47, 0x13, // 81:2177
+  0x08, 0xC8, 0x3F, 0x11, // 82:2248
+  0x09, 0x07, 0x3B, 0x10, // 83:2311
+  0x09, 0x42, 0x35, 0x0F, // 84:2370
+  0x09, 0x77, 0x3B, 0x11, // 85:2423
+  0x09, 0xB2, 0x39, 0x10, // 86:2482
+  0x09, 0xEB, 0x59, 0x17, // 87:2539
+  0x0A, 0x44, 0x3B, 0x10, // 88:2628
+  0x0A, 0x7F, 0x3D, 0x10, // 89:2687
+  0x0A, 0xBC, 0x37, 0x0F, // 90:2748
+  0x0A, 0xF3, 0x14, 0x07, // 91:2803
+  0x0B, 0x07, 0x1B, 0x07, // 92:2823
+  0x0B, 0x22, 0x18, 0x07, // 93:2850
+  0x0B, 0x3A, 0x2A, 0x0B, // 94:2874
+  0x0B, 0x64, 0x34, 0x0D, // 95:2916
+  0x0B, 0x98, 0x11, 0x08, // 96:2968
+  0x0B, 0xA9, 0x2F, 0x0D, // 97:2985
+  0x0B, 0xD8, 0x33, 0x0D, // 98:3032
+  0x0C, 0x0B, 0x2B, 0x0C, // 99:3083
+  0x0C, 0x36, 0x2F, 0x0D, // 100:3126
+  0x0C, 0x65, 0x2F, 0x0D, // 101:3173
+  0x0C, 0x94, 0x1A, 0x07, // 102:3220
+  0x0C, 0xAE, 0x2F, 0x0D, // 103:3246
+  0x0C, 0xDD, 0x2F, 0x0D, // 104:3293
+  0x0D, 0x0C, 0x0F, 0x05, // 105:3340
+  0x0D, 0x1B, 0x10, 0x05, // 106:3355
+  0x0D, 0x2B, 0x2F, 0x0C, // 107:3371
+  0x0D, 0x5A, 0x0F, 0x05, // 108:3418
+  0x0D, 0x69, 0x47, 0x14, // 109:3433
+  0x0D, 0xB0, 0x2F, 0x0D, // 110:3504
+  0x0D, 0xDF, 0x2F, 0x0D, // 111:3551
+  0x0E, 0x0E, 0x33, 0x0D, // 112:3598
+  0x0E, 0x41, 0x30, 0x0D, // 113:3649
+  0x0E, 0x71, 0x1E, 0x08, // 114:3697
+  0x0E, 0x8F, 0x2B, 0x0C, // 115:3727
+  0x0E, 0xBA, 0x1B, 0x07, // 116:3770
+  0x0E, 0xD5, 0x2F, 0x0D, // 117:3797
+  0x0F, 0x04, 0x2A, 0x0C, // 118:3844
+  0x0F, 0x2E, 0x42, 0x11, // 119:3886
+  0x0F, 0x70, 0x2B, 0x0C, // 120:3952
+  0x0F, 0x9B, 0x2A, 0x0C, // 121:3995
+  0x0F, 0xC5, 0x2B, 0x0C, // 122:4037
+  0x0F, 0xF0, 0x1C, 0x08, // 123:4080
+  0x10, 0x0C, 0x10, 0x06, // 124:4108
+  0x10, 0x1C, 0x1B, 0x08, // 125:4124
+  0x10, 0x37, 0x32, 0x0E, // 126:4151
+  0xFF, 0xFF, 0x00, 0x00, // 127:65535
+  0xFF, 0xFF, 0x00, 0x18, // 128:65535
+  0xFF, 0xFF, 0x00, 0x18, // 129:65535
+  0xFF, 0xFF, 0x00, 0x18, // 130:65535
+  0xFF, 0xFF, 0x00, 0x18, // 131:65535
+  0xFF, 0xFF, 0x00, 0x18, // 132:65535
+  0xFF, 0xFF, 0x00, 0x18, // 133:65535
+  0xFF, 0xFF, 0x00, 0x18, // 134:65535
+  0xFF, 0xFF, 0x00, 0x18, // 135:65535
+  0xFF, 0xFF, 0x00, 0x18, // 136:65535
+  0xFF, 0xFF, 0x00, 0x18, // 137:65535
+  0xFF, 0xFF, 0x00, 0x18, // 138:65535
+  0xFF, 0xFF, 0x00, 0x18, // 139:65535
+  0x10, 0x69, 0x3B, 0x10, // 140:4201
+  0xFF, 0xFF, 0x00, 0x18, // 141:65535
+  0xFF, 0xFF, 0x00, 0x18, // 142:65535
+  0x10, 0xA4, 0x37, 0x0F, // 143:4260
+  0xFF, 0xFF, 0x00, 0x18, // 144:65535
+  0xFF, 0xFF, 0x00, 0x18, // 145:65535
+  0xFF, 0xFF, 0x00, 0x18, // 146:65535
+  0xFF, 0xFF, 0x00, 0x18, // 147:65535
+  0xFF, 0xFF, 0x00, 0x18, // 148:65535
+  0xFF, 0xFF, 0x00, 0x18, // 149:65535
+  0xFF, 0xFF, 0x00, 0x18, // 150:65535
+  0xFF, 0xFF, 0x00, 0x18, // 151:65535
+  0xFF, 0xFF, 0x00, 0x18, // 152:65535
+  0xFF, 0xFF, 0x00, 0x18, // 153:65535
+  0xFF, 0xFF, 0x00, 0x18, // 154:65535
+  0xFF, 0xFF, 0x00, 0x18, // 155:65535
+  0x10, 0xDB, 0x2B, 0x0C, // 156:4315
+  0xFF, 0xFF, 0x00, 0x18, // 157:65535
+  0xFF, 0xFF, 0x00, 0x18, // 158:65535
+  0x11, 0x06, 0x2B, 0x0C, // 159:4358
+  0xFF, 0xFF, 0x00, 0x07, // 160:65535
+  0x11, 0x31, 0x14, 0x08, // 161:4401
+  0x11, 0x45, 0x2B, 0x0D, // 162:4421
+  0x11, 0x70, 0x2F, 0x0D, // 163:4464
+  0x11, 0x9F, 0x33, 0x0D, // 164:4511
+  0x11, 0xD2, 0x3B, 0x10, // 165:4562
+  0x12, 0x0D, 0x10, 0x06, // 166:4621
+  0x12, 0x1D, 0x2F, 0x0D, // 167:4637
+  0x12, 0x4C, 0x19, 0x08, // 168:4684
+  0x12, 0x65, 0x46, 0x12, // 169:4709
+  0x12, 0xAB, 0x1A, 0x09, // 170:4779
+  0x12, 0xC5, 0x27, 0x0D, // 171:4805
+  0x12, 0xEC, 0x2F, 0x0E, // 172:4844
+  0x13, 0x1B, 0x1B, 0x08, // 173:4891
+  0x13, 0x36, 0x46, 0x12, // 174:4918
+  0x13, 0x7C, 0x37, 0x0F, // 175:4988
+  0x13, 0xB3, 0x1E, 0x0A, // 176:5043
+  0x13, 0xD1, 0x33, 0x0D, // 177:5073
+  0x14, 0x04, 0x1A, 0x08, // 178:5124
+  0x14, 0x1E, 0x16, 0x06, // 179:5150
+  0x14, 0x34, 0x19, 0x08, // 180:5172
+  0x14, 0x4D, 0x2F, 0x0E, // 181:5197
+  0x14, 0x7C, 0x31, 0x0D, // 182:5244
+  0x14, 0xAD, 0x12, 0x08, // 183:5293
+  0x14, 0xBF, 0x18, 0x08, // 184:5311
+  0x14, 0xD7, 0x2F, 0x0D, // 185:5335
+  0x15, 0x06, 0x1E, 0x09, // 186:5382
+  0x15, 0x24, 0x2E, 0x0D, // 187:5412
+  0x15, 0x52, 0x4F, 0x14, // 188:5458
+  0x15, 0xA1, 0x4B, 0x14, // 189:5537
+  0x15, 0xEC, 0x4B, 0x14, // 190:5612
+  0x16, 0x37, 0x2B, 0x0C, // 191:5687
+  0x16, 0x62, 0x3B, 0x10, // 192:5730
+  0x16, 0x9D, 0x3B, 0x10, // 193:5789
+  0x16, 0xD8, 0x3B, 0x10, // 194:5848
+  0x17, 0x13, 0x3B, 0x10, // 195:5907
+  0x17, 0x4E, 0x3B, 0x10, // 196:5966
+  0x17, 0x89, 0x3B, 0x10, // 197:6025
+  0x17, 0xC4, 0x3F, 0x11, // 198:6084
+  0x18, 0x03, 0x3F, 0x11, // 199:6147
+  0x18, 0x42, 0x3B, 0x10, // 200:6210
+  0x18, 0x7D, 0x3B, 0x10, // 201:6269
+  0x18, 0xB8, 0x3B, 0x10, // 202:6328
+  0x18, 0xF3, 0x3B, 0x10, // 203:6387
+  0x19, 0x2E, 0x11, 0x07, // 204:6446
+  0x19, 0x3F, 0x11, 0x07, // 205:6463
+  0x19, 0x50, 0x15, 0x07, // 206:6480
+  0x19, 0x65, 0x15, 0x07, // 207:6501
+  0x19, 0x7A, 0x3F, 0x11, // 208:6522
+  0x19, 0xB9, 0x3B, 0x11, // 209:6585
+  0x19, 0xF4, 0x47, 0x13, // 210:6644
+  0x1A, 0x3B, 0x47, 0x13, // 211:6715
+  0x1A, 0x82, 0x47, 0x13, // 212:6786
+  0x1A, 0xC9, 0x47, 0x13, // 213:6857
+  0x1B, 0x10, 0x47, 0x13, // 214:6928
+  0x1B, 0x57, 0x2B, 0x0E, // 215:6999
+  0x1B, 0x82, 0x47, 0x13, // 216:7042
+  0x1B, 0xC9, 0x3B, 0x11, // 217:7113
+  0x1C, 0x04, 0x3B, 0x11, // 218:7172
+  0x1C, 0x3F, 0x3B, 0x11, // 219:7231
+  0x1C, 0x7A, 0x3B, 0x11, // 220:7290
+  0x1C, 0xB5, 0x3D, 0x10, // 221:7349
+  0x1C, 0xF2, 0x3A, 0x10, // 222:7410
+  0x1D, 0x2C, 0x37, 0x0F, // 223:7468
+  0x1D, 0x63, 0x2F, 0x0D, // 224:7523
+  0x1D, 0x92, 0x2F, 0x0D, // 225:7570
+  0x1D, 0xC1, 0x2F, 0x0D, // 226:7617
+  0x1D, 0xF0, 0x2F, 0x0D, // 227:7664
+  0x1E, 0x1F, 0x2F, 0x0D, // 228:7711
+  0x1E, 0x4E, 0x2F, 0x0D, // 229:7758
+  0x1E, 0x7D, 0x2B, 0x0C, // 230:7805
+  0x1E, 0xA8, 0x2B, 0x0C, // 231:7848
+  0x1E, 0xD3, 0x2F, 0x0D, // 232:7891
+  0x1F, 0x02, 0x2F, 0x0D, // 233:7938
+  0x1F, 0x31, 0x2F, 0x0D, // 234:7985
+  0x1F, 0x60, 0x2F, 0x0D, // 235:8032
+  0x1F, 0x8F, 0x11, 0x07, // 236:8079
+  0x1F, 0xA0, 0x11, 0x07, // 237:8096
+  0x1F, 0xB1, 0x15, 0x07, // 238:8113
+  0x1F, 0xC6, 0x15, 0x07, // 239:8134
+  0x1F, 0xDB, 0x2F, 0x0D, // 240:8155
+  0x20, 0x0A, 0x2F, 0x0D, // 241:8202
+  0x20, 0x39, 0x2F, 0x0D, // 242:8249
+  0x20, 0x68, 0x2F, 0x0D, // 243:8296
+  0x20, 0x97, 0x2F, 0x0D, // 244:8343
+  0x20, 0xC6, 0x2F, 0x0D, // 245:8390
+  0x20, 0xF5, 0x2F, 0x0D, // 246:8437
+  0x21, 0x24, 0x32, 0x0D, // 247:8484
+  0x21, 0x56, 0x33, 0x0F, // 248:8534
+  0x21, 0x89, 0x2F, 0x0D, // 249:8585
+  0x21, 0xB8, 0x2F, 0x0D, // 250:8632
+  0x21, 0xE7, 0x2F, 0x0D, // 251:8679
+  0x22, 0x16, 0x2F, 0x0D, // 252:8726
+  0x22, 0x45, 0x2A, 0x0C, // 253:8773
+  0x22, 0x6F, 0x2F, 0x0D, // 254:8815
+  0x22, 0x9E, 0x2A, 0x0C, // 255:8862
+
+  // Font Data
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x33,0x00,0xE0,0xFF,0x33, // 33
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07, // 34
+  0x00,0x0C,0x03,0x00,0x00,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x03,0x00,0x00,0x0C,0x03, // 35
+  0x00,0x00,0x00,0x00,0x80,0x07,0x06,0x00,0xC0,0x0F,0x1E,0x00,0xC0,0x18,0x1C,0x00,0x60,0x18,0x38,0x00,0x60,0x30,0x30,0x00,0xF0,0xFF,0xFF,0x00,0x60,0x30,0x30,0x00,0x60,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0xC1,0x1F,0x00,0x00,0x81,0x07, // 36
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x00,0x60,0x30,0x38,0x00,0xC0,0x1F,0x1E,0x00,0x80,0x8F,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x8F,0x0F,0x00,0xC0,0xC3,0x1F,0x00,0xE0,0x60,0x30,0x00,0x20,0x20,0x20,0x00,0x00,0x20,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 37
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0xC0,0x0F,0x00,0x80,0xE3,0x1C,0x00,0xC0,0x77,0x38,0x00,0xE0,0x3C,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x78,0x30,0x00,0xE0,0xEC,0x38,0x00,0xC0,0x8F,0x1B,0x00,0x80,0x03,0x1F,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xC0,0x38,0x00,0x00,0x00,0x10, // 38
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07, // 39
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x0F,0x00,0x00,0xFE,0x7F,0x00,0x80,0x0F,0xF0,0x01,0xC0,0x01,0x80,0x03,0x60,0x00,0x00,0x06,0x20,0x00,0x00,0x04, // 40
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x04,0x60,0x00,0x00,0x06,0xC0,0x01,0x80,0x03,0x80,0x0F,0xF0,0x01,0x00,0xFE,0x7F,0x00,0x00,0xF0,0x0F, // 41
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x04,0x00,0x00,0x80,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x80,0x04,0x00,0x00,0x80, // 42
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xFF,0x0F,0x00,0x00,0xFF,0x0F,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x03,0x00,0x00,0xF0,0x01, // 44
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 46
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x3F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60, // 47
+  0x00,0x00,0x00,0x00,0x00,0xFE,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x01,0x1C,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x03, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 49
+  0x00,0x00,0x00,0x00,0x00,0x03,0x30,0x00,0xC0,0x03,0x38,0x00,0xC0,0x00,0x3C,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x33,0x00,0x60,0x80,0x31,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x30,0x00,0xC0,0x30,0x30,0x00,0xC0,0x1F,0x30,0x00,0x00,0x0F,0x30, // 50
+  0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x00,0xC0,0x01,0x0E,0x00,0xC0,0x00,0x1C,0x00,0x60,0x00,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x0F,0x00,0x00,0x80,0x07, // 51
+  0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x03,0x00,0x00,0x3C,0x03,0x00,0x00,0x0E,0x03,0x00,0x80,0x07,0x03,0x00,0xC0,0x01,0x03,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x03, // 52
+  0x00,0x00,0x00,0x00,0x00,0x30,0x06,0x00,0x80,0x3F,0x0E,0x00,0xE0,0x1F,0x18,0x00,0x60,0x08,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x18,0x1C,0x00,0x60,0xF0,0x0F,0x00,0x00,0xE0,0x03, // 53
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x63,0x1C,0x00,0xC0,0x30,0x38,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0xE0,0x30,0x18,0x00,0xC0,0xF1,0x0F,0x00,0x80,0xC1,0x07, // 54
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x3C,0x00,0x60,0x80,0x3F,0x00,0x60,0xE0,0x03,0x00,0x60,0x78,0x00,0x00,0x60,0x0E,0x00,0x00,0x60,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60, // 55
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x80,0xC7,0x1F,0x00,0xC0,0x6F,0x18,0x00,0xE0,0x38,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xE0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 56
+  0x00,0x00,0x00,0x00,0x00,0x1F,0x0C,0x00,0x80,0x7F,0x1C,0x00,0xC0,0x61,0x38,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x18,0x00,0xC0,0x31,0x1E,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x01, // 57
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 58
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x03,0x00,0x06,0xF0,0x01, // 59
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x04,0x01,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x03,0x06, // 60
+  0x00,0x00,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01, // 61
+  0x00,0x00,0x00,0x00,0x00,0x03,0x06,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x04,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x20, // 62
+  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x33,0x00,0x60,0xE0,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x00,0x07, // 63
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x0F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x1E,0xF0,0x00,0x00,0x07,0xC0,0x01,0x80,0xC3,0x87,0x01,0xC0,0xF1,0x9F,0x03,0xC0,0x38,0x18,0x03,0xC0,0x0C,0x30,0x03,0x60,0x0E,0x30,0x06,0x60,0x06,0x30,0x06,0x60,0x06,0x18,0x06,0x60,0x06,0x0C,0x06,0x60,0x0C,0x1E,0x06,0x60,0xF8,0x3F,0x06,0xE0,0xFE,0x31,0x06,0xC0,0x0E,0x30,0x06,0xC0,0x01,0x18,0x03,0x80,0x03,0x1C,0x03,0x00,0x07,0x8F,0x01,0x00,0xFE,0x87,0x01,0x00,0xF8,0xC1,0x00,0x00,0x00,0x40, // 64
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 65
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x78,0x30,0x00,0xC0,0xFF,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 66
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 67
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 68
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 69
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60, // 70
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x60,0x30,0x00,0x60,0x60,0x30,0x00,0xE0,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0x61,0x18,0x00,0x80,0xE3,0x0F,0x00,0x00,0xE2,0x0F, // 71
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 72
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 73
+  0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0xE0,0xFF,0x1F,0x00,0xE0,0xFF,0x0F, // 74
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE7,0x01,0x00,0x80,0x83,0x07,0x00,0xC0,0x01,0x0F,0x00,0xE0,0x00,0x1E,0x00,0x60,0x00,0x38,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 75
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 76
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x07,0x00,0x00,0xFE,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 77
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 78
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 79
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0xC0,0x30,0x00,0x00,0xC0,0x3F,0x00,0x00,0x00,0x0F, // 80
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x0C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x36,0x00,0xE0,0x00,0x3C,0x00,0xC0,0x00,0x1C,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x3F,0x00,0x00,0xFF,0x77,0x00,0x00,0xFC,0x61, // 81
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x70,0x00,0x00,0x60,0xF0,0x00,0x00,0x60,0xF0,0x03,0x00,0x60,0xB0,0x07,0x00,0xE0,0x18,0x1F,0x00,0xC0,0x1F,0x3C,0x00,0x80,0x0F,0x30,0x00,0x00,0x00,0x20, // 82
+  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x70,0x30,0x00,0xC0,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 83
+  0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 84
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 85
+  0x20,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xF8,0x01,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0x20, // 86
+  0x60,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x80,0xFF,0x00,0x00,0x00,0xF8,0x0F,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x80,0x3F,0x00,0x00,0xF8,0x0F,0x00,0x80,0xFF,0x00,0x00,0xE0,0x07,0x00,0x00,0x60, // 87
+  0x00,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x60,0x00,0x3C,0x00,0xE0,0x01,0x1E,0x00,0xC0,0x83,0x07,0x00,0x00,0xCF,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0x38,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0xCF,0x03,0x00,0xC0,0x03,0x07,0x00,0xE0,0x01,0x1E,0x00,0x60,0x00,0x3C,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 88
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x3C,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 89
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 90
+  0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06, // 91
+  0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 92
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07, // 93
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xE0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x20, // 94
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06, // 95
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x80, // 96
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 97
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 98
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 99
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 100
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 101
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x60,0x06, // 102
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x83,0x01,0x00,0xF8,0x8F,0x03,0x00,0x1C,0x1C,0x07,0x00,0x0E,0x38,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x0C,0x18,0x07,0x00,0x18,0x8C,0x03,0x00,0xFE,0xFF,0x01,0x00,0xFE,0xFF, // 103
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 104
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F, // 105
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x60,0xFE,0xFF,0x07,0x60,0xFE,0xFF,0x03, // 106
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xF0,0x01,0x00,0x00,0x98,0x07,0x00,0x00,0x0C,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x02,0x30,0x00,0x00,0x00,0x20, // 107
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 108
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 109
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 110
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 111
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 112
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07, // 113
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06, // 114
+  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x31,0x00,0x00,0xC6,0x31,0x00,0x00,0x8E,0x39,0x00,0x00,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 115
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 116
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 117
+  0x00,0x06,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xF8,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 118
+  0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x7C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xF0,0x03,0x00,0x00,0x7E,0x00,0x00,0x00,0x0E, // 119
+  0x00,0x02,0x20,0x00,0x00,0x06,0x30,0x00,0x00,0x1E,0x3C,0x00,0x00,0x38,0x0E,0x00,0x00,0xF0,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x07,0x00,0x00,0x38,0x0E,0x00,0x00,0x1C,0x3C,0x00,0x00,0x0E,0x30,0x00,0x00,0x02,0x20, // 120
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0x00,0xC0,0x1F,0x00,0x00,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 121
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x00,0xE6,0x30,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 122
+  0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x03,0x00,0xC0,0x7F,0xFE,0x03,0xE0,0x3F,0xFC,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06, // 123
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x0F,0xE0,0xFF,0xFF,0x0F, // 124
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0x3F,0xFC,0x07,0xC0,0x7F,0xFF,0x03,0x00,0xC0,0x03,0x00,0x00,0x80,0x01, // 125
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60, // 126
+  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x70,0x30,0x00,0xC2,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 140
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x68,0x1C,0x30,0x00,0x6E,0x0E,0x30,0x00,0x66,0x07,0x30,0x00,0xE2,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 143
+  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x80,0xC6,0x31,0x00,0xE0,0xC6,0x31,0x00,0x60,0x8E,0x39,0x00,0x20,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 156
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x80,0xE6,0x30,0x00,0xE0,0x76,0x30,0x00,0x60,0x3E,0x30,0x00,0x20,0x1E,0x30,0x00,0x00,0x06,0x30, // 159
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE6,0xFF,0x07,0x00,0xE6,0xFF,0x07, // 161
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x9C,0x07,0x00,0x0E,0x78,0x00,0x00,0x06,0x3F,0x00,0x00,0xF6,0x30,0x00,0x00,0x0E,0x30,0x00,0xE0,0x0D,0x1C,0x00,0x00,0x1C,0x0E,0x00,0x00,0x10,0x06, // 162
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x30,0x00,0x00,0x18,0x30,0x00,0x00,0x0C,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x03,0x30,0x00,0x00,0x01,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 163
+  0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x00,0x00,0xF7,0x0E,0x00,0x00,0xFE,0x07,0x00,0x00,0x0C,0x03,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x0C,0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xF7,0x0E,0x00,0x00,0x02,0x04, // 164
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x02,0x80,0x8F,0x01,0x02,0x00,0xFE,0xC1,0x02,0x00,0xF0,0x83,0x03,0x00,0x80,0x0F,0x01,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 165
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x7F,0xF8,0x0F,0xE0,0x7F,0xF8,0x0F, // 166
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0xF3,0xC1,0x00,0xC0,0x1F,0xC3,0x03,0xE0,0x0C,0x07,0x03,0x60,0x1C,0x06,0x06,0x60,0x18,0x0C,0x06,0x60,0x30,0x1C,0x06,0xE0,0x70,0x38,0x07,0xC0,0xE1,0xF4,0x03,0x80,0xC1,0xE7,0x01,0x00,0x80,0x03, // 167
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 168
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x79,0x1C,0x00,0xC0,0xFE,0x19,0x00,0x60,0x86,0x31,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x87,0x33,0x00,0xC0,0x86,0x19,0x00,0xC0,0x85,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8, // 169
+  0x00,0x00,0x00,0x00,0xC0,0x1C,0x00,0x00,0xE0,0x3E,0x00,0x00,0x60,0x32,0x00,0x00,0x60,0x32,0x00,0x00,0xE0,0x3F,0x00,0x00,0xC0,0x3F, // 170
+  0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x84,0x10,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x04,0x10, // 171
+  0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFC,0x01, // 172
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 173
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x01,0x1C,0x00,0xC0,0xFE,0x1B,0x00,0x60,0xFE,0x33,0x00,0x60,0x66,0x30,0x00,0x60,0x66,0x30,0x00,0x60,0xE6,0x30,0x00,0x60,0xFE,0x31,0x00,0x60,0x3C,0x33,0x00,0xC0,0x00,0x1A,0x00,0xC0,0x01,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8, // 174
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x6C,0xE0,0x30,0x00,0x6C,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 175
+  0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x40,0x04,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x40,0x04,0x00,0x00,0x80,0x03, // 176
+  0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0xFF,0x3F,0x00,0x00,0xFF,0x3F,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30, // 177
+  0x40,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x38,0x00,0x00,0x20,0x2C,0x00,0x00,0x20,0x26,0x00,0x00,0xE0,0x23,0x00,0x00,0xC0,0x21, // 178
+  0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C, // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 180
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x00,0x1C,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x1C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 181
+  0x00,0x0F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 183
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0xC0,0x02,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01, // 184
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x02,0x00,0xC6,0x18,0x02,0x00,0xCE,0xCC,0x02,0x00,0xFC,0x9F,0x03,0x00,0xF8,0x3F,0x01,0x00,0x00,0x20, // 185
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xE0,0x38,0x00,0x00,0x60,0x30,0x00,0x00,0xE0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x84,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x80, // 187
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x38,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x0C,0x00,0xC0,0x01,0x0E,0x00,0xE0,0x80,0x0B,0x00,0x60,0xC0,0x08,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,0x00,0x00,0x00,0x08, // 188
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x30,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x4E,0x20,0x00,0x00,0x67,0x30,0x00,0xC0,0x21,0x38,0x00,0xE0,0x20,0x2C,0x00,0x60,0x20,0x26,0x00,0x00,0xE0,0x27,0x00,0x00,0xC0,0x21, // 189
+  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x20,0x00,0x20,0x22,0x30,0x00,0xE0,0x3D,0x38,0x00,0xC0,0x1D,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x0E,0x0C,0x00,0x00,0x07,0x0E,0x00,0x80,0x83,0x0B,0x00,0xE0,0xC0,0x08,0x00,0x60,0xE0,0x3F,0x00,0x20,0xE0,0x3F,0x00,0x00,0x00,0x08, // 190
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0xC0,0xE6,0x30,0x00,0xC0,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 191
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x82,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE8,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 192
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE8,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x82,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 193
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x88,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x08,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 194
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x0C,0xFE,0x01,0x00,0x8E,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xEC,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0E,0xFE,0x01,0x00,0x06,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 195
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x8C,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0C,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 196
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x9C,0x8F,0x01,0x00,0xE2,0x83,0x01,0x00,0x62,0x80,0x01,0x00,0xE2,0x83,0x01,0x00,0x9C,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 197
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 198
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x02,0x60,0x00,0x30,0x02,0x60,0x00,0xF0,0x02,0x60,0x00,0xB0,0x03,0x60,0x00,0x30,0x01,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 199
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 200
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 201
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x02,0x60,0x30,0x30,0x02,0x60,0x30,0xF0,0x02,0x60,0x30,0xB0,0x03,0x60,0x30,0x30,0x01,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 202
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 203
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xEE,0xFF,0x3F,0x00,0x08, // 204
+  0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0xEE,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x02, // 205
+  0x08,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x08, // 206
+  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x0C, // 207
+  0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 208
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0x70,0x00,0x00,0x0E,0xE0,0x01,0x00,0x06,0x80,0x03,0x00,0x02,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 209
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x62,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 210
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 211
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x68,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xE8,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 212
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xCC,0x00,0x18,0x00,0xEE,0x00,0x38,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0xE6,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 213
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xEC,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 214
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x03,0x00,0x00,0x8E,0x03,0x00,0x00,0xDC,0x01,0x00,0x00,0xF8,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xDC,0x01,0x00,0x00,0x8E,0x03,0x00,0x00,0x06,0x03, // 215
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x21,0x00,0x00,0xFF,0x77,0x00,0x80,0x07,0x3F,0x00,0xC0,0x01,0x1E,0x00,0xC0,0x00,0x1F,0x00,0xE0,0x80,0x3B,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x70,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0xE0,0x0E,0x38,0x00,0xC0,0x07,0x18,0x00,0xC0,0x03,0x1C,0x00,0xE0,0x07,0x0F,0x00,0x70,0xFF,0x07,0x00,0x20,0xFC,0x01, // 216
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x02,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 217
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x02,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 218
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x08,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x08,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 219
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 220
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0xF0,0x3F,0x00,0x0E,0xF0,0x3F,0x00,0x06,0x3C,0x00,0x00,0x02,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 221
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x07,0x00,0x00,0x86,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0xF8, // 222
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x3F,0x00,0xC0,0xFF,0x3F,0x00,0xC0,0x00,0x00,0x00,0x60,0x00,0x08,0x00,0x60,0x00,0x1C,0x00,0x60,0x00,0x38,0x00,0xE0,0x78,0x30,0x00,0xC0,0x7F,0x30,0x00,0x80,0xC7,0x30,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x0F, // 223
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x20,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 224
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x80,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x18,0x00,0x20,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 225
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x80,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0x60,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0x80,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 226
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0xC0,0x1C,0x1F,0x00,0xE0,0x8C,0x39,0x00,0x60,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xC0,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xE0,0xCE,0x0C,0x00,0x60,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 227
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0xC0,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xC0,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 228
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x70,0x86,0x31,0x00,0x88,0x86,0x31,0x00,0x88,0xC6,0x30,0x00,0x88,0xC6,0x18,0x00,0x70,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 229
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x0E,0x38,0x00,0x20,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 230
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x02,0x00,0x06,0x30,0x02,0x00,0x06,0xF0,0x02,0x00,0x06,0xB0,0x03,0x00,0x0E,0x38,0x01,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 231
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x20,0xCE,0x38,0x00,0x60,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 232
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x80,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x20,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 233
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x02,0x00,0xC6,0x30,0x02,0x00,0xCE,0xF8,0x02,0x00,0xDC,0x98,0x03,0x00,0xF8,0x0C,0x01,0x00,0xF0,0x04, // 234
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 235
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0xE0,0xFE,0x3F,0x00,0x80, // 236
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0x20, // 237
+  0x80,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0x80, // 238
+  0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0xC0, // 239
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1D,0x1C,0x00,0xA0,0x0F,0x38,0x00,0xA0,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0F,0x38,0x00,0x20,0x1F,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xE0,0x07, // 240
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x80,0x06,0x00,0x00,0xE0,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x20,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 241
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x20,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 242
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x20,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 243
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x80,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0x80,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 244
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0xC0,0x1C,0x1C,0x00,0xE0,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xE0,0x1C,0x1C,0x00,0x60,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 245
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 246
+  0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0xB6,0x01,0x00,0x00,0xB6,0x01,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 247
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x67,0x00,0x00,0xF8,0x7F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x3F,0x00,0x00,0x86,0x33,0x00,0x00,0xE6,0x31,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xFF,0x0F,0x00,0x00,0xF3,0x07, // 248
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x20,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 249
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x18,0x00,0x20,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 250
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x80,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0x80,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 251
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0xC0,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 252
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x80,0x00,0xFE,0x03,0xE0,0x00,0xFC,0x00,0x60,0xC0,0x1F,0x00,0x20,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 253
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x00,0x1C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x03, // 254
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0xC0,0xF0,0x01,0x06,0xC0,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0xC0,0xC0,0x1F,0x00,0xC0,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06 // 255
+};
+#endif // ARIALMT_WIN1250_PLAIN_24_H
diff --git a/src/CharsetConverter.cpp b/src/CharsetConverter.cpp
new file mode 100644
index 00000000..2ba72977
--- /dev/null
+++ b/src/CharsetConverter.cpp
@@ -0,0 +1,76 @@
+#include <arduino.h>
+#include "CharsetConverter.h"
+
+// In ESP8266 Arduino core v2.3.0 missing bsearch: https://github.com/esp8266/Arduino/issues/2314
+// Part of GNU C Library
+void * gnu_c_bsearch (const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *)) {
+  size_t l, u, idx;
+  const void *p;
+  int comparison;
+
+  l = 0;
+  u = nmemb;
+  while (l < u) {
+    idx = (l + u) / 2;
+
+    p = (void *) (((const char *) base) + (idx * size));
+    comparison = (*compar) (key, p);
+    if (comparison < 0)
+      u = idx;
+    else if (comparison > 0)
+      l = idx + 1;
+    else
+      return (void *) p;
+  }
+
+  return NULL;
+}
+
+// compare function for bsearch
+int charset_table_cmp(const void* p_key, const void* p_item) {
+  const uint16_t key = *(uint16_t *) p_key;
+  const uint16_t item = (*((char *) p_item)) << 8 | *(((char *) p_item) + 1);
+
+  if (key < item) return -1;
+  else if (key == item) return 0;
+  else return 1;
+}
+
+// convert utf-8 character to windows-1250
+// if utf-8 char continue with next byte, returns 0, otherwise windows-1250 char
+// for unconvertable char returns 0
+char utf8win1250(const uint8_t ch) {
+  static uint16_t uChar;
+  static uint8_t len;
+  char *found;
+
+  if ((ch & 0x80) == 0x00) {
+    uChar = len = 0;
+    return ch;
+  } else if ((ch & 0xE0) == 0xC0) {
+    uChar = ch & 0x1F; len = 1;
+    return 0;
+  } else if ((ch & 0xF0) == 0xE0) {
+    uChar = ch & 0x0F; len = 2;
+    return 0;
+  } else if ((ch & 0xF8) == 0xF0) {
+    uChar = ch & 0x07; len = 3;
+    return 0;
+  } else if ((ch & 0xC0) == 0x80 && len > 0) {
+    uChar = (uChar << 6) | (ch & 0x7F); len--;
+    if (len > 0)
+      return 0;
+  } else {
+    uChar = len = 0;
+    return 0;
+  }
+
+  found = (char*) gnu_c_bsearch(&uChar, utf8_win1250_table + 1, utf8_win1250_table[0], 3 * sizeof(char), charset_table_cmp);
+
+  if (found != NULL) {
+    uChar = len = 0;
+    return *(found + 2); // return win1250 char at 3rd position;
+  }
+
+  return 0;
+}
diff --git a/src/CharsetConverter.h b/src/CharsetConverter.h
new file mode 100644
index 00000000..ab3c6234
--- /dev/null
+++ b/src/CharsetConverter.h
@@ -0,0 +1,140 @@
+#ifndef CHARSETCONVERTER_H
+#define CHARSETCONVERTER_H
+
+#include <arduino.h>
+
+char utf8win1250(const uint8_t ch);
+
+const char utf8_win1250_table[] = {
+  0x7A,              // length of table
+
+  // format: 0xaa, 0xbb, 0xcc
+  // 0xaabb (unicode)
+  // 0xcc (win1250)
+  // sorted by unicode to search with bsearch
+  0x00, 0xA0, 0xA0,  // 0xA0 = NO-BREAK SPACE
+  0x00, 0xA4, 0xA4,  // 0xA4 = CURRENCY SIGN
+  0x00, 0xA6, 0xA6,  // 0xA6 = BROKEN BAR
+  0x00, 0xA7, 0xA7,  // 0xA7 = SECTION SIGN
+  0x00, 0xA8, 0xA8,  // 0xA8 = DIAERESIS
+  0x00, 0xA9, 0xA9,  // 0xA9 = COPYRIGHT SIGN
+  0x00, 0xAB, 0xAB,  // 0xAB = LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+  0x00, 0xAC, 0xAC,  // 0xAC = NOT SIGN
+  0x00, 0xAD, 0xAD,  // 0xAD = SOFT HYPHEN
+  0x00, 0xAE, 0xAE,  // 0xAE = REGISTERED SIGN
+  0x00, 0xB0, 0xB0,  // 0xB0 = DEGREE SIGN
+  0x00, 0xB1, 0xB1,  // 0xB1 = PLUS-MINUS SIGN
+  0x00, 0xB4, 0xB4,  // 0xB4 = ACUTE ACCENT
+  0x00, 0xB5, 0xB5,  // 0xB5 = MICRO SIGN
+  0x00, 0xB6, 0xB6,  // 0xB6 = PILCROW SIGN
+  0x00, 0xB7, 0xB7,  // 0xB7 = MIDDLE DOT
+  0x00, 0xB8, 0xB8,  // 0xB8 = CEDILLA
+  0x00, 0xBB, 0xBB,  // 0xBB = RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+  0x00, 0xC1, 0xC1,  // 0xC1 = LATIN CAPITAL LETTER A WITH ACUTE
+  0x00, 0xC2, 0xC2,  // 0xC2 = LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+  0x00, 0xC4, 0xC4,  // 0xC4 = LATIN CAPITAL LETTER A WITH DIAERESIS
+  0x00, 0xC7, 0xC7,  // 0xC7 = LATIN CAPITAL LETTER C WITH CEDILLA
+  0x00, 0xC9, 0xC9,  // 0xC9 = LATIN CAPITAL LETTER E WITH ACUTE
+  0x00, 0xCB, 0xCB,  // 0xCB = LATIN CAPITAL LETTER E WITH DIAERESIS
+  0x00, 0xCD, 0xCD,  // 0xCD = LATIN CAPITAL LETTER I WITH ACUTE
+  0x00, 0xCE, 0xCE,  // 0xCE = LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+  0x00, 0xD3, 0xD3,  // 0xD3 = LATIN CAPITAL LETTER O WITH ACUTE
+  0x00, 0xD4, 0xD4,  // 0xD4 = LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+  0x00, 0xD6, 0xD6,  // 0xD6 = LATIN CAPITAL LETTER O WITH DIAERESIS
+  0x00, 0xD7, 0xD7,  // 0xD7 = MULTIPLICATION SIGN
+  0x00, 0xDA, 0xDA,  // 0xDA = LATIN CAPITAL LETTER U WITH ACUTE
+  0x00, 0xDC, 0xDC,  // 0xDC = LATIN CAPITAL LETTER U WITH DIAERESIS
+  0x00, 0xDD, 0xDD,  // 0xDD = LATIN CAPITAL LETTER Y WITH ACUTE
+  0x00, 0xDF, 0xDF,  // 0xDF = LATIN SMALL LETTER SHARP S
+  0x00, 0xE1, 0xE1,  // 0xE1 = LATIN SMALL LETTER A WITH ACUTE
+  0x00, 0xE2, 0xE2,  // 0xE2 = LATIN SMALL LETTER A WITH CIRCUMFLEX
+  0x00, 0xE4, 0xE4,  // 0xE4 = LATIN SMALL LETTER A WITH DIAERESIS
+  0x00, 0xE7, 0xE7,  // 0xE7 = LATIN SMALL LETTER C WITH CEDILLA
+  0x00, 0xE9, 0xE9,  // 0xE9 = LATIN SMALL LETTER E WITH ACUTE
+  0x00, 0xEB, 0xEB,  // 0xEB = LATIN SMALL LETTER E WITH DIAERESIS
+  0x00, 0xED, 0xED,  // 0xED = LATIN SMALL LETTER I WITH ACUTE
+  0x00, 0xEE, 0xEE,  // 0xEE = LATIN SMALL LETTER I WITH CIRCUMFLEX
+  0x00, 0xF3, 0xF3,  // 0xF3 = LATIN SMALL LETTER O WITH ACUTE
+  0x00, 0xF4, 0xF4,  // 0xF4 = LATIN SMALL LETTER O WITH CIRCUMFLEX
+  0x00, 0xF6, 0xF6,  // 0xF6 = LATIN SMALL LETTER O WITH DIAERESIS
+  0x00, 0xF7, 0xF7,  // 0xF7 = DIVISION SIGN
+  0x00, 0xFA, 0xFA,  // 0xFA = LATIN SMALL LETTER U WITH ACUTE
+  0x00, 0xFC, 0xFC,  // 0xFC = LATIN SMALL LETTER U WITH DIAERESIS
+  0x00, 0xFD, 0xFD,  // 0xFD = LATIN SMALL LETTER Y WITH ACUTE
+  0x01, 0x02, 0xC3,  // 0xC3 = LATIN CAPITAL LETTER A WITH BREVE
+  0x01, 0x03, 0xE3,  // 0xE3 = LATIN SMALL LETTER A WITH BREVE
+  0x01, 0x04, 0xA5,  // 0xA5 = LATIN CAPITAL LETTER A WITH OGONEK
+  0x01, 0x05, 0xB9,  // 0xB9 = LATIN SMALL LETTER A WITH OGONEK
+  0x01, 0x06, 0xC6,  // 0xC6 = LATIN CAPITAL LETTER C WITH ACUTE
+  0x01, 0x07, 0xE6,  // 0xE6 = LATIN SMALL LETTER C WITH ACUTE
+  0x01, 0x0C, 0xC8,  // 0xC8 = LATIN CAPITAL LETTER C WITH CARON
+  0x01, 0x0D, 0xE8,  // 0xE8 = LATIN SMALL LETTER C WITH CARON
+  0x01, 0x0E, 0xCF,  // 0xCF = LATIN CAPITAL LETTER D WITH CARON
+  0x01, 0x0F, 0xEF,  // 0xEF = LATIN SMALL LETTER D WITH CARON
+  0x01, 0x10, 0xD0,  // 0xD0 = LATIN CAPITAL LETTER D WITH STROKE
+  0x01, 0x11, 0xF0,  // 0xF0 = LATIN SMALL LETTER D WITH STROKE
+  0x01, 0x18, 0xCA,  // 0xCA = LATIN CAPITAL LETTER E WITH OGONEK
+  0x01, 0x19, 0xEA,  // 0xEA = LATIN SMALL LETTER E WITH OGONEK
+  0x01, 0x1A, 0xCC,  // 0xCC = LATIN CAPITAL LETTER E WITH CARON
+  0x01, 0x1B, 0xEC,  // 0xEC = LATIN SMALL LETTER E WITH CARON
+  0x01, 0x39, 0xC5,  // 0xC5 = LATIN CAPITAL LETTER L WITH ACUTE
+  0x01, 0x3A, 0xE5,  // 0xE5 = LATIN SMALL LETTER L WITH ACUTE
+  0x01, 0x3D, 0xBC,  // 0xBC = LATIN CAPITAL LETTER L WITH CARON
+  0x01, 0x3E, 0xBE,  // 0xBE = LATIN SMALL LETTER L WITH CARON
+  0x01, 0x41, 0xA3,  // 0xA3 = LATIN CAPITAL LETTER L WITH STROKE
+  0x01, 0x42, 0xB3,  // 0xB3 = LATIN SMALL LETTER L WITH STROKE
+  0x01, 0x43, 0xD1,  // 0xD1 = LATIN CAPITAL LETTER N WITH ACUTE
+  0x01, 0x44, 0xF1,  // 0xF1 = LATIN SMALL LETTER N WITH ACUTE
+  0x01, 0x47, 0xD2,  // 0xD2 = LATIN CAPITAL LETTER N WITH CARON
+  0x01, 0x48, 0xF2,  // 0xF2 = LATIN SMALL LETTER N WITH CARON
+  0x01, 0x50, 0xD5,  // 0xD5 = LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+  0x01, 0x51, 0xF5,  // 0xF5 = LATIN SMALL LETTER O WITH DOUBLE ACUTE
+  0x01, 0x54, 0xC0,  // 0xC0 = LATIN CAPITAL LETTER R WITH ACUTE
+  0x01, 0x55, 0xE0,  // 0xE0 = LATIN SMALL LETTER R WITH ACUTE
+  0x01, 0x58, 0xD8,  // 0xD8 = LATIN CAPITAL LETTER R WITH CARON
+  0x01, 0x59, 0xF8,  // 0xF8 = LATIN SMALL LETTER R WITH CARON
+  0x01, 0x5A, 0x8C,  // 0x8C = LATIN CAPITAL LETTER S WITH ACUTE
+  0x01, 0x5B, 0x9C,  // 0x9C = LATIN SMALL LETTER S WITH ACUTE
+  0x01, 0x5E, 0xAA,  // 0xAA = LATIN CAPITAL LETTER S WITH CEDILLA
+  0x01, 0x5F, 0xBA,  // 0xBA = LATIN SMALL LETTER S WITH CEDILLA
+  0x01, 0x60, 0x8A,  // 0x8A = LATIN CAPITAL LETTER S WITH CARON
+  0x01, 0x61, 0x9A,  // 0x9A = LATIN SMALL LETTER S WITH CARON
+  0x01, 0x62, 0xDE,  // 0xDE = LATIN CAPITAL LETTER T WITH CEDILLA
+  0x01, 0x63, 0xFE,  // 0xFE = LATIN SMALL LETTER T WITH CEDILLA
+  0x01, 0x64, 0x8D,  // 0x8D = LATIN CAPITAL LETTER T WITH CARON
+  0x01, 0x65, 0x9D,  // 0x9D = LATIN SMALL LETTER T WITH CARON
+  0x01, 0x6E, 0xD9,  // 0xD9 = LATIN CAPITAL LETTER U WITH RING ABOVE
+  0x01, 0x6F, 0xF9,  // 0xF9 = LATIN SMALL LETTER U WITH RING ABOVE
+  0x01, 0x70, 0xDB,  // 0xDB = LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+  0x01, 0x71, 0xFB,  // 0xFB = LATIN SMALL LETTER U WITH DOUBLE ACUTE
+  0x01, 0x79, 0x8F,  // 0x8F = LATIN CAPITAL LETTER Z WITH ACUTE
+  0x01, 0x7A, 0x9F,  // 0x9F = LATIN SMALL LETTER Z WITH ACUTE
+  0x01, 0x7B, 0xAF,  // 0xAF = LATIN CAPITAL LETTER Z WITH DOT ABOVE
+  0x01, 0x7C, 0xBF,  // 0xBF = LATIN SMALL LETTER Z WITH DOT ABOVE
+  0x01, 0x7D, 0x8E,  // 0x8E = LATIN CAPITAL LETTER Z WITH CARON
+  0x01, 0x7E, 0x9E,  // 0x9E = LATIN SMALL LETTER Z WITH CARON
+  0x02, 0xC7, 0xA1,  // 0xA1 = CARON
+  0x02, 0xD8, 0xA2,  // 0xA2 = BREVE
+  0x02, 0xD9, 0xFF,  // 0xFF = DOT ABOVE
+  0x02, 0xDB, 0xB2,  // 0xB2 = OGONEK
+  0x02, 0xDD, 0xBD,  // 0xBD = DOUBLE ACUTE ACCENT
+  0x20, 0x13, 0x96,  // 0x96 = EN DASH
+  0x20, 0x14, 0x97,  // 0x97 = EM DASH
+  0x20, 0x18, 0x91,  // 0x91 = LEFT SINGLE QUOTATION MARK
+  0x20, 0x19, 0x92,  // 0x92 = RIGHT SINGLE QUOTATION MARK
+  0x20, 0x1A, 0x82,  // 0x82 = SINGLE LOW-9 QUOTATION MARK
+  0x20, 0x1C, 0x93,  // 0x93 = LEFT DOUBLE QUOTATION MARK
+  0x20, 0x1D, 0x94,  // 0x94 = RIGHT DOUBLE QUOTATION MARK
+  0x20, 0x1E, 0x84,  // 0x84 = DOUBLE LOW-9 QUOTATION MARK
+  0x20, 0x20, 0x86,  // 0x86 = DAGGER
+  0x20, 0x21, 0x87,  // 0x87 = DOUBLE DAGGER
+  0x20, 0x22, 0x95,  // 0x95 = BULLET
+  0x20, 0x26, 0x85,  // 0x85 = HORIZONTAL ELLIPSIS
+  0x20, 0x30, 0x89,  // 0x89 = PER MILLE SIGN
+  0x20, 0x39, 0x8B,  // 0x8B = SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+  0x20, 0x3A, 0x9B,  // 0x9B = SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+  0x20, 0xAC, 0x80,  // 0x80 = EURO SIGN
+  0x21, 0x22, 0x99   // 0x99 = TRADE MARK SIGN
+};
+
+#endif
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index f07f0713..3cb8a81a 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -5,7 +5,7 @@
 #define supla_lib_config_h_  // silences unnecessary debug messages "should be disabled by default"
 #endif
 
-//#define USE_CUSTOM
+#define USE_CUSTOM
 
 // User configuration
 #ifdef USE_CUSTOM
@@ -38,7 +38,7 @@
 #define SUPLA_SHT3x
 #define SUPLA_SI7021
 #define SUPLA_OLED
-//#define SUPLA_MCP23017
+// #define SUPLA_MCP23017
 // #define SUPLA_HTU21D    // 0x40 NOT SUPPORTED
 // #define SUPLA_SHT71     // 0x44 AND 0x45 NOT SUPPORTED
 // #define SUPLA_BH1750    // 0x23 AND 0x5C NOT SUPPORTED
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index d05fb556..29461aa5 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -1,5 +1,9 @@
 #include "SuplaOled.h"
 #include "SuplaDeviceGUI.h"
+#include "CharsetConverter.h"
+#include "ArialMT_Win1250_Plain_10.h"
+#include "ArialMT_Win1250_Plain_16.h"
+#include "ArialMT_Win1250_Plain_24.h"
 
 #ifdef SUPLA_OLED
 
@@ -52,7 +56,7 @@ void displayUiSignal(OLEDDisplay* display) {
   display->fillRect(x, y, x + 46, 16);
   display->setColor(WHITE);
   if (value == -1) {
-    display->setFont(ArialMT_Plain_10);
+    display->setFont(ArialMT_Win1250_Plain_10);
     display->drawString(x + 1, y, "x");
   }
   else {
@@ -75,7 +79,7 @@ void displayUiRelayState(OLEDDisplay* display) {
   int y = 0;
   int x = 0;
 
-  display->setFont(ArialMT_Plain_10);
+  display->setFont(ArialMT_Win1250_Plain_10);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
   for (int i = 0; i < Supla::GUI::relay.size(); i++) {
     if (Supla::GUI::relay[i]->isOn()) {
@@ -112,7 +116,7 @@ void displayUiSuplaStatus(OLEDDisplay* display) {
 
   displayUiSignal(display);
 
-  display->setFont(ArialMT_Plain_10);
+  display->setFont(ArialMT_Win1250_Plain_10);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
   display->setColor(WHITE);
   display->drawStringMaxWidth(x, y, display->getWidth(), ConfigESP->supla_status.msg);
@@ -121,7 +125,7 @@ void displayUiSuplaStatus(OLEDDisplay* display) {
 
 void displayConfigMode(OLEDDisplay* display) {
   display->clear();
-  display->setFont(ArialMT_Plain_10);
+  display->setFont(ArialMT_Win1250_Plain_10);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
   display->setColor(WHITE);
   display->drawString(0, 15, F("Tryb konfiguracyjny"));
@@ -134,7 +138,7 @@ void displayConfigMode(OLEDDisplay* display) {
 void displayUiBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
   // display->drawXbm(10, 17, supla_logo_width, supla_logo_height, supla_logo_bits);
   display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->setFont(ArialMT_Plain_16);
+  display->setFont(ArialMT_Win1250_Plain_16);
   display->drawString(10, display->getHeight() / 2, F("SUPLA"));
 }
 
@@ -159,13 +163,13 @@ void displayUiTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16
   }
 
   if (name != NULL) {
-    display->setFont(ArialMT_Plain_10);
+    display->setFont(ArialMT_Win1250_Plain_10);
     display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
   }
 
-  display->setFont(ArialMT_Plain_24);
+  display->setFont(ArialMT_Win1250_Plain_24);
   display->drawString(x + temp_width, y + drawStringIcon, getTempString(temp));
-  display->setFont(ArialMT_Plain_16);
+  display->setFont(ArialMT_Win1250_Plain_16);
   display->drawString(x + temp_width + (getTempString(temp).length() * 12), y + drawStringIcon, "ºC");
 }
 
@@ -189,13 +193,13 @@ void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x
   }
 
   if (name != NULL) {
-    display->setFont(ArialMT_Plain_10);
+    display->setFont(ArialMT_Win1250_Plain_10);
     display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
   }
 
-  display->setFont(ArialMT_Plain_24);
+  display->setFont(ArialMT_Win1250_Plain_24);
   display->drawString(x + humidity_width, y + drawStringIcon, getHumidityString(humidity));
-  display->setFont(ArialMT_Plain_16);
+  display->setFont(ArialMT_Win1250_Plain_16);
   display->drawString(x + humidity_width + (getHumidityString(humidity).length() * 12), y + drawStringIcon, "%");
 }
 
@@ -219,13 +223,13 @@ void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t
   }
 
   if (name != NULL) {
-    display->setFont(ArialMT_Plain_10);
+    display->setFont(ArialMT_Win1250_Plain_10);
     display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
   }
 
-  display->setFont(ArialMT_Plain_24);
+  display->setFont(ArialMT_Win1250_Plain_24);
   display->drawString(x + pressure_width, y + drawStringIcon, getPressureString(pressure));
-  display->setFont(ArialMT_Plain_16);
+  display->setFont(ArialMT_Win1250_Plain_16);
   display->drawString(x + pressure_width + (getPressureString(pressure).length() * 14), y + drawStringIcon, "hPa");
 }
 
@@ -369,6 +373,7 @@ SuplaOled::SuplaOled() {
 
     display->setBrightness(255);
     display->flipScreenVertically();
+    display->setFontTableLookupFunction(&utf8win1250);
   }
 }
 
@@ -423,4 +428,4 @@ void SuplaOled::handleAction(int event, int action) {
     oledON = true;
   }
 }
-#endif
\ No newline at end of file
+#endif

From 5e06993cb1436e71962faeaba943a568bb1b5c9e Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 21 Feb 2021 17:15:39 +0100
Subject: [PATCH 101/165] =?UTF-8?q?Zmiana=20liter=20w=20include=20zgodna?=
 =?UTF-8?q?=20z=20nazw=C4=85=20pliku=20nag=C5=82=C3=B3wkowego=20(dla=20lin?=
 =?UTF-8?q?uksa)=20Wy=C5=82=C4=85czenie=20USE=5FCUSTOM=20w=20konfigu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/CharsetConverter.cpp | 2 +-
 src/CharsetConverter.h   | 2 +-
 src/GUI-Generic_Config.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CharsetConverter.cpp b/src/CharsetConverter.cpp
index 2ba72977..14790b26 100644
--- a/src/CharsetConverter.cpp
+++ b/src/CharsetConverter.cpp
@@ -1,4 +1,4 @@
-#include <arduino.h>
+#include <Arduino.h>
 #include "CharsetConverter.h"
 
 // In ESP8266 Arduino core v2.3.0 missing bsearch: https://github.com/esp8266/Arduino/issues/2314
diff --git a/src/CharsetConverter.h b/src/CharsetConverter.h
index ab3c6234..9731ab61 100644
--- a/src/CharsetConverter.h
+++ b/src/CharsetConverter.h
@@ -1,7 +1,7 @@
 #ifndef CHARSETCONVERTER_H
 #define CHARSETCONVERTER_H
 
-#include <arduino.h>
+#include <Arduino.h>
 
 char utf8win1250(const uint8_t ch);
 
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 3cb8a81a..d3210ca7 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -5,7 +5,7 @@
 #define supla_lib_config_h_  // silences unnecessary debug messages "should be disabled by default"
 #endif
 
-#define USE_CUSTOM
+// #define USE_CUSTOM
 
 // User configuration
 #ifdef USE_CUSTOM

From 40d9e483d21a280f5174aae81e3776093ea75437 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 21 Feb 2021 17:17:36 +0100
Subject: [PATCH 102/165] =?UTF-8?q?Zmiana=20liter=20w=20include=20zgodna?=
 =?UTF-8?q?=20z=20nazw=C4=85=20pliku=20nag=C5=82=C3=B3wkowego=20(dla=20lin?=
 =?UTF-8?q?uksa)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/SuplaDevice/src/supla/sensor/HJ101.cpp | 356 ++++++++++-----------
 1 file changed, 178 insertions(+), 178 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
index 80253563..bb0f5a34 100644
--- a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
@@ -1,178 +1,178 @@
-#include "hj101.h"
-
-namespace Supla {
-namespace Sensor {
-
-HJ101::HJ101(int8_t pinCF,
-             int8_t pinCF1,
-             int8_t pinSEL,
-             bool currentWhen,
-             bool use_interrupts)
-    : pinCF(pinCF),
-      pinCF1(pinCF1),
-      pinSEL(pinSEL),
-      currentWhen(currentWhen),
-      use_interrupts(use_interrupts) {
-  hj101 = new HLW8012();
-  hj101->begin(pinCF, pinCF1, pinSEL, currentWhen, use_interrupts);
-
-  attachInterrupt(pinCF, hjl01_cf_interrupt, FALLING);
-  attachInterrupt(pinCF1, hjl01_cf1_interrupt, FALLING);
-}
-
-void HJ101::onInit() {
-  readValuesFromDevice();
-  updateChannelValues();
-}
-
-void HJ101::readValuesFromDevice() {
-  energy = _energy +
-           (hj101->getEnergy() / 36);  // current energy value = value at start
-
-  unsigned int _reactive = 0;
-  double _pf = 0;
-  double _current = hj101->getCurrent();
-  unsigned int _voltage = hj101->getVoltage();
-  unsigned int _active = hj101->getActivePower();
-  unsigned int _apparent = _voltage * _current;
-  if (_apparent > _active) {
-    _reactive = sqrt(_apparent * _apparent - _active * _active);
-  } else {
-    _reactive = 0;
-  }
-  if (_active > _apparent) {
-    _pf = 1;
-  }
-  if (_apparent == 0) {
-    _pf = 0;
-  } else {
-    _pf = (double)_active / _apparent;
-  }
-  setVoltage(0, _voltage * 100);            // voltage in 0.01 V
-  setCurrent(0, _current * 1000);           // current in 0.001 A
-  setPowerActive(0, _active * 100000);      // power in 0.00001 kW
-  setFwdActEnergy(0, energy);               // energy in 0.00001 kWh
-  setPowerApparent(0, _apparent * 100000);  // power in 0.00001 kVA
-  setPowerReactive(0, _reactive * 100000);  // power in 0.00001 kvar
-  setPowerFactor(0, _pf * 1000);            // power in 0.001
-}
-
-void HJ101::onSaveState() {
-  double current_multiplier = getCurrentMultiplier();
-  double voltage_multiplier = getVoltageMultiplier();
-  double power_multiplier = getPowerMultiplier();
-
-  Supla::Storage::WriteState((unsigned char *)&energy, sizeof(energy));
-  Supla::Storage::WriteState((unsigned char *)&current_multiplier,
-                             sizeof(current_multiplier));
-  Supla::Storage::WriteState((unsigned char *)&voltage_multiplier,
-                             sizeof(voltage_multiplier));
-  Supla::Storage::WriteState((unsigned char *)&power_multiplier,
-                             sizeof(power_multiplier));
-}
-
-void HJ101::onLoadState() {
-  double current_multiplier;
-  double voltage_multiplier;
-  double power_multiplier;
-
-  if (Supla::Storage::ReadState((unsigned char *)&energy, sizeof(energy))) {
-    setCounter(energy);
-  }
-
-  if (Supla::Storage::ReadState((unsigned char *)&current_multiplier,
-                                sizeof(current_multiplier))) {
-    setCurrentMultiplier(current_multiplier);
-  }
-
-  if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier,
-                                sizeof(voltage_multiplier))) {
-    setVoltageMultiplier(voltage_multiplier);
-  }
-
-  if (Supla::Storage::ReadState((unsigned char *)&power_multiplier,
-                                sizeof(power_multiplier))) {
-    setPowerMultiplier(power_multiplier);
-  }
-}
-
-double HJ101::getCurrentMultiplier() {
-  return hj101->getCurrentMultiplier();
-};
-
-double HJ101::getVoltageMultiplier() {
-  return hj101->getVoltageMultiplier();
-};
-
-double HJ101::getPowerMultiplier() {
-  return hj101->getPowerMultiplier();
-};
-
-_supla_int64_t HJ101::getCounter() {
-  return energy;
-}
-
-void HJ101::setCurrentMultiplier(double current_multiplier) {
-  hj101->setCurrentMultiplier(current_multiplier);
-};
-void HJ101::setVoltageMultiplier(double voltage_multiplier) {
-  hj101->setVoltageMultiplier(voltage_multiplier);
-};
-void HJ101::setPowerMultiplier(double power_multiplier) {
-  hj101->setPowerMultiplier(power_multiplier);
-};
-
-void HJ101::setCounter(_supla_int64_t energy) {
-  _energy = energy;  // ------- energy value read from memory at startup
-  setFwdActEnergy(0, energy);
-}
-
-// When using interrupts we have to call the library entry point
-// whenever an interrupt is triggered
-void ICACHE_RAM_ATTR HJ101::hjl01_cf1_interrupt() {
-  hj101->cf1_interrupt();
-}
-
-void ICACHE_RAM_ATTR HJ101::hjl01_cf_interrupt() {
-  hj101->cf_interrupt();
-}
-
-void HJ101::calibrate(double calibPower, double calibVoltage) {
-  unsigned long timeout1 = millis();
-  while ((millis() - timeout1) < 10000) {
-    delay(10);
-  }
-
-  Serial.print(F("[HLW] Active Power (W)    : "));
-  Serial.println(hj101->getActivePower());
-  Serial.print(F("[HLW] Voltage (V)         : "));
-  Serial.println(hj101->getVoltage());
-  Serial.print(F("[HLW] Current (A)         : "));
-  Serial.println(hj101->getCurrent());
-
-  hj101->expectedActivePower(calibPower);
-  hj101->expectedVoltage(calibVoltage);
-  hj101->expectedCurrent(calibPower / calibVoltage);
-
-  unsigned long timeout2 = millis();
-  while ((millis() - timeout2) < 2000) {
-    delay(10);
-  }
-
-  double current_multi = getCurrentMultiplier();
-  double voltage_multi = getVoltageMultiplier();
-  double power_multi = getPowerMultiplier();
-
-  Serial.print(F("[HLW] New current multiplier : "));
-  Serial.println(current_multi);
-  Serial.print(F("[HLW] New voltage multiplier : "));
-  Serial.println(voltage_multi);
-  Serial.print(F("[HLW] New power multiplier   : "));
-  Serial.println(power_multi);
-  Supla::Storage::ScheduleSave(2000);
-  yield();
-}
-
-HLW8012 *HJ101::hj101 = nullptr;
-};  // namespace Sensor
-};  // namespace Supla
\ No newline at end of file
+#include "HJ101.h"
+
+namespace Supla {
+namespace Sensor {
+
+HJ101::HJ101(int8_t pinCF,
+             int8_t pinCF1,
+             int8_t pinSEL,
+             bool currentWhen,
+             bool use_interrupts)
+    : pinCF(pinCF),
+      pinCF1(pinCF1),
+      pinSEL(pinSEL),
+      currentWhen(currentWhen),
+      use_interrupts(use_interrupts) {
+  hj101 = new HLW8012();
+  hj101->begin(pinCF, pinCF1, pinSEL, currentWhen, use_interrupts);
+
+  attachInterrupt(pinCF, hjl01_cf_interrupt, FALLING);
+  attachInterrupt(pinCF1, hjl01_cf1_interrupt, FALLING);
+}
+
+void HJ101::onInit() {
+  readValuesFromDevice();
+  updateChannelValues();
+}
+
+void HJ101::readValuesFromDevice() {
+  energy = _energy +
+           (hj101->getEnergy() / 36);  // current energy value = value at start
+
+  unsigned int _reactive = 0;
+  double _pf = 0;
+  double _current = hj101->getCurrent();
+  unsigned int _voltage = hj101->getVoltage();
+  unsigned int _active = hj101->getActivePower();
+  unsigned int _apparent = _voltage * _current;
+  if (_apparent > _active) {
+    _reactive = sqrt(_apparent * _apparent - _active * _active);
+  } else {
+    _reactive = 0;
+  }
+  if (_active > _apparent) {
+    _pf = 1;
+  }
+  if (_apparent == 0) {
+    _pf = 0;
+  } else {
+    _pf = (double)_active / _apparent;
+  }
+  setVoltage(0, _voltage * 100);            // voltage in 0.01 V
+  setCurrent(0, _current * 1000);           // current in 0.001 A
+  setPowerActive(0, _active * 100000);      // power in 0.00001 kW
+  setFwdActEnergy(0, energy);               // energy in 0.00001 kWh
+  setPowerApparent(0, _apparent * 100000);  // power in 0.00001 kVA
+  setPowerReactive(0, _reactive * 100000);  // power in 0.00001 kvar
+  setPowerFactor(0, _pf * 1000);            // power in 0.001
+}
+
+void HJ101::onSaveState() {
+  double current_multiplier = getCurrentMultiplier();
+  double voltage_multiplier = getVoltageMultiplier();
+  double power_multiplier = getPowerMultiplier();
+
+  Supla::Storage::WriteState((unsigned char *)&energy, sizeof(energy));
+  Supla::Storage::WriteState((unsigned char *)&current_multiplier,
+                             sizeof(current_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&voltage_multiplier,
+                             sizeof(voltage_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&power_multiplier,
+                             sizeof(power_multiplier));
+}
+
+void HJ101::onLoadState() {
+  double current_multiplier;
+  double voltage_multiplier;
+  double power_multiplier;
+
+  if (Supla::Storage::ReadState((unsigned char *)&energy, sizeof(energy))) {
+    setCounter(energy);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&current_multiplier,
+                                sizeof(current_multiplier))) {
+    setCurrentMultiplier(current_multiplier);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier,
+                                sizeof(voltage_multiplier))) {
+    setVoltageMultiplier(voltage_multiplier);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&power_multiplier,
+                                sizeof(power_multiplier))) {
+    setPowerMultiplier(power_multiplier);
+  }
+}
+
+double HJ101::getCurrentMultiplier() {
+  return hj101->getCurrentMultiplier();
+};
+
+double HJ101::getVoltageMultiplier() {
+  return hj101->getVoltageMultiplier();
+};
+
+double HJ101::getPowerMultiplier() {
+  return hj101->getPowerMultiplier();
+};
+
+_supla_int64_t HJ101::getCounter() {
+  return energy;
+}
+
+void HJ101::setCurrentMultiplier(double current_multiplier) {
+  hj101->setCurrentMultiplier(current_multiplier);
+};
+void HJ101::setVoltageMultiplier(double voltage_multiplier) {
+  hj101->setVoltageMultiplier(voltage_multiplier);
+};
+void HJ101::setPowerMultiplier(double power_multiplier) {
+  hj101->setPowerMultiplier(power_multiplier);
+};
+
+void HJ101::setCounter(_supla_int64_t energy) {
+  _energy = energy;  // ------- energy value read from memory at startup
+  setFwdActEnergy(0, energy);
+}
+
+// When using interrupts we have to call the library entry point
+// whenever an interrupt is triggered
+void ICACHE_RAM_ATTR HJ101::hjl01_cf1_interrupt() {
+  hj101->cf1_interrupt();
+}
+
+void ICACHE_RAM_ATTR HJ101::hjl01_cf_interrupt() {
+  hj101->cf_interrupt();
+}
+
+void HJ101::calibrate(double calibPower, double calibVoltage) {
+  unsigned long timeout1 = millis();
+  while ((millis() - timeout1) < 10000) {
+    delay(10);
+  }
+
+  Serial.print(F("[HLW] Active Power (W)    : "));
+  Serial.println(hj101->getActivePower());
+  Serial.print(F("[HLW] Voltage (V)         : "));
+  Serial.println(hj101->getVoltage());
+  Serial.print(F("[HLW] Current (A)         : "));
+  Serial.println(hj101->getCurrent());
+
+  hj101->expectedActivePower(calibPower);
+  hj101->expectedVoltage(calibVoltage);
+  hj101->expectedCurrent(calibPower / calibVoltage);
+
+  unsigned long timeout2 = millis();
+  while ((millis() - timeout2) < 2000) {
+    delay(10);
+  }
+
+  double current_multi = getCurrentMultiplier();
+  double voltage_multi = getVoltageMultiplier();
+  double power_multi = getPowerMultiplier();
+
+  Serial.print(F("[HLW] New current multiplier : "));
+  Serial.println(current_multi);
+  Serial.print(F("[HLW] New voltage multiplier : "));
+  Serial.println(voltage_multi);
+  Serial.print(F("[HLW] New power multiplier   : "));
+  Serial.println(power_multi);
+  Supla::Storage::ScheduleSave(2000);
+  yield();
+}
+
+HLW8012 *HJ101::hj101 = nullptr;
+};  // namespace Sensor
+};  // namespace Supla

From 73455e97732a562de4ee5c0780c8d065ae83f240 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 21 Feb 2021 17:20:58 +0100
Subject: [PATCH 103/165] =?UTF-8?q?Zmiana=20liter=20w=20include=20zgodna?=
 =?UTF-8?q?=20z=20nazw=C4=85=20pliku=20nag=C5=82=C3=B3wkowego=20(dla=20lin?=
 =?UTF-8?q?uksa)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/SuplaDevice/src/supla/sensor/HJ101.cpp | 356 ++++++++++-----------
 1 file changed, 178 insertions(+), 178 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
index bb0f5a34..f0147438 100644
--- a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
@@ -1,178 +1,178 @@
-#include "HJ101.h"
-
-namespace Supla {
-namespace Sensor {
-
-HJ101::HJ101(int8_t pinCF,
-             int8_t pinCF1,
-             int8_t pinSEL,
-             bool currentWhen,
-             bool use_interrupts)
-    : pinCF(pinCF),
-      pinCF1(pinCF1),
-      pinSEL(pinSEL),
-      currentWhen(currentWhen),
-      use_interrupts(use_interrupts) {
-  hj101 = new HLW8012();
-  hj101->begin(pinCF, pinCF1, pinSEL, currentWhen, use_interrupts);
-
-  attachInterrupt(pinCF, hjl01_cf_interrupt, FALLING);
-  attachInterrupt(pinCF1, hjl01_cf1_interrupt, FALLING);
-}
-
-void HJ101::onInit() {
-  readValuesFromDevice();
-  updateChannelValues();
-}
-
-void HJ101::readValuesFromDevice() {
-  energy = _energy +
-           (hj101->getEnergy() / 36);  // current energy value = value at start
-
-  unsigned int _reactive = 0;
-  double _pf = 0;
-  double _current = hj101->getCurrent();
-  unsigned int _voltage = hj101->getVoltage();
-  unsigned int _active = hj101->getActivePower();
-  unsigned int _apparent = _voltage * _current;
-  if (_apparent > _active) {
-    _reactive = sqrt(_apparent * _apparent - _active * _active);
-  } else {
-    _reactive = 0;
-  }
-  if (_active > _apparent) {
-    _pf = 1;
-  }
-  if (_apparent == 0) {
-    _pf = 0;
-  } else {
-    _pf = (double)_active / _apparent;
-  }
-  setVoltage(0, _voltage * 100);            // voltage in 0.01 V
-  setCurrent(0, _current * 1000);           // current in 0.001 A
-  setPowerActive(0, _active * 100000);      // power in 0.00001 kW
-  setFwdActEnergy(0, energy);               // energy in 0.00001 kWh
-  setPowerApparent(0, _apparent * 100000);  // power in 0.00001 kVA
-  setPowerReactive(0, _reactive * 100000);  // power in 0.00001 kvar
-  setPowerFactor(0, _pf * 1000);            // power in 0.001
-}
-
-void HJ101::onSaveState() {
-  double current_multiplier = getCurrentMultiplier();
-  double voltage_multiplier = getVoltageMultiplier();
-  double power_multiplier = getPowerMultiplier();
-
-  Supla::Storage::WriteState((unsigned char *)&energy, sizeof(energy));
-  Supla::Storage::WriteState((unsigned char *)&current_multiplier,
-                             sizeof(current_multiplier));
-  Supla::Storage::WriteState((unsigned char *)&voltage_multiplier,
-                             sizeof(voltage_multiplier));
-  Supla::Storage::WriteState((unsigned char *)&power_multiplier,
-                             sizeof(power_multiplier));
-}
-
-void HJ101::onLoadState() {
-  double current_multiplier;
-  double voltage_multiplier;
-  double power_multiplier;
-
-  if (Supla::Storage::ReadState((unsigned char *)&energy, sizeof(energy))) {
-    setCounter(energy);
-  }
-
-  if (Supla::Storage::ReadState((unsigned char *)&current_multiplier,
-                                sizeof(current_multiplier))) {
-    setCurrentMultiplier(current_multiplier);
-  }
-
-  if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier,
-                                sizeof(voltage_multiplier))) {
-    setVoltageMultiplier(voltage_multiplier);
-  }
-
-  if (Supla::Storage::ReadState((unsigned char *)&power_multiplier,
-                                sizeof(power_multiplier))) {
-    setPowerMultiplier(power_multiplier);
-  }
-}
-
-double HJ101::getCurrentMultiplier() {
-  return hj101->getCurrentMultiplier();
-};
-
-double HJ101::getVoltageMultiplier() {
-  return hj101->getVoltageMultiplier();
-};
-
-double HJ101::getPowerMultiplier() {
-  return hj101->getPowerMultiplier();
-};
-
-_supla_int64_t HJ101::getCounter() {
-  return energy;
-}
-
-void HJ101::setCurrentMultiplier(double current_multiplier) {
-  hj101->setCurrentMultiplier(current_multiplier);
-};
-void HJ101::setVoltageMultiplier(double voltage_multiplier) {
-  hj101->setVoltageMultiplier(voltage_multiplier);
-};
-void HJ101::setPowerMultiplier(double power_multiplier) {
-  hj101->setPowerMultiplier(power_multiplier);
-};
-
-void HJ101::setCounter(_supla_int64_t energy) {
-  _energy = energy;  // ------- energy value read from memory at startup
-  setFwdActEnergy(0, energy);
-}
-
-// When using interrupts we have to call the library entry point
-// whenever an interrupt is triggered
-void ICACHE_RAM_ATTR HJ101::hjl01_cf1_interrupt() {
-  hj101->cf1_interrupt();
-}
-
-void ICACHE_RAM_ATTR HJ101::hjl01_cf_interrupt() {
-  hj101->cf_interrupt();
-}
-
-void HJ101::calibrate(double calibPower, double calibVoltage) {
-  unsigned long timeout1 = millis();
-  while ((millis() - timeout1) < 10000) {
-    delay(10);
-  }
-
-  Serial.print(F("[HLW] Active Power (W)    : "));
-  Serial.println(hj101->getActivePower());
-  Serial.print(F("[HLW] Voltage (V)         : "));
-  Serial.println(hj101->getVoltage());
-  Serial.print(F("[HLW] Current (A)         : "));
-  Serial.println(hj101->getCurrent());
-
-  hj101->expectedActivePower(calibPower);
-  hj101->expectedVoltage(calibVoltage);
-  hj101->expectedCurrent(calibPower / calibVoltage);
-
-  unsigned long timeout2 = millis();
-  while ((millis() - timeout2) < 2000) {
-    delay(10);
-  }
-
-  double current_multi = getCurrentMultiplier();
-  double voltage_multi = getVoltageMultiplier();
-  double power_multi = getPowerMultiplier();
-
-  Serial.print(F("[HLW] New current multiplier : "));
-  Serial.println(current_multi);
-  Serial.print(F("[HLW] New voltage multiplier : "));
-  Serial.println(voltage_multi);
-  Serial.print(F("[HLW] New power multiplier   : "));
-  Serial.println(power_multi);
-  Supla::Storage::ScheduleSave(2000);
-  yield();
-}
-
-HLW8012 *HJ101::hj101 = nullptr;
-};  // namespace Sensor
-};  // namespace Supla
+#include "HJ101.h"
+
+namespace Supla {
+namespace Sensor {
+
+HJ101::HJ101(int8_t pinCF,
+             int8_t pinCF1,
+             int8_t pinSEL,
+             bool currentWhen,
+             bool use_interrupts)
+    : pinCF(pinCF),
+      pinCF1(pinCF1),
+      pinSEL(pinSEL),
+      currentWhen(currentWhen),
+      use_interrupts(use_interrupts) {
+  hj101 = new HLW8012();
+  hj101->begin(pinCF, pinCF1, pinSEL, currentWhen, use_interrupts);
+
+  attachInterrupt(pinCF, hjl01_cf_interrupt, FALLING);
+  attachInterrupt(pinCF1, hjl01_cf1_interrupt, FALLING);
+}
+
+void HJ101::onInit() {
+  readValuesFromDevice();
+  updateChannelValues();
+}
+
+void HJ101::readValuesFromDevice() {
+  energy = _energy +
+           (hj101->getEnergy() / 36);  // current energy value = value at start
+
+  unsigned int _reactive = 0;
+  double _pf = 0;
+  double _current = hj101->getCurrent();
+  unsigned int _voltage = hj101->getVoltage();
+  unsigned int _active = hj101->getActivePower();
+  unsigned int _apparent = _voltage * _current;
+  if (_apparent > _active) {
+    _reactive = sqrt(_apparent * _apparent - _active * _active);
+  } else {
+    _reactive = 0;
+  }
+  if (_active > _apparent) {
+    _pf = 1;
+  }
+  if (_apparent == 0) {
+    _pf = 0;
+  } else {
+    _pf = (double)_active / _apparent;
+  }
+  setVoltage(0, _voltage * 100);            // voltage in 0.01 V
+  setCurrent(0, _current * 1000);           // current in 0.001 A
+  setPowerActive(0, _active * 100000);      // power in 0.00001 kW
+  setFwdActEnergy(0, energy);               // energy in 0.00001 kWh
+  setPowerApparent(0, _apparent * 100000);  // power in 0.00001 kVA
+  setPowerReactive(0, _reactive * 100000);  // power in 0.00001 kvar
+  setPowerFactor(0, _pf * 1000);            // power in 0.001
+}
+
+void HJ101::onSaveState() {
+  double current_multiplier = getCurrentMultiplier();
+  double voltage_multiplier = getVoltageMultiplier();
+  double power_multiplier = getPowerMultiplier();
+
+  Supla::Storage::WriteState((unsigned char *)&energy, sizeof(energy));
+  Supla::Storage::WriteState((unsigned char *)&current_multiplier,
+                             sizeof(current_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&voltage_multiplier,
+                             sizeof(voltage_multiplier));
+  Supla::Storage::WriteState((unsigned char *)&power_multiplier,
+                             sizeof(power_multiplier));
+}
+
+void HJ101::onLoadState() {
+  double current_multiplier;
+  double voltage_multiplier;
+  double power_multiplier;
+
+  if (Supla::Storage::ReadState((unsigned char *)&energy, sizeof(energy))) {
+    setCounter(energy);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&current_multiplier,
+                                sizeof(current_multiplier))) {
+    setCurrentMultiplier(current_multiplier);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier,
+                                sizeof(voltage_multiplier))) {
+    setVoltageMultiplier(voltage_multiplier);
+  }
+
+  if (Supla::Storage::ReadState((unsigned char *)&power_multiplier,
+                                sizeof(power_multiplier))) {
+    setPowerMultiplier(power_multiplier);
+  }
+}
+
+double HJ101::getCurrentMultiplier() {
+  return hj101->getCurrentMultiplier();
+};
+
+double HJ101::getVoltageMultiplier() {
+  return hj101->getVoltageMultiplier();
+};
+
+double HJ101::getPowerMultiplier() {
+  return hj101->getPowerMultiplier();
+};
+
+_supla_int64_t HJ101::getCounter() {
+  return energy;
+}
+
+void HJ101::setCurrentMultiplier(double current_multiplier) {
+  hj101->setCurrentMultiplier(current_multiplier);
+};
+void HJ101::setVoltageMultiplier(double voltage_multiplier) {
+  hj101->setVoltageMultiplier(voltage_multiplier);
+};
+void HJ101::setPowerMultiplier(double power_multiplier) {
+  hj101->setPowerMultiplier(power_multiplier);
+};
+
+void HJ101::setCounter(_supla_int64_t energy) {
+  _energy = energy;  // ------- energy value read from memory at startup
+  setFwdActEnergy(0, energy);
+}
+
+// When using interrupts we have to call the library entry point
+// whenever an interrupt is triggered
+void ICACHE_RAM_ATTR HJ101::hjl01_cf1_interrupt() {
+  hj101->cf1_interrupt();
+}
+
+void ICACHE_RAM_ATTR HJ101::hjl01_cf_interrupt() {
+  hj101->cf_interrupt();
+}
+
+void HJ101::calibrate(double calibPower, double calibVoltage) {
+  unsigned long timeout1 = millis();
+  while ((millis() - timeout1) < 10000) {
+    delay(10);
+  }
+
+  Serial.print(F("[HLW] Active Power (W)    : "));
+  Serial.println(hj101->getActivePower());
+  Serial.print(F("[HLW] Voltage (V)         : "));
+  Serial.println(hj101->getVoltage());
+  Serial.print(F("[HLW] Current (A)         : "));
+  Serial.println(hj101->getCurrent());
+
+  hj101->expectedActivePower(calibPower);
+  hj101->expectedVoltage(calibVoltage);
+  hj101->expectedCurrent(calibPower / calibVoltage);
+
+  unsigned long timeout2 = millis();
+  while ((millis() - timeout2) < 2000) {
+    delay(10);
+  }
+
+  double current_multi = getCurrentMultiplier();
+  double voltage_multi = getVoltageMultiplier();
+  double power_multi = getPowerMultiplier();
+
+  Serial.print(F("[HLW] New current multiplier : "));
+  Serial.println(current_multi);
+  Serial.print(F("[HLW] New voltage multiplier : "));
+  Serial.println(voltage_multi);
+  Serial.print(F("[HLW] New power multiplier   : "));
+  Serial.println(power_multi);
+  Supla::Storage::ScheduleSave(2000);
+  yield();
+}
+
+HLW8012 *HJ101::hj101 = nullptr;
+};  // namespace Sensor
+};  // namespace Supla

From 9737c6aac48c9c4d73512b952e70c32c5e96536b Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 21 Feb 2021 17:35:49 +0100
Subject: [PATCH 104/165] =?UTF-8?q?Poprawienie=20znalezionych=20liter?=
 =?UTF-8?q?=C3=B3wek=20dla=20polskiego=20t=C5=82umaczenia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/language/pl.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/language/pl.h b/src/language/pl.h
index 15b3a72a..71c4639c 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -32,14 +32,14 @@
 #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_RELAY_NR_SETTINGS                                    "Ustawienia przekaźnika nr"
+#define S_NO_RELAY_NR                                          "Brak przekaźnika nr"
 #define S_STATE_CONTROL                                        "Załączany 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_BUTTON_NR_SETTINGS                                   "Ustawienia przycisku nr"
+#define S_NO_BUTTON_NR                                         "Brak przycisku nr"
 #define S_REACTION_TO                                          "Reakcja na"
 #define S_ACTION                                               "Akcja"
 #define S_GPIO_SETTINGS_FOR_LIMIT_SWITCH                       "Ustawienie GPIO dla cz. otwarcia"
@@ -67,7 +67,7 @@
 #define S_UNKNOWN_SEVER_ADDRESS                        "Nieznany adres serwera"
 #define S_UNKNOWN_ID                                   "Nieznany identyfikator ID"
 #define S_INITIATED                                    "Zainicjowany"
-#define S_CHANNEL_LIMIT_EXCEEDED                       "Przekroczono limit kanału"
+#define S_CHANNEL_LIMIT_EXCEEDED                       "Przekroczono limit kanałów"
 #define S_DISCONNECTED                                 "Rozłączony"
 #define S_REGISTRATION_IS_PENDING                      "Rejestracja w toku"
 #define S_VARIABLE_ERROR                               "Błąd zmiennej"
@@ -103,7 +103,7 @@
 #define S_IMPULSE_COUNTER_RAISING_EDGE     "Zbocze rosnące"
 #define S_IMPULSE_COUNTER_PULL_UP          "Podciąganie do VCC"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Zmień wartość"
-#define S_IMPULSE_COUNTER_SETTINGS_NR      "Ustawienia IC nr."
-#define S_NO_IMPULSE_COUNTER_NR            "Brak IC nr."
+#define S_IMPULSE_COUNTER_SETTINGS_NR      "Ustawienia IC nr"
+#define S_NO_IMPULSE_COUNTER_NR            "Brak IC nr"
 
 #endif  // _LANGUAGE_PL_S_H_

From 187b403e08f66c2617f222c9338a172c0c36b20c Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 21 Feb 2021 19:16:31 +0100
Subject: [PATCH 105/165] =?UTF-8?q?Scalenie=20polskich=20font=C3=B3w=20i?=
 =?UTF-8?q?=20konwertera=20znak=C3=B3w=20do=20SuplaOled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ArialMT_Win1250_Plain_10.h |  432 ----------
 src/ArialMT_Win1250_Plain_16.h |  432 ----------
 src/ArialMT_Win1250_Plain_24.h |  432 ----------
 src/CharsetConverter.cpp       |   76 --
 src/CharsetConverter.h         |  140 ----
 src/SuplaOled.cpp              |   79 +-
 src/SuplaOled.h                | 1420 +++++++++++++++++++++++++++++++-
 7 files changed, 1494 insertions(+), 1517 deletions(-)
 delete mode 100644 src/ArialMT_Win1250_Plain_10.h
 delete mode 100644 src/ArialMT_Win1250_Plain_16.h
 delete mode 100644 src/ArialMT_Win1250_Plain_24.h
 delete mode 100644 src/CharsetConverter.cpp
 delete mode 100644 src/CharsetConverter.h

diff --git a/src/ArialMT_Win1250_Plain_10.h b/src/ArialMT_Win1250_Plain_10.h
deleted file mode 100644
index 9a026ef2..00000000
--- a/src/ArialMT_Win1250_Plain_10.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// Created by php script OLEDFontsToool by Goral64
-#ifndef ARIALMT_WIN1250_PLAIN_10_H
-#define ARIALMT_WIN1250_PLAIN_10_H
-
-const uint8_t ArialMT_Win1250_Plain_10[] PROGMEM = {
-  0x0A, // Width: 10
-  0x0D, // Height: 13
-  0x20, // First Char: 32
-  0xE0, // Numbers of Chars: 224
-
-  // Jump Table
-  0xFF, 0xFF, 0x00, 0x03, // 32:65535
-  0x00, 0x00, 0x04, 0x03, // 33:0
-  0x00, 0x04, 0x05, 0x04, // 34:4
-  0x00, 0x09, 0x09, 0x06, // 35:9
-  0x00, 0x12, 0x0A, 0x06, // 36:18
-  0x00, 0x1C, 0x10, 0x09, // 37:28
-  0x00, 0x2C, 0x0E, 0x07, // 38:44
-  0x00, 0x3A, 0x01, 0x02, // 39:58
-  0x00, 0x3B, 0x06, 0x03, // 40:59
-  0x00, 0x41, 0x06, 0x03, // 41:65
-  0x00, 0x47, 0x05, 0x04, // 42:71
-  0x00, 0x4C, 0x09, 0x06, // 43:76
-  0x00, 0x55, 0x04, 0x03, // 44:85
-  0x00, 0x59, 0x03, 0x03, // 45:89
-  0x00, 0x5C, 0x04, 0x03, // 46:92
-  0x00, 0x60, 0x05, 0x03, // 47:96
-  0x00, 0x65, 0x0A, 0x06, // 48:101
-  0x00, 0x6F, 0x08, 0x06, // 49:111
-  0x00, 0x77, 0x0A, 0x06, // 50:119
-  0x00, 0x81, 0x0A, 0x06, // 51:129
-  0x00, 0x8B, 0x0B, 0x06, // 52:139
-  0x00, 0x96, 0x0A, 0x06, // 53:150
-  0x00, 0xA0, 0x0A, 0x06, // 54:160
-  0x00, 0xAA, 0x09, 0x06, // 55:170
-  0x00, 0xB3, 0x0A, 0x06, // 56:179
-  0x00, 0xBD, 0x0A, 0x06, // 57:189
-  0x00, 0xC7, 0x04, 0x03, // 58:199
-  0x00, 0xCB, 0x04, 0x03, // 59:203
-  0x00, 0xCF, 0x0A, 0x06, // 60:207
-  0x00, 0xD9, 0x09, 0x06, // 61:217
-  0x00, 0xE2, 0x09, 0x06, // 62:226
-  0x00, 0xEB, 0x0B, 0x06, // 63:235
-  0x00, 0xF6, 0x14, 0x0A, // 64:246
-  0x01, 0x0A, 0x0E, 0x07, // 65:266
-  0x01, 0x18, 0x0C, 0x07, // 66:280
-  0x01, 0x24, 0x0C, 0x07, // 67:292
-  0x01, 0x30, 0x0B, 0x07, // 68:304
-  0x01, 0x3B, 0x0C, 0x07, // 69:315
-  0x01, 0x47, 0x09, 0x06, // 70:327
-  0x01, 0x50, 0x0D, 0x08, // 71:336
-  0x01, 0x5D, 0x0C, 0x07, // 72:349
-  0x01, 0x69, 0x04, 0x03, // 73:361
-  0x01, 0x6D, 0x08, 0x05, // 74:365
-  0x01, 0x75, 0x0E, 0x07, // 75:373
-  0x01, 0x83, 0x0C, 0x06, // 76:387
-  0x01, 0x8F, 0x10, 0x08, // 77:399
-  0x01, 0x9F, 0x0C, 0x07, // 78:415
-  0x01, 0xAB, 0x0E, 0x08, // 79:427
-  0x01, 0xB9, 0x0B, 0x07, // 80:441
-  0x01, 0xC4, 0x0E, 0x08, // 81:452
-  0x01, 0xD2, 0x0C, 0x07, // 82:466
-  0x01, 0xDE, 0x0C, 0x07, // 83:478
-  0x01, 0xEA, 0x0B, 0x06, // 84:490
-  0x01, 0xF5, 0x0C, 0x07, // 85:501
-  0x02, 0x01, 0x0D, 0x07, // 86:513
-  0x02, 0x0E, 0x11, 0x09, // 87:526
-  0x02, 0x1F, 0x0E, 0x07, // 88:543
-  0x02, 0x2D, 0x0D, 0x07, // 89:557
-  0x02, 0x3A, 0x0C, 0x06, // 90:570
-  0x02, 0x46, 0x06, 0x03, // 91:582
-  0x02, 0x4C, 0x06, 0x03, // 92:588
-  0x02, 0x52, 0x04, 0x03, // 93:594
-  0x02, 0x56, 0x09, 0x05, // 94:598
-  0x02, 0x5F, 0x0C, 0x06, // 95:607
-  0x02, 0x6B, 0x03, 0x03, // 96:619
-  0x02, 0x6E, 0x0A, 0x06, // 97:622
-  0x02, 0x78, 0x0A, 0x06, // 98:632
-  0x02, 0x82, 0x0A, 0x05, // 99:642
-  0x02, 0x8C, 0x0A, 0x06, // 100:652
-  0x02, 0x96, 0x0A, 0x06, // 101:662
-  0x02, 0xA0, 0x05, 0x03, // 102:672
-  0x02, 0xA5, 0x0A, 0x06, // 103:677
-  0x02, 0xAF, 0x0A, 0x06, // 104:687
-  0x02, 0xB9, 0x04, 0x02, // 105:697
-  0x02, 0xBD, 0x04, 0x02, // 106:701
-  0x02, 0xC1, 0x08, 0x05, // 107:705
-  0x02, 0xC9, 0x04, 0x02, // 108:713
-  0x02, 0xCD, 0x10, 0x08, // 109:717
-  0x02, 0xDD, 0x0A, 0x06, // 110:733
-  0x02, 0xE7, 0x0A, 0x06, // 111:743
-  0x02, 0xF1, 0x0A, 0x06, // 112:753
-  0x02, 0xFB, 0x0A, 0x06, // 113:763
-  0x03, 0x05, 0x05, 0x03, // 114:773
-  0x03, 0x0A, 0x08, 0x05, // 115:778
-  0x03, 0x12, 0x06, 0x03, // 116:786
-  0x03, 0x18, 0x0A, 0x06, // 117:792
-  0x03, 0x22, 0x09, 0x05, // 118:802
-  0x03, 0x2B, 0x0E, 0x07, // 119:811
-  0x03, 0x39, 0x0A, 0x05, // 120:825
-  0x03, 0x43, 0x09, 0x05, // 121:835
-  0x03, 0x4C, 0x0A, 0x05, // 122:844
-  0x03, 0x56, 0x06, 0x03, // 123:854
-  0x03, 0x5C, 0x04, 0x03, // 124:860
-  0x03, 0x60, 0x05, 0x03, // 125:864
-  0x03, 0x65, 0x09, 0x06, // 126:869
-  0xFF, 0xFF, 0x00, 0x00, // 127:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 128:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 129:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 130:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 131:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 132:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 133:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 134:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 135:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 136:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 137:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 138:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 139:65535
-  0x03, 0x6E, 0x0C, 0x07, // 140:878
-  0xFF, 0xFF, 0x00, 0x0A, // 141:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 142:65535
-  0x03, 0x7A, 0x0C, 0x06, // 143:890
-  0xFF, 0xFF, 0x00, 0x0A, // 144:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 145:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 146:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 147:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 148:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 149:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 150:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 151:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 152:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 153:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 154:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 155:65535
-  0x03, 0x86, 0x08, 0x05, // 156:902
-  0xFF, 0xFF, 0x00, 0x0A, // 157:65535
-  0xFF, 0xFF, 0x00, 0x0A, // 158:65535
-  0x03, 0x8E, 0x0A, 0x05, // 159:910
-  0xFF, 0xFF, 0x00, 0x03, // 160:65535
-  0x03, 0x98, 0x04, 0x03, // 161:920
-  0x03, 0x9C, 0x0A, 0x06, // 162:924
-  0x03, 0xA6, 0x0C, 0x06, // 163:934
-  0x03, 0xB2, 0x0A, 0x06, // 164:946
-  0x03, 0xBC, 0x0E, 0x07, // 165:956
-  0x03, 0xCA, 0x04, 0x03, // 166:970
-  0x03, 0xCE, 0x0A, 0x06, // 167:974
-  0x03, 0xD8, 0x05, 0x03, // 168:984
-  0x03, 0xDD, 0x0D, 0x07, // 169:989
-  0x03, 0xEA, 0x07, 0x04, // 170:1002
-  0x03, 0xF1, 0x0A, 0x06, // 171:1009
-  0x03, 0xFB, 0x09, 0x06, // 172:1019
-  0x04, 0x04, 0x03, 0x03, // 173:1028
-  0x04, 0x07, 0x0D, 0x07, // 174:1031
-  0x04, 0x14, 0x0C, 0x06, // 175:1044
-  0x04, 0x20, 0x07, 0x04, // 176:1056
-  0x04, 0x27, 0x0A, 0x05, // 177:1063
-  0x04, 0x31, 0x05, 0x03, // 178:1073
-  0x04, 0x36, 0x05, 0x03, // 179:1078
-  0x04, 0x3B, 0x05, 0x03, // 180:1083
-  0x04, 0x40, 0x0A, 0x06, // 181:1088
-  0x04, 0x4A, 0x09, 0x05, // 182:1098
-  0x04, 0x53, 0x03, 0x03, // 183:1107
-  0x04, 0x56, 0x06, 0x03, // 184:1110
-  0x04, 0x5C, 0x0A, 0x06, // 185:1116
-  0x04, 0x66, 0x07, 0x04, // 186:1126
-  0x04, 0x6D, 0x0A, 0x06, // 187:1133
-  0x04, 0x77, 0x10, 0x08, // 188:1143
-  0x04, 0x87, 0x10, 0x08, // 189:1159
-  0x04, 0x97, 0x10, 0x08, // 190:1175
-  0x04, 0xA7, 0x0A, 0x05, // 191:1191
-  0x04, 0xB1, 0x0E, 0x07, // 192:1201
-  0x04, 0xBF, 0x0E, 0x07, // 193:1215
-  0x04, 0xCD, 0x0E, 0x07, // 194:1229
-  0x04, 0xDB, 0x0E, 0x07, // 195:1243
-  0x04, 0xE9, 0x0E, 0x07, // 196:1257
-  0x04, 0xF7, 0x0E, 0x07, // 197:1271
-  0x05, 0x05, 0x0C, 0x07, // 198:1285
-  0x05, 0x11, 0x0C, 0x07, // 199:1297
-  0x05, 0x1D, 0x0C, 0x07, // 200:1309
-  0x05, 0x29, 0x0C, 0x07, // 201:1321
-  0x05, 0x35, 0x0C, 0x07, // 202:1333
-  0x05, 0x41, 0x0C, 0x07, // 203:1345
-  0x05, 0x4D, 0x05, 0x03, // 204:1357
-  0x05, 0x52, 0x04, 0x03, // 205:1362
-  0x05, 0x56, 0x04, 0x03, // 206:1366
-  0x05, 0x5A, 0x05, 0x03, // 207:1370
-  0x05, 0x5F, 0x0B, 0x07, // 208:1375
-  0x05, 0x6A, 0x0C, 0x07, // 209:1386
-  0x05, 0x76, 0x0E, 0x08, // 210:1398
-  0x05, 0x84, 0x0E, 0x08, // 211:1412
-  0x05, 0x92, 0x0E, 0x08, // 212:1426
-  0x05, 0xA0, 0x0E, 0x08, // 213:1440
-  0x05, 0xAE, 0x0E, 0x08, // 214:1454
-  0x05, 0xBC, 0x0A, 0x06, // 215:1468
-  0x05, 0xC6, 0x0D, 0x08, // 216:1478
-  0x05, 0xD3, 0x0C, 0x07, // 217:1491
-  0x05, 0xDF, 0x0C, 0x07, // 218:1503
-  0x05, 0xEB, 0x0C, 0x07, // 219:1515
-  0x05, 0xF7, 0x0C, 0x07, // 220:1527
-  0x06, 0x03, 0x0D, 0x07, // 221:1539
-  0x06, 0x10, 0x0B, 0x07, // 222:1552
-  0x06, 0x1B, 0x0C, 0x06, // 223:1563
-  0x06, 0x27, 0x0A, 0x06, // 224:1575
-  0x06, 0x31, 0x0A, 0x06, // 225:1585
-  0x06, 0x3B, 0x0A, 0x06, // 226:1595
-  0x06, 0x45, 0x0A, 0x06, // 227:1605
-  0x06, 0x4F, 0x0A, 0x06, // 228:1615
-  0x06, 0x59, 0x0A, 0x06, // 229:1625
-  0x06, 0x63, 0x0A, 0x05, // 230:1635
-  0x06, 0x6D, 0x0A, 0x05, // 231:1645
-  0x06, 0x77, 0x0A, 0x06, // 232:1655
-  0x06, 0x81, 0x0A, 0x06, // 233:1665
-  0x06, 0x8B, 0x0A, 0x06, // 234:1675
-  0x06, 0x95, 0x0A, 0x06, // 235:1685
-  0x06, 0x9F, 0x05, 0x03, // 236:1695
-  0x06, 0xA4, 0x04, 0x03, // 237:1700
-  0x06, 0xA8, 0x05, 0x03, // 238:1704
-  0x06, 0xAD, 0x05, 0x03, // 239:1709
-  0x06, 0xB2, 0x0A, 0x06, // 240:1714
-  0x06, 0xBC, 0x0A, 0x06, // 241:1724
-  0x06, 0xC6, 0x0A, 0x06, // 242:1734
-  0x06, 0xD0, 0x0A, 0x06, // 243:1744
-  0x06, 0xDA, 0x0A, 0x06, // 244:1754
-  0x06, 0xE4, 0x0A, 0x06, // 245:1764
-  0x06, 0xEE, 0x0A, 0x06, // 246:1774
-  0x06, 0xF8, 0x09, 0x05, // 247:1784
-  0x07, 0x01, 0x0A, 0x06, // 248:1793
-  0x07, 0x0B, 0x0A, 0x06, // 249:1803
-  0x07, 0x15, 0x0A, 0x06, // 250:1813
-  0x07, 0x1F, 0x0A, 0x06, // 251:1823
-  0x07, 0x29, 0x0A, 0x06, // 252:1833
-  0x07, 0x33, 0x09, 0x05, // 253:1843
-  0x07, 0x3C, 0x0A, 0x06, // 254:1852
-  0x07, 0x46, 0x09, 0x05, // 255:1862
-
-  // Font Data
-  0x00,0x00,0xF8,0x02, // 33
-  0x38,0x00,0x00,0x00,0x38, // 34
-  0xA0,0x03,0xE0,0x00,0xB8,0x03,0xE0,0x00,0xB8, // 35
-  0x30,0x01,0x28,0x02,0xF8,0x07,0x48,0x02,0x90,0x01, // 36
-  0x00,0x00,0x30,0x00,0x48,0x00,0x30,0x03,0xC0,0x00,0xB0,0x01,0x48,0x02,0x80,0x01, // 37
-  0x80,0x01,0x50,0x02,0x68,0x02,0xA8,0x02,0x18,0x01,0x80,0x03,0x80,0x02, // 38
-  0x38, // 39
-  0xE0,0x03,0x10,0x04,0x08,0x08, // 40
-  0x08,0x08,0x10,0x04,0xE0,0x03, // 41
-  0x28,0x00,0x18,0x00,0x28, // 42
-  0x40,0x00,0x40,0x00,0xF0,0x01,0x40,0x00,0x40, // 43
-  0x00,0x00,0x00,0x06, // 44
-  0x80,0x00,0x80, // 45
-  0x00,0x00,0x00,0x02, // 46
-  0x00,0x03,0xE0,0x00,0x18, // 47
-  0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01, // 48
-  0x00,0x00,0x20,0x00,0x10,0x00,0xF8,0x03, // 49
-  0x10,0x02,0x08,0x03,0x88,0x02,0x48,0x02,0x30,0x02, // 50
-  0x10,0x01,0x08,0x02,0x48,0x02,0x48,0x02,0xB0,0x01, // 51
-  0xC0,0x00,0xA0,0x00,0x90,0x00,0x88,0x00,0xF8,0x03,0x80, // 52
-  0x60,0x01,0x38,0x02,0x28,0x02,0x28,0x02,0xC8,0x01, // 53
-  0xF0,0x01,0x28,0x02,0x28,0x02,0x28,0x02,0xD0,0x01, // 54
-  0x08,0x00,0x08,0x03,0xC8,0x00,0x38,0x00,0x08, // 55
-  0xB0,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0xB0,0x01, // 56
-  0x70,0x01,0x88,0x02,0x88,0x02,0x88,0x02,0xF0,0x01, // 57
-  0x00,0x00,0x20,0x02, // 58
-  0x00,0x00,0x20,0x06, // 59
-  0x00,0x00,0x40,0x00,0xA0,0x00,0xA0,0x00,0x10,0x01, // 60
-  0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0, // 61
-  0x00,0x00,0x10,0x01,0xA0,0x00,0xA0,0x00,0x40, // 62
-  0x10,0x00,0x08,0x00,0x08,0x00,0xC8,0x02,0x48,0x00,0x30, // 63
-  0x00,0x00,0xC0,0x03,0x30,0x04,0xD0,0x09,0x28,0x0A,0x28,0x0A,0xC8,0x0B,0x68,0x0A,0x10,0x05,0xE0,0x04, // 64
-  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x00,0xC0,0x01,0x00,0x02, // 65
-  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0xF0,0x01, // 66
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x10,0x01, // 67
-  0x00,0x00,0xF8,0x03,0x08,0x02,0x08,0x02,0x10,0x01,0xE0, // 68
-  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0x48,0x02, // 69
-  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x08, // 70
-  0x00,0x00,0xE0,0x00,0x10,0x01,0x08,0x02,0x48,0x02,0x50,0x01,0xC0, // 71
-  0x00,0x00,0xF8,0x03,0x40,0x00,0x40,0x00,0x40,0x00,0xF8,0x03, // 72
-  0x00,0x00,0xF8,0x03, // 73
-  0x00,0x03,0x00,0x02,0x00,0x02,0xF8,0x01, // 74
-  0x00,0x00,0xF8,0x03,0x80,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02, // 75
-  0x00,0x00,0xF8,0x03,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, // 76
-  0x00,0x00,0xF8,0x03,0x30,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x30,0x00,0xF8,0x03, // 77
-  0x00,0x00,0xF8,0x03,0x30,0x00,0x40,0x00,0x80,0x01,0xF8,0x03, // 78
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01, // 79
-  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x48,0x00,0x30, // 80
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x03,0x08,0x03,0xF0,0x02, // 81
-  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0xC8,0x00,0x30,0x03, // 82
-  0x00,0x00,0x30,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0x90,0x01, // 83
-  0x00,0x00,0x08,0x00,0x08,0x00,0xF8,0x03,0x08,0x00,0x08, // 84
-  0x00,0x00,0xF8,0x01,0x00,0x02,0x00,0x02,0x00,0x02,0xF8,0x01, // 85
-  0x08,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x80,0x01,0x70,0x00,0x08, // 86
-  0x18,0x00,0xE0,0x01,0x00,0x02,0xF0,0x01,0x08,0x00,0xF0,0x01,0x00,0x02,0xE0,0x01,0x18, // 87
-  0x00,0x02,0x08,0x01,0x90,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02, // 88
-  0x08,0x00,0x10,0x00,0x20,0x00,0xC0,0x03,0x20,0x00,0x10,0x00,0x08, // 89
-  0x08,0x03,0x88,0x03,0xC8,0x02,0x68,0x02,0x38,0x02,0x18,0x02, // 90
-  0x00,0x00,0xF8,0x0F,0x08,0x08, // 91
-  0x18,0x00,0xE0,0x00,0x00,0x03, // 92
-  0x08,0x08,0xF8,0x0F, // 93
-  0x40,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x40, // 94
-  0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08, // 95
-  0x08,0x00,0x10, // 96
-  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x02,0xE0,0x03, // 97
-  0x00,0x00,0xF8,0x03,0x20,0x02,0x20,0x02,0xC0,0x01, // 98
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0x40,0x01, // 99
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xF8,0x03, // 100
-  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02, // 101
-  0x20,0x00,0xF0,0x03,0x28, // 102
-  0x00,0x00,0xC0,0x05,0x20,0x0A,0x20,0x0A,0xE0,0x07, // 103
-  0x00,0x00,0xF8,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 104
-  0x00,0x00,0xE8,0x03, // 105
-  0x00,0x08,0xE8,0x07, // 106
-  0xF8,0x03,0x80,0x00,0xC0,0x01,0x20,0x02, // 107
-  0x00,0x00,0xF8,0x03, // 108
-  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 109
-  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 110
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xC0,0x01, // 111
-  0x00,0x00,0xE0,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01, // 112
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xE0,0x0F, // 113
-  0x00,0x00,0xE0,0x03,0x20, // 114
-  0x40,0x02,0xA0,0x02,0xA0,0x02,0x20,0x01, // 115
-  0x20,0x00,0xF8,0x03,0x20,0x02, // 116
-  0x00,0x00,0xE0,0x01,0x00,0x02,0x00,0x02,0xE0,0x03, // 117
-  0x20,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x20, // 118
-  0xE0,0x01,0x00,0x02,0xC0,0x01,0x20,0x00,0xC0,0x01,0x00,0x02,0xE0,0x01, // 119
-  0x20,0x02,0x40,0x01,0x80,0x00,0x40,0x01,0x20,0x02, // 120
-  0x20,0x00,0xC0,0x09,0x00,0x06,0xC0,0x01,0x20, // 121
-  0x20,0x02,0x20,0x03,0xA0,0x02,0x60,0x02,0x20,0x02, // 122
-  0x80,0x00,0x78,0x0F,0x08,0x08, // 123
-  0x00,0x00,0xF8,0x0F, // 124
-  0x08,0x08,0x78,0x0F,0x80, // 125
-  0xC0,0x00,0x40,0x00,0xC0,0x00,0x80,0x00,0xC0, // 126
-  0x00,0x00,0x30,0x01,0x48,0x02,0x4A,0x02,0x49,0x02,0x90,0x01, // 140
-  0x08,0x03,0x88,0x03,0xC8,0x02,0x6A,0x02,0x39,0x02,0x18,0x02, // 143
-  0x40,0x02,0xA8,0x02,0xA4,0x02,0x20,0x01, // 156
-  0x20,0x02,0x20,0x03,0xA8,0x02,0x64,0x02,0x20,0x02, // 159
-  0x00,0x00,0xA0,0x0F, // 161
-  0x00,0x00,0xC0,0x01,0xA0,0x0F,0x78,0x02,0x40,0x01, // 162
-  0x00,0x00,0xF8,0x03,0x40,0x02,0x20,0x02,0x10,0x02,0x00,0x02, // 163
-  0x00,0x00,0xE0,0x01,0x20,0x01,0x20,0x01,0xE0,0x01, // 164
-  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x14,0xC0,0x19,0x00,0x02, // 165
-  0x00,0x00,0x38,0x0F, // 166
-  0xD0,0x04,0x28,0x09,0x48,0x09,0x48,0x0A,0x90,0x05, // 167
-  0x08,0x00,0x00,0x00,0x08, // 168
-  0xE0,0x00,0x10,0x01,0x48,0x02,0xA8,0x02,0xA8,0x02,0x10,0x01,0xE0, // 169
-  0x68,0x00,0x68,0x00,0x68,0x00,0x78, // 170
-  0x00,0x00,0x80,0x01,0x40,0x02,0x80,0x01,0x40,0x02, // 171
-  0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0xE0, // 172
-  0x80,0x00,0x80, // 173
-  0xE0,0x00,0x10,0x01,0xE8,0x02,0x68,0x02,0xC8,0x02,0x10,0x01,0xE0, // 174
-  0x08,0x03,0x88,0x03,0xCA,0x02,0x6A,0x02,0x38,0x02,0x18,0x02, // 175
-  0x00,0x00,0x38,0x00,0x28,0x00,0x38, // 176
-  0x40,0x02,0x40,0x02,0xF0,0x03,0x40,0x02,0x40,0x02, // 177
-  0x48,0x00,0x68,0x00,0x58, // 178
-  0xC0,0x00,0xF8,0x03,0x30, // 179
-  0x00,0x00,0x10,0x00,0x08, // 180
-  0x00,0x00,0xE0,0x0F,0x00,0x02,0x00,0x02,0xE0,0x03, // 181
-  0x70,0x00,0xF8,0x0F,0x08,0x00,0xF8,0x0F,0x08, // 182
-  0x00,0x00,0x40, // 183
-  0x00,0x00,0x00,0x14,0x00,0x18, // 184
-  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x16,0xE0,0x1B, // 185
-  0x30,0x00,0x48,0x00,0x48,0x00,0x30, // 186
-  0x00,0x00,0x40,0x02,0x80,0x01,0x40,0x02,0x80,0x01, // 187
-  0x00,0x00,0x10,0x02,0x78,0x01,0xC0,0x00,0x20,0x01,0x90,0x01,0xC8,0x03,0x00,0x01, // 188
-  0x00,0x00,0x10,0x02,0x78,0x01,0x80,0x00,0x60,0x00,0x50,0x02,0x48,0x03,0xC0,0x02, // 189
-  0x48,0x00,0x58,0x00,0x68,0x03,0x80,0x00,0x60,0x01,0x90,0x01,0xC8,0x03,0x00,0x01, // 190
-  0x20,0x02,0x20,0x03,0xA8,0x02,0x68,0x02,0x20,0x02, // 191
-  0x00,0x02,0xC0,0x01,0xB0,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 192
-  0x00,0x02,0xC0,0x01,0xB0,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02, // 193
-  0x00,0x02,0xC0,0x01,0xB2,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 194
-  0x00,0x02,0xC2,0x01,0xB1,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02, // 195
-  0x00,0x02,0xC0,0x01,0xB2,0x00,0x88,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 196
-  0x00,0x02,0xC0,0x01,0xBE,0x00,0x8A,0x00,0xBE,0x00,0xC0,0x01,0x00,0x02, // 197
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x10,0x01, // 198
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x16,0x08,0x1A,0x10,0x01, // 199
-  0x00,0x00,0xF8,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02, // 200
-  0x00,0x00,0xF8,0x03,0x48,0x02,0x4A,0x02,0x49,0x02,0x48,0x02, // 201
-  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x16,0x48,0x1A,0x48,0x02, // 202
-  0x00,0x00,0xF8,0x03,0x4A,0x02,0x48,0x02,0x4A,0x02,0x48,0x02, // 203
-  0x00,0x00,0xF9,0x03,0x02, // 204
-  0x02,0x00,0xF9,0x03, // 205
-  0x01,0x00,0xFA,0x03, // 206
-  0x02,0x00,0xF8,0x03,0x02, // 207
-  0x40,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x10,0x01,0xE0, // 208
-  0x00,0x00,0xF8,0x03,0x30,0x00,0x42,0x00,0x81,0x01,0xF8,0x03, // 209
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x09,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01, // 210
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x08,0x02,0xF0,0x01, // 211
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x0A,0x02,0xF0,0x01, // 212
-  0x00,0x00,0xF0,0x01,0x0A,0x02,0x09,0x02,0x0A,0x02,0x09,0x02,0xF0,0x01, // 213
-  0x00,0x00,0xF0,0x01,0x0A,0x02,0x08,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01, // 214
-  0x10,0x01,0xA0,0x00,0xE0,0x00,0xA0,0x00,0x10,0x01, // 215
-  0x00,0x00,0xF0,0x02,0x08,0x03,0xC8,0x02,0x28,0x02,0x18,0x03,0xE8, // 216
-  0x00,0x00,0xF8,0x01,0x01,0x02,0x02,0x02,0x00,0x02,0xF8,0x01, // 217
-  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x00,0x02,0xF8,0x01, // 218
-  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x02,0x02,0xF8,0x01, // 219
-  0x00,0x00,0xF8,0x01,0x02,0x02,0x00,0x02,0x02,0x02,0xF8,0x01, // 220
-  0x08,0x00,0x10,0x00,0x20,0x00,0xC2,0x03,0x21,0x00,0x10,0x00,0x08, // 221
-  0x00,0x00,0xF8,0x03,0x10,0x01,0x10,0x01,0x10,0x01,0xE0, // 222
-  0x00,0x00,0xF0,0x03,0x08,0x01,0x48,0x02,0xB0,0x02,0x80,0x01, // 223
-  0x00,0x00,0x00,0x03,0xA4,0x02,0xA8,0x02,0xE0,0x03, // 224
-  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE0,0x03, // 225
-  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE8,0x03, // 226
-  0x00,0x00,0x08,0x03,0xA4,0x02,0xA8,0x02,0xE4,0x03, // 227
-  0x00,0x00,0x00,0x03,0xA8,0x02,0xA0,0x02,0xE8,0x03, // 228
-  0x00,0x00,0x00,0x03,0xAE,0x02,0xAA,0x02,0xEE,0x03, // 229
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0x40,0x01, // 230
-  0x00,0x00,0xC0,0x01,0x20,0x16,0x20,0x1A,0x40,0x01, // 231
-  0x00,0x00,0xC0,0x01,0xA4,0x02,0xA8,0x02,0xC0,0x02, // 232
-  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC0,0x02, // 233
-  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x16,0xC0,0x1A, // 234
-  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA0,0x02,0xC8,0x02, // 235
-  0x00,0x00,0xE4,0x03,0x08, // 236
-  0x08,0x00,0xE4,0x03, // 237
-  0x08,0x00,0xE4,0x03,0x08, // 238
-  0x08,0x00,0xE0,0x03,0x08, // 239
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x38,0x02,0xE0,0x01, // 240
-  0x00,0x00,0xE0,0x03,0x28,0x00,0x24,0x00,0xC0,0x03, // 241
-  0x00,0x00,0xC0,0x01,0x24,0x02,0x28,0x02,0xC0,0x01, // 242
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC0,0x01, // 243
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC8,0x01, // 244
-  0x00,0x00,0xC8,0x01,0x24,0x02,0x28,0x02,0xC4,0x01, // 245
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x20,0x02,0xC8,0x01, // 246
-  0x40,0x00,0x40,0x00,0x50,0x01,0x40,0x00,0x40, // 247
-  0x00,0x00,0xC0,0x02,0xA0,0x03,0x60,0x02,0xA0,0x01, // 248
-  0x00,0x00,0xE0,0x01,0x04,0x02,0x08,0x02,0xE0,0x03, // 249
-  0x00,0x00,0xE0,0x01,0x08,0x02,0x04,0x02,0xE0,0x03, // 250
-  0x00,0x00,0xE8,0x01,0x04,0x02,0x08,0x02,0xE0,0x03, // 251
-  0x00,0x00,0xE0,0x01,0x08,0x02,0x00,0x02,0xE8,0x03, // 252
-  0x20,0x00,0xC0,0x09,0x08,0x06,0xC4,0x01,0x20, // 253
-  0x00,0x00,0xF8,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01, // 254
-  0x20,0x00,0xC8,0x09,0x00,0x06,0xC8,0x01,0x20 // 255
-};
-#endif // ARIALMT_WIN1250_PLAIN_10_H
diff --git a/src/ArialMT_Win1250_Plain_16.h b/src/ArialMT_Win1250_Plain_16.h
deleted file mode 100644
index 573bd13f..00000000
--- a/src/ArialMT_Win1250_Plain_16.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// Created by php script OLEDFontsToool by Goral64
-#ifndef ARIALMT_WIN1250_PLAIN_16_H
-#define ARIALMT_WIN1250_PLAIN_16_H
-
-const uint8_t ArialMT_Win1250_Plain_16[] PROGMEM = {
-  0x10, // Width: 16
-  0x13, // Height: 19
-  0x20, // First Char: 32
-  0xE0, // Numbers of Chars: 224
-
-  // Jump Table
-  0xFF, 0xFF, 0x00, 0x04, // 32:65535
-  0x00, 0x00, 0x08, 0x04, // 33:0
-  0x00, 0x08, 0x0D, 0x06, // 34:8
-  0x00, 0x15, 0x1A, 0x09, // 35:21
-  0x00, 0x2F, 0x17, 0x09, // 36:47
-  0x00, 0x46, 0x26, 0x0E, // 37:70
-  0x00, 0x6C, 0x1D, 0x0B, // 38:108
-  0x00, 0x89, 0x04, 0x03, // 39:137
-  0x00, 0x8D, 0x0C, 0x05, // 40:141
-  0x00, 0x99, 0x0B, 0x05, // 41:153
-  0x00, 0xA4, 0x0D, 0x06, // 42:164
-  0x00, 0xB1, 0x17, 0x09, // 43:177
-  0x00, 0xC8, 0x09, 0x04, // 44:200
-  0x00, 0xD1, 0x0B, 0x05, // 45:209
-  0x00, 0xDC, 0x08, 0x04, // 46:220
-  0x00, 0xE4, 0x0A, 0x04, // 47:228
-  0x00, 0xEE, 0x17, 0x09, // 48:238
-  0x01, 0x05, 0x11, 0x09, // 49:261
-  0x01, 0x16, 0x17, 0x09, // 50:278
-  0x01, 0x2D, 0x17, 0x09, // 51:301
-  0x01, 0x44, 0x17, 0x09, // 52:324
-  0x01, 0x5B, 0x17, 0x09, // 53:347
-  0x01, 0x72, 0x17, 0x09, // 54:370
-  0x01, 0x89, 0x16, 0x09, // 55:393
-  0x01, 0x9F, 0x17, 0x09, // 56:415
-  0x01, 0xB6, 0x17, 0x09, // 57:438
-  0x01, 0xCD, 0x05, 0x04, // 58:461
-  0x01, 0xD2, 0x06, 0x04, // 59:466
-  0x01, 0xD8, 0x17, 0x09, // 60:472
-  0x01, 0xEF, 0x17, 0x09, // 61:495
-  0x02, 0x06, 0x17, 0x09, // 62:518
-  0x02, 0x1D, 0x16, 0x09, // 63:541
-  0x02, 0x33, 0x2F, 0x10, // 64:563
-  0x02, 0x62, 0x1D, 0x0B, // 65:610
-  0x02, 0x7F, 0x1D, 0x0B, // 66:639
-  0x02, 0x9C, 0x20, 0x0C, // 67:668
-  0x02, 0xBC, 0x20, 0x0C, // 68:700
-  0x02, 0xDC, 0x1D, 0x0B, // 69:732
-  0x02, 0xF9, 0x19, 0x0A, // 70:761
-  0x03, 0x12, 0x20, 0x0C, // 71:786
-  0x03, 0x32, 0x1D, 0x0C, // 72:818
-  0x03, 0x4F, 0x05, 0x04, // 73:847
-  0x03, 0x54, 0x14, 0x08, // 74:852
-  0x03, 0x68, 0x1D, 0x0B, // 75:872
-  0x03, 0x85, 0x17, 0x09, // 76:901
-  0x03, 0x9C, 0x23, 0x0D, // 77:924
-  0x03, 0xBF, 0x1D, 0x0C, // 78:959
-  0x03, 0xDC, 0x20, 0x0C, // 79:988
-  0x03, 0xFC, 0x1C, 0x0B, // 80:1020
-  0x04, 0x18, 0x20, 0x0C, // 81:1048
-  0x04, 0x38, 0x1D, 0x0C, // 82:1080
-  0x04, 0x55, 0x1D, 0x0B, // 83:1109
-  0x04, 0x72, 0x19, 0x0A, // 84:1138
-  0x04, 0x8B, 0x1D, 0x0C, // 85:1163
-  0x04, 0xA8, 0x1C, 0x0B, // 86:1192
-  0x04, 0xC4, 0x2B, 0x0F, // 87:1220
-  0x04, 0xEF, 0x20, 0x0B, // 88:1263
-  0x05, 0x0F, 0x19, 0x0B, // 89:1295
-  0x05, 0x28, 0x1A, 0x0A, // 90:1320
-  0x05, 0x42, 0x0C, 0x04, // 91:1346
-  0x05, 0x4E, 0x0B, 0x04, // 92:1358
-  0x05, 0x59, 0x09, 0x04, // 93:1369
-  0x05, 0x62, 0x14, 0x08, // 94:1378
-  0x05, 0x76, 0x1B, 0x09, // 95:1398
-  0x05, 0x91, 0x07, 0x05, // 96:1425
-  0x05, 0x98, 0x17, 0x09, // 97:1432
-  0x05, 0xAF, 0x17, 0x09, // 98:1455
-  0x05, 0xC6, 0x14, 0x08, // 99:1478
-  0x05, 0xDA, 0x17, 0x09, // 100:1498
-  0x05, 0xF1, 0x17, 0x09, // 101:1521
-  0x06, 0x08, 0x0A, 0x04, // 102:1544
-  0x06, 0x12, 0x17, 0x09, // 103:1554
-  0x06, 0x29, 0x14, 0x09, // 104:1577
-  0x06, 0x3D, 0x05, 0x04, // 105:1597
-  0x06, 0x42, 0x06, 0x04, // 106:1602
-  0x06, 0x48, 0x17, 0x08, // 107:1608
-  0x06, 0x5F, 0x05, 0x04, // 108:1631
-  0x06, 0x64, 0x23, 0x0D, // 109:1636
-  0x06, 0x87, 0x14, 0x09, // 110:1671
-  0x06, 0x9B, 0x17, 0x09, // 111:1691
-  0x06, 0xB2, 0x17, 0x09, // 112:1714
-  0x06, 0xC9, 0x18, 0x09, // 113:1737
-  0x06, 0xE1, 0x0D, 0x05, // 114:1761
-  0x06, 0xEE, 0x14, 0x08, // 115:1774
-  0x07, 0x02, 0x0B, 0x04, // 116:1794
-  0x07, 0x0D, 0x14, 0x09, // 117:1805
-  0x07, 0x21, 0x13, 0x08, // 118:1825
-  0x07, 0x34, 0x1F, 0x0C, // 119:1844
-  0x07, 0x53, 0x14, 0x08, // 120:1875
-  0x07, 0x67, 0x13, 0x08, // 121:1895
-  0x07, 0x7A, 0x14, 0x08, // 122:1914
-  0x07, 0x8E, 0x0F, 0x05, // 123:1934
-  0x07, 0x9D, 0x06, 0x04, // 124:1949
-  0x07, 0xA3, 0x0E, 0x05, // 125:1955
-  0x07, 0xB1, 0x17, 0x09, // 126:1969
-  0xFF, 0xFF, 0x00, 0x00, // 127:65535
-  0xFF, 0xFF, 0x00, 0x10, // 128:65535
-  0xFF, 0xFF, 0x00, 0x10, // 129:65535
-  0xFF, 0xFF, 0x00, 0x10, // 130:65535
-  0xFF, 0xFF, 0x00, 0x10, // 131:65535
-  0xFF, 0xFF, 0x00, 0x10, // 132:65535
-  0xFF, 0xFF, 0x00, 0x10, // 133:65535
-  0xFF, 0xFF, 0x00, 0x10, // 134:65535
-  0xFF, 0xFF, 0x00, 0x10, // 135:65535
-  0xFF, 0xFF, 0x00, 0x10, // 136:65535
-  0xFF, 0xFF, 0x00, 0x10, // 137:65535
-  0xFF, 0xFF, 0x00, 0x10, // 138:65535
-  0xFF, 0xFF, 0x00, 0x10, // 139:65535
-  0x07, 0xC8, 0x1D, 0x0B, // 140:1992
-  0xFF, 0xFF, 0x00, 0x10, // 141:65535
-  0xFF, 0xFF, 0x00, 0x10, // 142:65535
-  0x07, 0xE5, 0x1A, 0x0A, // 143:2021
-  0xFF, 0xFF, 0x00, 0x10, // 144:65535
-  0xFF, 0xFF, 0x00, 0x10, // 145:65535
-  0xFF, 0xFF, 0x00, 0x10, // 146:65535
-  0xFF, 0xFF, 0x00, 0x10, // 147:65535
-  0xFF, 0xFF, 0x00, 0x10, // 148:65535
-  0xFF, 0xFF, 0x00, 0x10, // 149:65535
-  0xFF, 0xFF, 0x00, 0x10, // 150:65535
-  0xFF, 0xFF, 0x00, 0x10, // 151:65535
-  0xFF, 0xFF, 0x00, 0x10, // 152:65535
-  0xFF, 0xFF, 0x00, 0x10, // 153:65535
-  0xFF, 0xFF, 0x00, 0x10, // 154:65535
-  0xFF, 0xFF, 0x00, 0x10, // 155:65535
-  0x07, 0xFF, 0x14, 0x08, // 156:2047
-  0xFF, 0xFF, 0x00, 0x10, // 157:65535
-  0xFF, 0xFF, 0x00, 0x10, // 158:65535
-  0x08, 0x13, 0x14, 0x08, // 159:2067
-  0xFF, 0xFF, 0x00, 0x04, // 160:65535
-  0x08, 0x27, 0x09, 0x05, // 161:2087
-  0x08, 0x30, 0x17, 0x09, // 162:2096
-  0x08, 0x47, 0x17, 0x09, // 163:2119
-  0x08, 0x5E, 0x14, 0x09, // 164:2142
-  0x08, 0x72, 0x1D, 0x0B, // 165:2162
-  0x08, 0x8F, 0x06, 0x04, // 166:2191
-  0x08, 0x95, 0x17, 0x09, // 167:2197
-  0x08, 0xAC, 0x07, 0x05, // 168:2220
-  0x08, 0xB3, 0x23, 0x0C, // 169:2227
-  0x08, 0xD6, 0x0E, 0x06, // 170:2262
-  0x08, 0xE4, 0x14, 0x09, // 171:2276
-  0x08, 0xF8, 0x17, 0x09, // 172:2296
-  0x09, 0x0F, 0x0B, 0x05, // 173:2319
-  0x09, 0x1A, 0x23, 0x0C, // 174:2330
-  0x09, 0x3D, 0x1A, 0x0A, // 175:2365
-  0x09, 0x57, 0x0D, 0x06, // 176:2391
-  0x09, 0x64, 0x17, 0x09, // 177:2404
-  0x09, 0x7B, 0x0E, 0x05, // 178:2427
-  0x09, 0x89, 0x0A, 0x04, // 179:2441
-  0x09, 0x93, 0x0A, 0x05, // 180:2451
-  0x09, 0x9D, 0x17, 0x09, // 181:2461
-  0x09, 0xB4, 0x19, 0x09, // 182:2484
-  0x09, 0xCD, 0x08, 0x05, // 183:2509
-  0x09, 0xD5, 0x0C, 0x05, // 184:2517
-  0x09, 0xE1, 0x17, 0x09, // 185:2529
-  0x09, 0xF8, 0x0D, 0x06, // 186:2552
-  0x0A, 0x05, 0x17, 0x09, // 187:2565
-  0x0A, 0x1C, 0x26, 0x0D, // 188:2588
-  0x0A, 0x42, 0x26, 0x0D, // 189:2626
-  0x0A, 0x68, 0x26, 0x0D, // 190:2664
-  0x0A, 0x8E, 0x14, 0x08, // 191:2702
-  0x0A, 0xA2, 0x1D, 0x0B, // 192:2722
-  0x0A, 0xBF, 0x1D, 0x0B, // 193:2751
-  0x0A, 0xDC, 0x1D, 0x0B, // 194:2780
-  0x0A, 0xF9, 0x1D, 0x0B, // 195:2809
-  0x0B, 0x16, 0x1D, 0x0B, // 196:2838
-  0x0B, 0x33, 0x1D, 0x0B, // 197:2867
-  0x0B, 0x50, 0x20, 0x0C, // 198:2896
-  0x0B, 0x70, 0x20, 0x0C, // 199:2928
-  0x0B, 0x90, 0x1D, 0x0B, // 200:2960
-  0x0B, 0xAD, 0x1D, 0x0B, // 201:2989
-  0x0B, 0xCA, 0x1D, 0x0B, // 202:3018
-  0x0B, 0xE7, 0x1D, 0x0B, // 203:3047
-  0x0C, 0x04, 0x05, 0x04, // 204:3076
-  0x0C, 0x09, 0x07, 0x04, // 205:3081
-  0x0C, 0x10, 0x0A, 0x04, // 206:3088
-  0x0C, 0x1A, 0x07, 0x04, // 207:3098
-  0x0C, 0x21, 0x20, 0x0C, // 208:3105
-  0x0C, 0x41, 0x1D, 0x0C, // 209:3137
-  0x0C, 0x5E, 0x20, 0x0C, // 210:3166
-  0x0C, 0x7E, 0x20, 0x0C, // 211:3198
-  0x0C, 0x9E, 0x20, 0x0C, // 212:3230
-  0x0C, 0xBE, 0x20, 0x0C, // 213:3262
-  0x0C, 0xDE, 0x20, 0x0C, // 214:3294
-  0x0C, 0xFE, 0x17, 0x09, // 215:3326
-  0x0D, 0x15, 0x20, 0x0C, // 216:3349
-  0x0D, 0x35, 0x1D, 0x0C, // 217:3381
-  0x0D, 0x52, 0x1D, 0x0C, // 218:3410
-  0x0D, 0x6F, 0x1D, 0x0C, // 219:3439
-  0x0D, 0x8C, 0x1D, 0x0C, // 220:3468
-  0x0D, 0xA9, 0x19, 0x0B, // 221:3497
-  0x0D, 0xC2, 0x1D, 0x0B, // 222:3522
-  0x0D, 0xDF, 0x17, 0x0A, // 223:3551
-  0x0D, 0xF6, 0x17, 0x09, // 224:3574
-  0x0E, 0x0D, 0x17, 0x09, // 225:3597
-  0x0E, 0x24, 0x17, 0x09, // 226:3620
-  0x0E, 0x3B, 0x17, 0x09, // 227:3643
-  0x0E, 0x52, 0x17, 0x09, // 228:3666
-  0x0E, 0x69, 0x17, 0x09, // 229:3689
-  0x0E, 0x80, 0x14, 0x08, // 230:3712
-  0x0E, 0x94, 0x14, 0x08, // 231:3732
-  0x0E, 0xA8, 0x17, 0x09, // 232:3752
-  0x0E, 0xBF, 0x17, 0x09, // 233:3775
-  0x0E, 0xD6, 0x17, 0x09, // 234:3798
-  0x0E, 0xED, 0x17, 0x09, // 235:3821
-  0x0F, 0x04, 0x05, 0x04, // 236:3844
-  0x0F, 0x09, 0x07, 0x04, // 237:3849
-  0x0F, 0x10, 0x0A, 0x04, // 238:3856
-  0x0F, 0x1A, 0x07, 0x04, // 239:3866
-  0x0F, 0x21, 0x17, 0x09, // 240:3873
-  0x0F, 0x38, 0x14, 0x09, // 241:3896
-  0x0F, 0x4C, 0x17, 0x09, // 242:3916
-  0x0F, 0x63, 0x17, 0x09, // 243:3939
-  0x0F, 0x7A, 0x17, 0x09, // 244:3962
-  0x0F, 0x91, 0x17, 0x09, // 245:3985
-  0x0F, 0xA8, 0x17, 0x09, // 246:4008
-  0x0F, 0xBF, 0x17, 0x09, // 247:4031
-  0x0F, 0xD6, 0x17, 0x0A, // 248:4054
-  0x0F, 0xED, 0x14, 0x09, // 249:4077
-  0x10, 0x01, 0x14, 0x09, // 250:4097
-  0x10, 0x15, 0x14, 0x09, // 251:4117
-  0x10, 0x29, 0x14, 0x09, // 252:4137
-  0x10, 0x3D, 0x13, 0x08, // 253:4157
-  0x10, 0x50, 0x17, 0x09, // 254:4176
-  0x10, 0x67, 0x13, 0x08, // 255:4199
-
-  // Font Data
-  0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x5F, // 33
-  0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78, // 34
-  0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08, // 35
-  0x00,0x00,0x00,0xE0,0x10,0x00,0x10,0x21,0x00,0x08,0x41,0x00,0xFC,0xFF,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 36
-  0x00,0x00,0x00,0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x61,0x00,0xF0,0x18,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x30,0x3C,0x00,0x08,0x42,0x00,0x00,0x42,0x00,0x00,0x42,0x00,0x00,0x3C, // 37
-  0x00,0x00,0x00,0x00,0x1C,0x00,0x70,0x22,0x00,0x88,0x41,0x00,0x08,0x43,0x00,0x88,0x44,0x00,0x70,0x28,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0x00,0x44, // 38
-  0x00,0x00,0x00,0x78, // 39
-  0x00,0x00,0x00,0x80,0x3F,0x00,0x70,0xC0,0x01,0x08,0x00,0x02, // 40
-  0x00,0x00,0x00,0x08,0x00,0x02,0x70,0xC0,0x01,0x80,0x3F, // 41
-  0x10,0x00,0x00,0xD0,0x00,0x00,0x38,0x00,0x00,0xD0,0x00,0x00,0x10, // 42
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0xC0,0x1F,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 43
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01, // 44
-  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 45
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40, // 46
-  0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 47
-  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xE0,0x1F, // 48
-  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0xF8,0x7F, // 49
-  0x00,0x00,0x00,0x20,0x40,0x00,0x10,0x60,0x00,0x08,0x50,0x00,0x08,0x48,0x00,0x08,0x44,0x00,0x10,0x43,0x00,0xE0,0x40, // 50
-  0x00,0x00,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x88,0x41,0x00,0xF0,0x22,0x00,0x00,0x1C, // 51
-  0x00,0x0C,0x00,0x00,0x0A,0x00,0x00,0x09,0x00,0xC0,0x08,0x00,0x20,0x08,0x00,0x10,0x08,0x00,0xF8,0x7F,0x00,0x00,0x08, // 52
-  0x00,0x00,0x00,0xC0,0x11,0x00,0xB8,0x20,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x08,0x21,0x00,0x08,0x1E, // 53
-  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x21,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x10,0x21,0x00,0x20,0x1E, // 54
-  0x00,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x78,0x00,0x08,0x07,0x00,0xC8,0x00,0x00,0x28,0x00,0x00,0x18, // 55
-  0x00,0x00,0x00,0x60,0x1C,0x00,0x90,0x22,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 56
-  0x00,0x00,0x00,0xE0,0x11,0x00,0x10,0x22,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x10,0x22,0x00,0xE0,0x1F, // 57
-  0x00,0x00,0x00,0x40,0x40, // 58
-  0x00,0x00,0x00,0x40,0xC0,0x01, // 59
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x40,0x10, // 60
-  0x00,0x00,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08, // 61
-  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x00,0x02, // 62
-  0x00,0x00,0x00,0x60,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x08,0x5C,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0, // 63
-  0x00,0x00,0x00,0x00,0x3F,0x00,0xC0,0x40,0x00,0x20,0x80,0x00,0x10,0x1E,0x01,0x10,0x21,0x01,0x88,0x40,0x02,0x48,0x40,0x02,0x48,0x40,0x02,0x48,0x20,0x02,0x88,0x7C,0x02,0xC8,0x43,0x02,0x10,0x40,0x02,0x10,0x20,0x01,0x60,0x10,0x01,0x80,0x8F, // 64
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 65
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 66
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 67
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 68
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 69
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08, // 70
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x12,0x00,0x00,0x0E, // 71
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0xF8,0x7F, // 72
-  0x00,0x00,0x00,0xF8,0x7F, // 73
-  0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0xF8,0x3F, // 74
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x04,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0x80,0x03,0x00,0x40,0x04,0x00,0x20,0x18,0x00,0x10,0x20,0x00,0x08,0x40, // 75
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 76
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0xF8,0x7F, // 77
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x04,0x00,0x00,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 78
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 79
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0, // 80
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x50,0x00,0x08,0x50,0x00,0x10,0x20,0x00,0x20,0x70,0x00,0xC0,0x4F, // 81
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x06,0x00,0x08,0x1A,0x00,0x10,0x21,0x00,0xE0,0x40, // 82
-  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 83
-  0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0x7F,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 84
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 85
-  0x00,0x00,0x00,0x18,0x00,0x00,0xE0,0x00,0x00,0x00,0x07,0x00,0x00,0x18,0x00,0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x07,0x00,0xE0,0x00,0x00,0x18, // 86
-  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x03,0x00,0x70,0x00,0x00,0x08,0x00,0x00,0x70,0x00,0x00,0x80,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 87
-  0x00,0x40,0x00,0x08,0x20,0x00,0x10,0x10,0x00,0x60,0x0C,0x00,0x80,0x02,0x00,0x00,0x01,0x00,0x80,0x02,0x00,0x60,0x0C,0x00,0x10,0x10,0x00,0x08,0x20,0x00,0x00,0x40, // 88
-  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x00,0x7E,0x00,0x80,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 89
-  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x88,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 90
-  0x00,0x00,0x00,0xF8,0xFF,0x03,0x08,0x00,0x02,0x08,0x00,0x02, // 91
-  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60, // 92
-  0x08,0x00,0x02,0x08,0x00,0x02,0xF8,0xFF,0x03, // 93
-  0x00,0x01,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0x08,0x00,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x01, // 94
-  0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 95
-  0x00,0x00,0x00,0x08,0x00,0x00,0x10, // 96
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 97
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 98
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20, // 99
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xF8,0x7F, // 100
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 101
-  0x40,0x00,0x00,0xF0,0x7F,0x00,0x48,0x00,0x00,0x48, // 102
-  0x00,0x00,0x00,0x00,0x1F,0x01,0x80,0x20,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x80,0x20,0x01,0xC0,0xFF, // 103
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 104
-  0x00,0x00,0x00,0xC8,0x7F, // 105
-  0x00,0x00,0x02,0xC8,0xFF,0x01, // 106
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x06,0x00,0x00,0x19,0x00,0x80,0x20,0x00,0x40,0x40, // 107
-  0x00,0x00,0x00,0xF8,0x7F, // 108
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 109
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 110
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 111
-  0x00,0x00,0x00,0xC0,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 112
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xC0,0xFF,0x03, // 113
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40, // 114
-  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x38, // 115
-  0x40,0x00,0x00,0xF0,0x7F,0x00,0x40,0x40,0x00,0x40,0x40, // 116
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 117
-  0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0, // 118
-  0xC0,0x00,0x00,0x00,0x1F,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1F,0x00,0xC0, // 119
-  0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x40,0x40, // 120
-  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x00,0xE0,0x01,0x00,0x38,0x00,0x00,0x07,0x00,0xC0, // 121
-  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x40,0x44,0x00,0x40,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 122
-  0x00,0x04,0x00,0x00,0x04,0x00,0xF0,0xFB,0x01,0x08,0x00,0x02,0x08,0x00,0x02, // 123
-  0x00,0x00,0x00,0xF8,0xFF,0x03, // 124
-  0x08,0x00,0x02,0x08,0x00,0x02,0xF0,0xFB,0x01,0x00,0x04,0x00,0x00,0x04, // 125
-  0x00,0x02,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01, // 126
-  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 140
-  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x8A,0x40,0x00,0x69,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 143
-  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x40,0x44,0x00,0x80,0x38, // 156
-  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x50,0x44,0x00,0x48,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 159
-  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0xFF,0x03, // 161
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x03,0x40,0xF0,0x00,0x40,0x4E,0x00,0xC0,0x41,0x00,0xB8,0x20,0x00,0x00,0x11, // 162
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x42,0x00,0x00,0x41,0x00,0x80,0x40,0x00,0x40,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 163
-  0x00,0x00,0x00,0x40,0x0B,0x00,0x80,0x04,0x00,0x40,0x08,0x00,0x40,0x08,0x00,0x80,0x04,0x00,0x40,0x0B, // 164
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x02,0x80,0x87,0x02,0x00,0x1C,0x03,0x00,0x60, // 165
-  0x00,0x00,0x00,0xF8,0xF1,0x03, // 166
-  0x00,0x86,0x00,0x70,0x09,0x01,0xC8,0x10,0x02,0x88,0x10,0x02,0x08,0x21,0x02,0x08,0x61,0x02,0x30,0xD2,0x01,0x00,0x0C, // 167
-  0x08,0x00,0x00,0x00,0x00,0x00,0x08, // 168
-  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xC8,0x47,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x48,0x44,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 169
-  0xD0,0x00,0x00,0x48,0x01,0x00,0x28,0x01,0x00,0x28,0x01,0x00,0xF0,0x01, // 170
-  0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20, // 171
-  0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x0F, // 172
-  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 173
-  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xE8,0x4F,0x00,0x28,0x41,0x00,0x28,0x41,0x00,0x28,0x43,0x00,0x28,0x45,0x00,0xC8,0x48,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 174
-  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x0A,0x43,0x00,0x8A,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 175
-  0x00,0x00,0x00,0x30,0x00,0x00,0x48,0x00,0x00,0x48,0x00,0x00,0x30, // 176
-  0x00,0x00,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0xE0,0x4F,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41, // 177
-  0x10,0x01,0x00,0x88,0x01,0x00,0x48,0x01,0x00,0x48,0x01,0x00,0x30,0x01, // 178
-  0x00,0x06,0x00,0xF8,0x7F,0x00,0x80,0x01,0x00,0x40, // 179
-  0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08, // 180
-  0x00,0x00,0x00,0xC0,0xFF,0x03,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 181
-  0xF0,0x00,0x00,0xF8,0x00,0x00,0xF8,0x01,0x00,0xF8,0x01,0x00,0xF8,0xFF,0x03,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0xFF,0x03,0x08, // 182
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, // 183
-  0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x80,0x02,0x00,0x00,0x03, // 184
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x02,0x40,0xC2,0x02,0x40,0x22,0x03,0x80,0x7F, // 185
-  0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0xF0, // 186
-  0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04, // 187
-  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x21,0x00,0x00,0x10,0x00,0x00,0x0C,0x00,0x00,0x02,0x00,0x80,0x01,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20, // 188
-  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x31,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x60,0x44,0x00,0x10,0x62,0x00,0x08,0x52,0x00,0x00,0x52,0x00,0x00,0x4C, // 189
-  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x41,0x00,0x28,0x21,0x00,0xD8,0x18,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20, // 190
-  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x50,0x44,0x00,0x50,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 191
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x71,0x04,0x00,0x0A,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 192
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x0A,0x04,0x00,0x71,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 193
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x71,0x04,0x00,0x82,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 194
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x72,0x04,0x00,0x81,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 195
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x08,0x04,0x00,0x72,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 196
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x7E,0x04,0x00,0x0A,0x04,0x00,0x7E,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 197
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 198
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x02,0x08,0xC0,0x02,0x08,0x40,0x03,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 199
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 200
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 201
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x02,0x08,0xC1,0x02,0x08,0x41,0x03,0x08,0x41,0x00,0x08,0x40, // 202
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 203
-  0x01,0x00,0x00,0xFA,0x7F, // 204
-  0x00,0x00,0x00,0xFA,0x7F,0x00,0x01, // 205
-  0x02,0x00,0x00,0xF9,0x7F,0x00,0x01,0x00,0x00,0x02, // 206
-  0x02,0x00,0x00,0xF8,0x7F,0x00,0x02, // 207
-  0x00,0x02,0x00,0xF8,0x7F,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 208
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x02,0x04,0x00,0x01,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 209
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 210
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 211
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 212
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 213
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 214
-  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x07,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x40,0x10, // 215
-  0x00,0x00,0x00,0xC0,0x4F,0x00,0x20,0x30,0x00,0x10,0x30,0x00,0x08,0x4C,0x00,0x08,0x42,0x00,0x08,0x41,0x00,0xC8,0x40,0x00,0x30,0x20,0x00,0x30,0x10,0x00,0xC8,0x0F, // 216
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 217
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 218
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 219
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 220
-  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x02,0x7E,0x00,0x81,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 221
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x40,0x08,0x00,0x80,0x07, // 222
-  0x00,0x00,0x00,0xE0,0x7F,0x00,0x10,0x00,0x00,0x08,0x20,0x00,0x88,0x43,0x00,0x70,0x42,0x00,0x00,0x44,0x00,0x00,0x38, // 223
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 224
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 225
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x42,0x00,0x50,0x22,0x00,0x80,0x7F, // 226
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x48,0x22,0x00,0x80,0x7F, // 227
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 228
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x5C,0x44,0x00,0x54,0x44,0x00,0x5C,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 229
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20, // 230
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x02,0x40,0xC0,0x02,0x40,0x40,0x03,0x80,0x20, // 231
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x48,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 232
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 233
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x02,0x40,0xC4,0x02,0x80,0x24,0x03,0x00,0x17, // 234
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 235
-  0x08,0x00,0x00,0xD0,0x7F, // 236
-  0x00,0x00,0x00,0xD0,0x7F,0x00,0x08, // 237
-  0x10,0x00,0x00,0xC8,0x7F,0x00,0x08,0x00,0x00,0x10, // 238
-  0x10,0x00,0x00,0xC0,0x7F,0x00,0x10, // 239
-  0x00,0x00,0x00,0x00,0x1F,0x00,0xA0,0x20,0x00,0x68,0x40,0x00,0x58,0x40,0x00,0x70,0x40,0x00,0xE8,0x20,0x00,0x00,0x1F, // 240
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x50,0x00,0x00,0x48,0x00,0x00,0x80,0x7F, // 241
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 242
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 243
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x48,0x40,0x00,0x90,0x20,0x00,0x00,0x1F, // 244
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x88,0x20,0x00,0x00,0x1F, // 245
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 246
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x80,0x0A,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 247
-  0x00,0x00,0x00,0x00,0x5F,0x00,0x80,0x30,0x00,0x40,0x48,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x80,0x21,0x00,0x40,0x1F, // 248
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 249
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x08,0x20,0x00,0xC0,0x7F, // 250
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x10,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xC0,0x7F, // 251
-  0x00,0x00,0x00,0xD0,0x3F,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 252
-  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x10,0xE0,0x01,0x08,0x38,0x00,0x00,0x07,0x00,0xC0, // 253
-  0x00,0x00,0x00,0xF8,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 254
-  0xC0,0x01,0x00,0x00,0x06,0x02,0x10,0x38,0x02,0x00,0xE0,0x01,0x10,0x38,0x00,0x00,0x07,0x00,0xC0 // 255
-};
-#endif // ARIALMT_WIN1250_PLAIN_16_H
diff --git a/src/ArialMT_Win1250_Plain_24.h b/src/ArialMT_Win1250_Plain_24.h
deleted file mode 100644
index 799f2d7d..00000000
--- a/src/ArialMT_Win1250_Plain_24.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// Created by php script OLEDFontsToool by Goral64
-#ifndef ARIALMT_WIN1250_PLAIN_24_H
-#define ARIALMT_WIN1250_PLAIN_24_H
-
-const uint8_t ArialMT_Win1250_Plain_24[] PROGMEM = {
-  0x18, // Width: 24
-  0x1C, // Height: 28
-  0x20, // First Char: 32
-  0xE0, // Numbers of Chars: 224
-
-  // Jump Table
-  0xFF, 0xFF, 0x00, 0x07, // 32:65535
-  0x00, 0x00, 0x13, 0x07, // 33:0
-  0x00, 0x13, 0x1A, 0x09, // 34:19
-  0x00, 0x2D, 0x33, 0x0D, // 35:45
-  0x00, 0x60, 0x2F, 0x0D, // 36:96
-  0x00, 0x8F, 0x4F, 0x15, // 37:143
-  0x00, 0xDE, 0x3B, 0x10, // 38:222
-  0x01, 0x19, 0x0A, 0x05, // 39:281
-  0x01, 0x23, 0x1C, 0x08, // 40:291
-  0x01, 0x3F, 0x1B, 0x08, // 41:319
-  0x01, 0x5A, 0x21, 0x09, // 42:346
-  0x01, 0x7B, 0x32, 0x0E, // 43:379
-  0x01, 0xAD, 0x10, 0x07, // 44:429
-  0x01, 0xBD, 0x1B, 0x08, // 45:445
-  0x01, 0xD8, 0x0F, 0x07, // 46:472
-  0x01, 0xE7, 0x19, 0x07, // 47:487
-  0x02, 0x00, 0x2F, 0x0D, // 48:512
-  0x02, 0x2F, 0x23, 0x0D, // 49:559
-  0x02, 0x52, 0x2F, 0x0D, // 50:594
-  0x02, 0x81, 0x2F, 0x0D, // 51:641
-  0x02, 0xB0, 0x2F, 0x0D, // 52:688
-  0x02, 0xDF, 0x2F, 0x0D, // 53:735
-  0x03, 0x0E, 0x2F, 0x0D, // 54:782
-  0x03, 0x3D, 0x2D, 0x0D, // 55:829
-  0x03, 0x6A, 0x2F, 0x0D, // 56:874
-  0x03, 0x99, 0x2F, 0x0D, // 57:921
-  0x03, 0xC8, 0x0F, 0x07, // 58:968
-  0x03, 0xD7, 0x10, 0x07, // 59:983
-  0x03, 0xE7, 0x2F, 0x0E, // 60:999
-  0x04, 0x16, 0x2F, 0x0E, // 61:1046
-  0x04, 0x45, 0x2E, 0x0E, // 62:1093
-  0x04, 0x73, 0x2E, 0x0D, // 63:1139
-  0x04, 0xA1, 0x5B, 0x18, // 64:1185
-  0x04, 0xFC, 0x3B, 0x10, // 65:1276
-  0x05, 0x37, 0x3B, 0x10, // 66:1335
-  0x05, 0x72, 0x3F, 0x11, // 67:1394
-  0x05, 0xB1, 0x3F, 0x11, // 68:1457
-  0x05, 0xF0, 0x3B, 0x10, // 69:1520
-  0x06, 0x2B, 0x35, 0x0F, // 70:1579
-  0x06, 0x60, 0x43, 0x13, // 71:1632
-  0x06, 0xA3, 0x3B, 0x11, // 72:1699
-  0x06, 0xDE, 0x0F, 0x07, // 73:1758
-  0x06, 0xED, 0x27, 0x0C, // 74:1773
-  0x07, 0x14, 0x3F, 0x10, // 75:1812
-  0x07, 0x53, 0x2F, 0x0D, // 76:1875
-  0x07, 0x82, 0x43, 0x14, // 77:1922
-  0x07, 0xC5, 0x3B, 0x11, // 78:1989
-  0x08, 0x00, 0x47, 0x13, // 79:2048
-  0x08, 0x47, 0x3A, 0x10, // 80:2119
-  0x08, 0x81, 0x47, 0x13, // 81:2177
-  0x08, 0xC8, 0x3F, 0x11, // 82:2248
-  0x09, 0x07, 0x3B, 0x10, // 83:2311
-  0x09, 0x42, 0x35, 0x0F, // 84:2370
-  0x09, 0x77, 0x3B, 0x11, // 85:2423
-  0x09, 0xB2, 0x39, 0x10, // 86:2482
-  0x09, 0xEB, 0x59, 0x17, // 87:2539
-  0x0A, 0x44, 0x3B, 0x10, // 88:2628
-  0x0A, 0x7F, 0x3D, 0x10, // 89:2687
-  0x0A, 0xBC, 0x37, 0x0F, // 90:2748
-  0x0A, 0xF3, 0x14, 0x07, // 91:2803
-  0x0B, 0x07, 0x1B, 0x07, // 92:2823
-  0x0B, 0x22, 0x18, 0x07, // 93:2850
-  0x0B, 0x3A, 0x2A, 0x0B, // 94:2874
-  0x0B, 0x64, 0x34, 0x0D, // 95:2916
-  0x0B, 0x98, 0x11, 0x08, // 96:2968
-  0x0B, 0xA9, 0x2F, 0x0D, // 97:2985
-  0x0B, 0xD8, 0x33, 0x0D, // 98:3032
-  0x0C, 0x0B, 0x2B, 0x0C, // 99:3083
-  0x0C, 0x36, 0x2F, 0x0D, // 100:3126
-  0x0C, 0x65, 0x2F, 0x0D, // 101:3173
-  0x0C, 0x94, 0x1A, 0x07, // 102:3220
-  0x0C, 0xAE, 0x2F, 0x0D, // 103:3246
-  0x0C, 0xDD, 0x2F, 0x0D, // 104:3293
-  0x0D, 0x0C, 0x0F, 0x05, // 105:3340
-  0x0D, 0x1B, 0x10, 0x05, // 106:3355
-  0x0D, 0x2B, 0x2F, 0x0C, // 107:3371
-  0x0D, 0x5A, 0x0F, 0x05, // 108:3418
-  0x0D, 0x69, 0x47, 0x14, // 109:3433
-  0x0D, 0xB0, 0x2F, 0x0D, // 110:3504
-  0x0D, 0xDF, 0x2F, 0x0D, // 111:3551
-  0x0E, 0x0E, 0x33, 0x0D, // 112:3598
-  0x0E, 0x41, 0x30, 0x0D, // 113:3649
-  0x0E, 0x71, 0x1E, 0x08, // 114:3697
-  0x0E, 0x8F, 0x2B, 0x0C, // 115:3727
-  0x0E, 0xBA, 0x1B, 0x07, // 116:3770
-  0x0E, 0xD5, 0x2F, 0x0D, // 117:3797
-  0x0F, 0x04, 0x2A, 0x0C, // 118:3844
-  0x0F, 0x2E, 0x42, 0x11, // 119:3886
-  0x0F, 0x70, 0x2B, 0x0C, // 120:3952
-  0x0F, 0x9B, 0x2A, 0x0C, // 121:3995
-  0x0F, 0xC5, 0x2B, 0x0C, // 122:4037
-  0x0F, 0xF0, 0x1C, 0x08, // 123:4080
-  0x10, 0x0C, 0x10, 0x06, // 124:4108
-  0x10, 0x1C, 0x1B, 0x08, // 125:4124
-  0x10, 0x37, 0x32, 0x0E, // 126:4151
-  0xFF, 0xFF, 0x00, 0x00, // 127:65535
-  0xFF, 0xFF, 0x00, 0x18, // 128:65535
-  0xFF, 0xFF, 0x00, 0x18, // 129:65535
-  0xFF, 0xFF, 0x00, 0x18, // 130:65535
-  0xFF, 0xFF, 0x00, 0x18, // 131:65535
-  0xFF, 0xFF, 0x00, 0x18, // 132:65535
-  0xFF, 0xFF, 0x00, 0x18, // 133:65535
-  0xFF, 0xFF, 0x00, 0x18, // 134:65535
-  0xFF, 0xFF, 0x00, 0x18, // 135:65535
-  0xFF, 0xFF, 0x00, 0x18, // 136:65535
-  0xFF, 0xFF, 0x00, 0x18, // 137:65535
-  0xFF, 0xFF, 0x00, 0x18, // 138:65535
-  0xFF, 0xFF, 0x00, 0x18, // 139:65535
-  0x10, 0x69, 0x3B, 0x10, // 140:4201
-  0xFF, 0xFF, 0x00, 0x18, // 141:65535
-  0xFF, 0xFF, 0x00, 0x18, // 142:65535
-  0x10, 0xA4, 0x37, 0x0F, // 143:4260
-  0xFF, 0xFF, 0x00, 0x18, // 144:65535
-  0xFF, 0xFF, 0x00, 0x18, // 145:65535
-  0xFF, 0xFF, 0x00, 0x18, // 146:65535
-  0xFF, 0xFF, 0x00, 0x18, // 147:65535
-  0xFF, 0xFF, 0x00, 0x18, // 148:65535
-  0xFF, 0xFF, 0x00, 0x18, // 149:65535
-  0xFF, 0xFF, 0x00, 0x18, // 150:65535
-  0xFF, 0xFF, 0x00, 0x18, // 151:65535
-  0xFF, 0xFF, 0x00, 0x18, // 152:65535
-  0xFF, 0xFF, 0x00, 0x18, // 153:65535
-  0xFF, 0xFF, 0x00, 0x18, // 154:65535
-  0xFF, 0xFF, 0x00, 0x18, // 155:65535
-  0x10, 0xDB, 0x2B, 0x0C, // 156:4315
-  0xFF, 0xFF, 0x00, 0x18, // 157:65535
-  0xFF, 0xFF, 0x00, 0x18, // 158:65535
-  0x11, 0x06, 0x2B, 0x0C, // 159:4358
-  0xFF, 0xFF, 0x00, 0x07, // 160:65535
-  0x11, 0x31, 0x14, 0x08, // 161:4401
-  0x11, 0x45, 0x2B, 0x0D, // 162:4421
-  0x11, 0x70, 0x2F, 0x0D, // 163:4464
-  0x11, 0x9F, 0x33, 0x0D, // 164:4511
-  0x11, 0xD2, 0x3B, 0x10, // 165:4562
-  0x12, 0x0D, 0x10, 0x06, // 166:4621
-  0x12, 0x1D, 0x2F, 0x0D, // 167:4637
-  0x12, 0x4C, 0x19, 0x08, // 168:4684
-  0x12, 0x65, 0x46, 0x12, // 169:4709
-  0x12, 0xAB, 0x1A, 0x09, // 170:4779
-  0x12, 0xC5, 0x27, 0x0D, // 171:4805
-  0x12, 0xEC, 0x2F, 0x0E, // 172:4844
-  0x13, 0x1B, 0x1B, 0x08, // 173:4891
-  0x13, 0x36, 0x46, 0x12, // 174:4918
-  0x13, 0x7C, 0x37, 0x0F, // 175:4988
-  0x13, 0xB3, 0x1E, 0x0A, // 176:5043
-  0x13, 0xD1, 0x33, 0x0D, // 177:5073
-  0x14, 0x04, 0x1A, 0x08, // 178:5124
-  0x14, 0x1E, 0x16, 0x06, // 179:5150
-  0x14, 0x34, 0x19, 0x08, // 180:5172
-  0x14, 0x4D, 0x2F, 0x0E, // 181:5197
-  0x14, 0x7C, 0x31, 0x0D, // 182:5244
-  0x14, 0xAD, 0x12, 0x08, // 183:5293
-  0x14, 0xBF, 0x18, 0x08, // 184:5311
-  0x14, 0xD7, 0x2F, 0x0D, // 185:5335
-  0x15, 0x06, 0x1E, 0x09, // 186:5382
-  0x15, 0x24, 0x2E, 0x0D, // 187:5412
-  0x15, 0x52, 0x4F, 0x14, // 188:5458
-  0x15, 0xA1, 0x4B, 0x14, // 189:5537
-  0x15, 0xEC, 0x4B, 0x14, // 190:5612
-  0x16, 0x37, 0x2B, 0x0C, // 191:5687
-  0x16, 0x62, 0x3B, 0x10, // 192:5730
-  0x16, 0x9D, 0x3B, 0x10, // 193:5789
-  0x16, 0xD8, 0x3B, 0x10, // 194:5848
-  0x17, 0x13, 0x3B, 0x10, // 195:5907
-  0x17, 0x4E, 0x3B, 0x10, // 196:5966
-  0x17, 0x89, 0x3B, 0x10, // 197:6025
-  0x17, 0xC4, 0x3F, 0x11, // 198:6084
-  0x18, 0x03, 0x3F, 0x11, // 199:6147
-  0x18, 0x42, 0x3B, 0x10, // 200:6210
-  0x18, 0x7D, 0x3B, 0x10, // 201:6269
-  0x18, 0xB8, 0x3B, 0x10, // 202:6328
-  0x18, 0xF3, 0x3B, 0x10, // 203:6387
-  0x19, 0x2E, 0x11, 0x07, // 204:6446
-  0x19, 0x3F, 0x11, 0x07, // 205:6463
-  0x19, 0x50, 0x15, 0x07, // 206:6480
-  0x19, 0x65, 0x15, 0x07, // 207:6501
-  0x19, 0x7A, 0x3F, 0x11, // 208:6522
-  0x19, 0xB9, 0x3B, 0x11, // 209:6585
-  0x19, 0xF4, 0x47, 0x13, // 210:6644
-  0x1A, 0x3B, 0x47, 0x13, // 211:6715
-  0x1A, 0x82, 0x47, 0x13, // 212:6786
-  0x1A, 0xC9, 0x47, 0x13, // 213:6857
-  0x1B, 0x10, 0x47, 0x13, // 214:6928
-  0x1B, 0x57, 0x2B, 0x0E, // 215:6999
-  0x1B, 0x82, 0x47, 0x13, // 216:7042
-  0x1B, 0xC9, 0x3B, 0x11, // 217:7113
-  0x1C, 0x04, 0x3B, 0x11, // 218:7172
-  0x1C, 0x3F, 0x3B, 0x11, // 219:7231
-  0x1C, 0x7A, 0x3B, 0x11, // 220:7290
-  0x1C, 0xB5, 0x3D, 0x10, // 221:7349
-  0x1C, 0xF2, 0x3A, 0x10, // 222:7410
-  0x1D, 0x2C, 0x37, 0x0F, // 223:7468
-  0x1D, 0x63, 0x2F, 0x0D, // 224:7523
-  0x1D, 0x92, 0x2F, 0x0D, // 225:7570
-  0x1D, 0xC1, 0x2F, 0x0D, // 226:7617
-  0x1D, 0xF0, 0x2F, 0x0D, // 227:7664
-  0x1E, 0x1F, 0x2F, 0x0D, // 228:7711
-  0x1E, 0x4E, 0x2F, 0x0D, // 229:7758
-  0x1E, 0x7D, 0x2B, 0x0C, // 230:7805
-  0x1E, 0xA8, 0x2B, 0x0C, // 231:7848
-  0x1E, 0xD3, 0x2F, 0x0D, // 232:7891
-  0x1F, 0x02, 0x2F, 0x0D, // 233:7938
-  0x1F, 0x31, 0x2F, 0x0D, // 234:7985
-  0x1F, 0x60, 0x2F, 0x0D, // 235:8032
-  0x1F, 0x8F, 0x11, 0x07, // 236:8079
-  0x1F, 0xA0, 0x11, 0x07, // 237:8096
-  0x1F, 0xB1, 0x15, 0x07, // 238:8113
-  0x1F, 0xC6, 0x15, 0x07, // 239:8134
-  0x1F, 0xDB, 0x2F, 0x0D, // 240:8155
-  0x20, 0x0A, 0x2F, 0x0D, // 241:8202
-  0x20, 0x39, 0x2F, 0x0D, // 242:8249
-  0x20, 0x68, 0x2F, 0x0D, // 243:8296
-  0x20, 0x97, 0x2F, 0x0D, // 244:8343
-  0x20, 0xC6, 0x2F, 0x0D, // 245:8390
-  0x20, 0xF5, 0x2F, 0x0D, // 246:8437
-  0x21, 0x24, 0x32, 0x0D, // 247:8484
-  0x21, 0x56, 0x33, 0x0F, // 248:8534
-  0x21, 0x89, 0x2F, 0x0D, // 249:8585
-  0x21, 0xB8, 0x2F, 0x0D, // 250:8632
-  0x21, 0xE7, 0x2F, 0x0D, // 251:8679
-  0x22, 0x16, 0x2F, 0x0D, // 252:8726
-  0x22, 0x45, 0x2A, 0x0C, // 253:8773
-  0x22, 0x6F, 0x2F, 0x0D, // 254:8815
-  0x22, 0x9E, 0x2A, 0x0C, // 255:8862
-
-  // Font Data
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x33,0x00,0xE0,0xFF,0x33, // 33
-  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07, // 34
-  0x00,0x0C,0x03,0x00,0x00,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x03,0x00,0x00,0x0C,0x03, // 35
-  0x00,0x00,0x00,0x00,0x80,0x07,0x06,0x00,0xC0,0x0F,0x1E,0x00,0xC0,0x18,0x1C,0x00,0x60,0x18,0x38,0x00,0x60,0x30,0x30,0x00,0xF0,0xFF,0xFF,0x00,0x60,0x30,0x30,0x00,0x60,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0xC1,0x1F,0x00,0x00,0x81,0x07, // 36
-  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x00,0x60,0x30,0x38,0x00,0xC0,0x1F,0x1E,0x00,0x80,0x8F,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x8F,0x0F,0x00,0xC0,0xC3,0x1F,0x00,0xE0,0x60,0x30,0x00,0x20,0x20,0x20,0x00,0x00,0x20,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 37
-  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0xC0,0x0F,0x00,0x80,0xE3,0x1C,0x00,0xC0,0x77,0x38,0x00,0xE0,0x3C,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x78,0x30,0x00,0xE0,0xEC,0x38,0x00,0xC0,0x8F,0x1B,0x00,0x80,0x03,0x1F,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xC0,0x38,0x00,0x00,0x00,0x10, // 38
-  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07, // 39
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x0F,0x00,0x00,0xFE,0x7F,0x00,0x80,0x0F,0xF0,0x01,0xC0,0x01,0x80,0x03,0x60,0x00,0x00,0x06,0x20,0x00,0x00,0x04, // 40
-  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x04,0x60,0x00,0x00,0x06,0xC0,0x01,0x80,0x03,0x80,0x0F,0xF0,0x01,0x00,0xFE,0x7F,0x00,0x00,0xF0,0x0F, // 41
-  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x04,0x00,0x00,0x80,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x80,0x04,0x00,0x00,0x80, // 42
-  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xFF,0x0F,0x00,0x00,0xFF,0x0F,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 43
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x03,0x00,0x00,0xF0,0x01, // 44
-  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 45
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 46
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x3F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60, // 47
-  0x00,0x00,0x00,0x00,0x00,0xFE,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x01,0x1C,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x03, // 48
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 49
-  0x00,0x00,0x00,0x00,0x00,0x03,0x30,0x00,0xC0,0x03,0x38,0x00,0xC0,0x00,0x3C,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x33,0x00,0x60,0x80,0x31,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x30,0x00,0xC0,0x30,0x30,0x00,0xC0,0x1F,0x30,0x00,0x00,0x0F,0x30, // 50
-  0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x00,0xC0,0x01,0x0E,0x00,0xC0,0x00,0x1C,0x00,0x60,0x00,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x0F,0x00,0x00,0x80,0x07, // 51
-  0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x03,0x00,0x00,0x3C,0x03,0x00,0x00,0x0E,0x03,0x00,0x80,0x07,0x03,0x00,0xC0,0x01,0x03,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x03, // 52
-  0x00,0x00,0x00,0x00,0x00,0x30,0x06,0x00,0x80,0x3F,0x0E,0x00,0xE0,0x1F,0x18,0x00,0x60,0x08,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x18,0x1C,0x00,0x60,0xF0,0x0F,0x00,0x00,0xE0,0x03, // 53
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x63,0x1C,0x00,0xC0,0x30,0x38,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0xE0,0x30,0x18,0x00,0xC0,0xF1,0x0F,0x00,0x80,0xC1,0x07, // 54
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x3C,0x00,0x60,0x80,0x3F,0x00,0x60,0xE0,0x03,0x00,0x60,0x78,0x00,0x00,0x60,0x0E,0x00,0x00,0x60,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60, // 55
-  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x80,0xC7,0x1F,0x00,0xC0,0x6F,0x18,0x00,0xE0,0x38,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xE0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 56
-  0x00,0x00,0x00,0x00,0x00,0x1F,0x0C,0x00,0x80,0x7F,0x1C,0x00,0xC0,0x61,0x38,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x18,0x00,0xC0,0x31,0x1E,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x01, // 57
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 58
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x03,0x00,0x06,0xF0,0x01, // 59
-  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x04,0x01,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x03,0x06, // 60
-  0x00,0x00,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01, // 61
-  0x00,0x00,0x00,0x00,0x00,0x03,0x06,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x04,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x20, // 62
-  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x33,0x00,0x60,0xE0,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x00,0x07, // 63
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x0F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x1E,0xF0,0x00,0x00,0x07,0xC0,0x01,0x80,0xC3,0x87,0x01,0xC0,0xF1,0x9F,0x03,0xC0,0x38,0x18,0x03,0xC0,0x0C,0x30,0x03,0x60,0x0E,0x30,0x06,0x60,0x06,0x30,0x06,0x60,0x06,0x18,0x06,0x60,0x06,0x0C,0x06,0x60,0x0C,0x1E,0x06,0x60,0xF8,0x3F,0x06,0xE0,0xFE,0x31,0x06,0xC0,0x0E,0x30,0x06,0xC0,0x01,0x18,0x03,0x80,0x03,0x1C,0x03,0x00,0x07,0x8F,0x01,0x00,0xFE,0x87,0x01,0x00,0xF8,0xC1,0x00,0x00,0x00,0x40, // 64
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 65
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x78,0x30,0x00,0xC0,0xFF,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 66
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 67
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 68
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 69
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60, // 70
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x60,0x30,0x00,0x60,0x60,0x30,0x00,0xE0,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0x61,0x18,0x00,0x80,0xE3,0x0F,0x00,0x00,0xE2,0x0F, // 71
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 72
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 73
-  0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0xE0,0xFF,0x1F,0x00,0xE0,0xFF,0x0F, // 74
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE7,0x01,0x00,0x80,0x83,0x07,0x00,0xC0,0x01,0x0F,0x00,0xE0,0x00,0x1E,0x00,0x60,0x00,0x38,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 75
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 76
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x07,0x00,0x00,0xFE,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 77
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 78
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 79
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0xC0,0x30,0x00,0x00,0xC0,0x3F,0x00,0x00,0x00,0x0F, // 80
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x0C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x36,0x00,0xE0,0x00,0x3C,0x00,0xC0,0x00,0x1C,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x3F,0x00,0x00,0xFF,0x77,0x00,0x00,0xFC,0x61, // 81
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x70,0x00,0x00,0x60,0xF0,0x00,0x00,0x60,0xF0,0x03,0x00,0x60,0xB0,0x07,0x00,0xE0,0x18,0x1F,0x00,0xC0,0x1F,0x3C,0x00,0x80,0x0F,0x30,0x00,0x00,0x00,0x20, // 82
-  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x70,0x30,0x00,0xC0,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 83
-  0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 84
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 85
-  0x20,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xF8,0x01,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0x20, // 86
-  0x60,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x80,0xFF,0x00,0x00,0x00,0xF8,0x0F,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x80,0x3F,0x00,0x00,0xF8,0x0F,0x00,0x80,0xFF,0x00,0x00,0xE0,0x07,0x00,0x00,0x60, // 87
-  0x00,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x60,0x00,0x3C,0x00,0xE0,0x01,0x1E,0x00,0xC0,0x83,0x07,0x00,0x00,0xCF,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0x38,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0xCF,0x03,0x00,0xC0,0x03,0x07,0x00,0xE0,0x01,0x1E,0x00,0x60,0x00,0x3C,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 88
-  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x3C,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 89
-  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 90
-  0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06, // 91
-  0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 92
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07, // 93
-  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xE0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x20, // 94
-  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06, // 95
-  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x80, // 96
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 97
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 98
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 99
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 100
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 101
-  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x60,0x06, // 102
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x83,0x01,0x00,0xF8,0x8F,0x03,0x00,0x1C,0x1C,0x07,0x00,0x0E,0x38,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x0C,0x18,0x07,0x00,0x18,0x8C,0x03,0x00,0xFE,0xFF,0x01,0x00,0xFE,0xFF, // 103
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 104
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F, // 105
-  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x60,0xFE,0xFF,0x07,0x60,0xFE,0xFF,0x03, // 106
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xF0,0x01,0x00,0x00,0x98,0x07,0x00,0x00,0x0C,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x02,0x30,0x00,0x00,0x00,0x20, // 107
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 108
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 109
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 110
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 111
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 112
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07, // 113
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06, // 114
-  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x31,0x00,0x00,0xC6,0x31,0x00,0x00,0x8E,0x39,0x00,0x00,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 115
-  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 116
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 117
-  0x00,0x06,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xF8,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 118
-  0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x7C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xF0,0x03,0x00,0x00,0x7E,0x00,0x00,0x00,0x0E, // 119
-  0x00,0x02,0x20,0x00,0x00,0x06,0x30,0x00,0x00,0x1E,0x3C,0x00,0x00,0x38,0x0E,0x00,0x00,0xF0,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x07,0x00,0x00,0x38,0x0E,0x00,0x00,0x1C,0x3C,0x00,0x00,0x0E,0x30,0x00,0x00,0x02,0x20, // 120
-  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0x00,0xC0,0x1F,0x00,0x00,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 121
-  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x00,0xE6,0x30,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 122
-  0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x03,0x00,0xC0,0x7F,0xFE,0x03,0xE0,0x3F,0xFC,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06, // 123
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x0F,0xE0,0xFF,0xFF,0x0F, // 124
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0x3F,0xFC,0x07,0xC0,0x7F,0xFF,0x03,0x00,0xC0,0x03,0x00,0x00,0x80,0x01, // 125
-  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60, // 126
-  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x70,0x30,0x00,0xC2,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 140
-  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x68,0x1C,0x30,0x00,0x6E,0x0E,0x30,0x00,0x66,0x07,0x30,0x00,0xE2,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 143
-  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x80,0xC6,0x31,0x00,0xE0,0xC6,0x31,0x00,0x60,0x8E,0x39,0x00,0x20,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 156
-  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x80,0xE6,0x30,0x00,0xE0,0x76,0x30,0x00,0x60,0x3E,0x30,0x00,0x20,0x1E,0x30,0x00,0x00,0x06,0x30, // 159
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE6,0xFF,0x07,0x00,0xE6,0xFF,0x07, // 161
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x9C,0x07,0x00,0x0E,0x78,0x00,0x00,0x06,0x3F,0x00,0x00,0xF6,0x30,0x00,0x00,0x0E,0x30,0x00,0xE0,0x0D,0x1C,0x00,0x00,0x1C,0x0E,0x00,0x00,0x10,0x06, // 162
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x30,0x00,0x00,0x18,0x30,0x00,0x00,0x0C,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x03,0x30,0x00,0x00,0x01,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 163
-  0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x00,0x00,0xF7,0x0E,0x00,0x00,0xFE,0x07,0x00,0x00,0x0C,0x03,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x0C,0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xF7,0x0E,0x00,0x00,0x02,0x04, // 164
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x02,0x80,0x8F,0x01,0x02,0x00,0xFE,0xC1,0x02,0x00,0xF0,0x83,0x03,0x00,0x80,0x0F,0x01,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 165
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x7F,0xF8,0x0F,0xE0,0x7F,0xF8,0x0F, // 166
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0xF3,0xC1,0x00,0xC0,0x1F,0xC3,0x03,0xE0,0x0C,0x07,0x03,0x60,0x1C,0x06,0x06,0x60,0x18,0x0C,0x06,0x60,0x30,0x1C,0x06,0xE0,0x70,0x38,0x07,0xC0,0xE1,0xF4,0x03,0x80,0xC1,0xE7,0x01,0x00,0x80,0x03, // 167
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 168
-  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x79,0x1C,0x00,0xC0,0xFE,0x19,0x00,0x60,0x86,0x31,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x87,0x33,0x00,0xC0,0x86,0x19,0x00,0xC0,0x85,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8, // 169
-  0x00,0x00,0x00,0x00,0xC0,0x1C,0x00,0x00,0xE0,0x3E,0x00,0x00,0x60,0x32,0x00,0x00,0x60,0x32,0x00,0x00,0xE0,0x3F,0x00,0x00,0xC0,0x3F, // 170
-  0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x84,0x10,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x04,0x10, // 171
-  0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFC,0x01, // 172
-  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 173
-  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x01,0x1C,0x00,0xC0,0xFE,0x1B,0x00,0x60,0xFE,0x33,0x00,0x60,0x66,0x30,0x00,0x60,0x66,0x30,0x00,0x60,0xE6,0x30,0x00,0x60,0xFE,0x31,0x00,0x60,0x3C,0x33,0x00,0xC0,0x00,0x1A,0x00,0xC0,0x01,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8, // 174
-  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x6C,0xE0,0x30,0x00,0x6C,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 175
-  0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x40,0x04,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x40,0x04,0x00,0x00,0x80,0x03, // 176
-  0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0xFF,0x3F,0x00,0x00,0xFF,0x3F,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30, // 177
-  0x40,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x38,0x00,0x00,0x20,0x2C,0x00,0x00,0x20,0x26,0x00,0x00,0xE0,0x23,0x00,0x00,0xC0,0x21, // 178
-  0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C, // 179
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 180
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x00,0x1C,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x1C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 181
-  0x00,0x0F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60, // 182
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 183
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0xC0,0x02,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01, // 184
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x02,0x00,0xC6,0x18,0x02,0x00,0xCE,0xCC,0x02,0x00,0xFC,0x9F,0x03,0x00,0xF8,0x3F,0x01,0x00,0x00,0x20, // 185
-  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xE0,0x38,0x00,0x00,0x60,0x30,0x00,0x00,0xE0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 186
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x84,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x80, // 187
-  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x38,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x0C,0x00,0xC0,0x01,0x0E,0x00,0xE0,0x80,0x0B,0x00,0x60,0xC0,0x08,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,0x00,0x00,0x00,0x08, // 188
-  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x30,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x4E,0x20,0x00,0x00,0x67,0x30,0x00,0xC0,0x21,0x38,0x00,0xE0,0x20,0x2C,0x00,0x60,0x20,0x26,0x00,0x00,0xE0,0x27,0x00,0x00,0xC0,0x21, // 189
-  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x20,0x00,0x20,0x22,0x30,0x00,0xE0,0x3D,0x38,0x00,0xC0,0x1D,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x0E,0x0C,0x00,0x00,0x07,0x0E,0x00,0x80,0x83,0x0B,0x00,0xE0,0xC0,0x08,0x00,0x60,0xE0,0x3F,0x00,0x20,0xE0,0x3F,0x00,0x00,0x00,0x08, // 190
-  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0xC0,0xE6,0x30,0x00,0xC0,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 191
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x82,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE8,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 192
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE8,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x82,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 193
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x88,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x08,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 194
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x0C,0xFE,0x01,0x00,0x8E,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xEC,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0E,0xFE,0x01,0x00,0x06,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 195
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x8C,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0C,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 196
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x9C,0x8F,0x01,0x00,0xE2,0x83,0x01,0x00,0x62,0x80,0x01,0x00,0xE2,0x83,0x01,0x00,0x9C,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 197
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 198
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x02,0x60,0x00,0x30,0x02,0x60,0x00,0xF0,0x02,0x60,0x00,0xB0,0x03,0x60,0x00,0x30,0x01,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 199
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 200
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 201
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x02,0x60,0x30,0x30,0x02,0x60,0x30,0xF0,0x02,0x60,0x30,0xB0,0x03,0x60,0x30,0x30,0x01,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 202
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 203
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xEE,0xFF,0x3F,0x00,0x08, // 204
-  0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0xEE,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x02, // 205
-  0x08,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x08, // 206
-  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x0C, // 207
-  0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 208
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0x70,0x00,0x00,0x0E,0xE0,0x01,0x00,0x06,0x80,0x03,0x00,0x02,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 209
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x62,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 210
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 211
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x68,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xE8,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 212
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xCC,0x00,0x18,0x00,0xEE,0x00,0x38,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0xE6,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 213
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xEC,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 214
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x03,0x00,0x00,0x8E,0x03,0x00,0x00,0xDC,0x01,0x00,0x00,0xF8,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xDC,0x01,0x00,0x00,0x8E,0x03,0x00,0x00,0x06,0x03, // 215
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x21,0x00,0x00,0xFF,0x77,0x00,0x80,0x07,0x3F,0x00,0xC0,0x01,0x1E,0x00,0xC0,0x00,0x1F,0x00,0xE0,0x80,0x3B,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x70,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0xE0,0x0E,0x38,0x00,0xC0,0x07,0x18,0x00,0xC0,0x03,0x1C,0x00,0xE0,0x07,0x0F,0x00,0x70,0xFF,0x07,0x00,0x20,0xFC,0x01, // 216
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x02,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 217
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x02,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 218
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x08,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x08,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 219
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 220
-  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0xF0,0x3F,0x00,0x0E,0xF0,0x3F,0x00,0x06,0x3C,0x00,0x00,0x02,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 221
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x07,0x00,0x00,0x86,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0xF8, // 222
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x3F,0x00,0xC0,0xFF,0x3F,0x00,0xC0,0x00,0x00,0x00,0x60,0x00,0x08,0x00,0x60,0x00,0x1C,0x00,0x60,0x00,0x38,0x00,0xE0,0x78,0x30,0x00,0xC0,0x7F,0x30,0x00,0x80,0xC7,0x30,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x0F, // 223
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x20,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 224
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x80,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x18,0x00,0x20,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 225
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x80,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0x60,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0x80,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 226
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0xC0,0x1C,0x1F,0x00,0xE0,0x8C,0x39,0x00,0x60,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xC0,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xE0,0xCE,0x0C,0x00,0x60,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 227
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0xC0,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xC0,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 228
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x70,0x86,0x31,0x00,0x88,0x86,0x31,0x00,0x88,0xC6,0x30,0x00,0x88,0xC6,0x18,0x00,0x70,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 229
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x0E,0x38,0x00,0x20,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 230
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x02,0x00,0x06,0x30,0x02,0x00,0x06,0xF0,0x02,0x00,0x06,0xB0,0x03,0x00,0x0E,0x38,0x01,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 231
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x20,0xCE,0x38,0x00,0x60,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 232
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x80,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x20,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 233
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x02,0x00,0xC6,0x30,0x02,0x00,0xCE,0xF8,0x02,0x00,0xDC,0x98,0x03,0x00,0xF8,0x0C,0x01,0x00,0xF0,0x04, // 234
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 235
-  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0xE0,0xFE,0x3F,0x00,0x80, // 236
-  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0x20, // 237
-  0x80,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0x80, // 238
-  0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0xC0, // 239
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1D,0x1C,0x00,0xA0,0x0F,0x38,0x00,0xA0,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0F,0x38,0x00,0x20,0x1F,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xE0,0x07, // 240
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x80,0x06,0x00,0x00,0xE0,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x20,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 241
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x20,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 242
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x20,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 243
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x80,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0x80,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 244
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0xC0,0x1C,0x1C,0x00,0xE0,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xE0,0x1C,0x1C,0x00,0x60,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 245
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 246
-  0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0xB6,0x01,0x00,0x00,0xB6,0x01,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 247
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x67,0x00,0x00,0xF8,0x7F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x3F,0x00,0x00,0x86,0x33,0x00,0x00,0xE6,0x31,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xFF,0x0F,0x00,0x00,0xF3,0x07, // 248
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x20,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 249
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x18,0x00,0x20,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 250
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x80,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0x80,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 251
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0xC0,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 252
-  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x80,0x00,0xFE,0x03,0xE0,0x00,0xFC,0x00,0x60,0xC0,0x1F,0x00,0x20,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 253
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x00,0x1C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x03, // 254
-  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0xC0,0xF0,0x01,0x06,0xC0,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0xC0,0xC0,0x1F,0x00,0xC0,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06 // 255
-};
-#endif // ARIALMT_WIN1250_PLAIN_24_H
diff --git a/src/CharsetConverter.cpp b/src/CharsetConverter.cpp
deleted file mode 100644
index 14790b26..00000000
--- a/src/CharsetConverter.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <Arduino.h>
-#include "CharsetConverter.h"
-
-// In ESP8266 Arduino core v2.3.0 missing bsearch: https://github.com/esp8266/Arduino/issues/2314
-// Part of GNU C Library
-void * gnu_c_bsearch (const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *)) {
-  size_t l, u, idx;
-  const void *p;
-  int comparison;
-
-  l = 0;
-  u = nmemb;
-  while (l < u) {
-    idx = (l + u) / 2;
-
-    p = (void *) (((const char *) base) + (idx * size));
-    comparison = (*compar) (key, p);
-    if (comparison < 0)
-      u = idx;
-    else if (comparison > 0)
-      l = idx + 1;
-    else
-      return (void *) p;
-  }
-
-  return NULL;
-}
-
-// compare function for bsearch
-int charset_table_cmp(const void* p_key, const void* p_item) {
-  const uint16_t key = *(uint16_t *) p_key;
-  const uint16_t item = (*((char *) p_item)) << 8 | *(((char *) p_item) + 1);
-
-  if (key < item) return -1;
-  else if (key == item) return 0;
-  else return 1;
-}
-
-// convert utf-8 character to windows-1250
-// if utf-8 char continue with next byte, returns 0, otherwise windows-1250 char
-// for unconvertable char returns 0
-char utf8win1250(const uint8_t ch) {
-  static uint16_t uChar;
-  static uint8_t len;
-  char *found;
-
-  if ((ch & 0x80) == 0x00) {
-    uChar = len = 0;
-    return ch;
-  } else if ((ch & 0xE0) == 0xC0) {
-    uChar = ch & 0x1F; len = 1;
-    return 0;
-  } else if ((ch & 0xF0) == 0xE0) {
-    uChar = ch & 0x0F; len = 2;
-    return 0;
-  } else if ((ch & 0xF8) == 0xF0) {
-    uChar = ch & 0x07; len = 3;
-    return 0;
-  } else if ((ch & 0xC0) == 0x80 && len > 0) {
-    uChar = (uChar << 6) | (ch & 0x7F); len--;
-    if (len > 0)
-      return 0;
-  } else {
-    uChar = len = 0;
-    return 0;
-  }
-
-  found = (char*) gnu_c_bsearch(&uChar, utf8_win1250_table + 1, utf8_win1250_table[0], 3 * sizeof(char), charset_table_cmp);
-
-  if (found != NULL) {
-    uChar = len = 0;
-    return *(found + 2); // return win1250 char at 3rd position;
-  }
-
-  return 0;
-}
diff --git a/src/CharsetConverter.h b/src/CharsetConverter.h
deleted file mode 100644
index 9731ab61..00000000
--- a/src/CharsetConverter.h
+++ /dev/null
@@ -1,140 +0,0 @@
-#ifndef CHARSETCONVERTER_H
-#define CHARSETCONVERTER_H
-
-#include <Arduino.h>
-
-char utf8win1250(const uint8_t ch);
-
-const char utf8_win1250_table[] = {
-  0x7A,              // length of table
-
-  // format: 0xaa, 0xbb, 0xcc
-  // 0xaabb (unicode)
-  // 0xcc (win1250)
-  // sorted by unicode to search with bsearch
-  0x00, 0xA0, 0xA0,  // 0xA0 = NO-BREAK SPACE
-  0x00, 0xA4, 0xA4,  // 0xA4 = CURRENCY SIGN
-  0x00, 0xA6, 0xA6,  // 0xA6 = BROKEN BAR
-  0x00, 0xA7, 0xA7,  // 0xA7 = SECTION SIGN
-  0x00, 0xA8, 0xA8,  // 0xA8 = DIAERESIS
-  0x00, 0xA9, 0xA9,  // 0xA9 = COPYRIGHT SIGN
-  0x00, 0xAB, 0xAB,  // 0xAB = LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-  0x00, 0xAC, 0xAC,  // 0xAC = NOT SIGN
-  0x00, 0xAD, 0xAD,  // 0xAD = SOFT HYPHEN
-  0x00, 0xAE, 0xAE,  // 0xAE = REGISTERED SIGN
-  0x00, 0xB0, 0xB0,  // 0xB0 = DEGREE SIGN
-  0x00, 0xB1, 0xB1,  // 0xB1 = PLUS-MINUS SIGN
-  0x00, 0xB4, 0xB4,  // 0xB4 = ACUTE ACCENT
-  0x00, 0xB5, 0xB5,  // 0xB5 = MICRO SIGN
-  0x00, 0xB6, 0xB6,  // 0xB6 = PILCROW SIGN
-  0x00, 0xB7, 0xB7,  // 0xB7 = MIDDLE DOT
-  0x00, 0xB8, 0xB8,  // 0xB8 = CEDILLA
-  0x00, 0xBB, 0xBB,  // 0xBB = RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-  0x00, 0xC1, 0xC1,  // 0xC1 = LATIN CAPITAL LETTER A WITH ACUTE
-  0x00, 0xC2, 0xC2,  // 0xC2 = LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-  0x00, 0xC4, 0xC4,  // 0xC4 = LATIN CAPITAL LETTER A WITH DIAERESIS
-  0x00, 0xC7, 0xC7,  // 0xC7 = LATIN CAPITAL LETTER C WITH CEDILLA
-  0x00, 0xC9, 0xC9,  // 0xC9 = LATIN CAPITAL LETTER E WITH ACUTE
-  0x00, 0xCB, 0xCB,  // 0xCB = LATIN CAPITAL LETTER E WITH DIAERESIS
-  0x00, 0xCD, 0xCD,  // 0xCD = LATIN CAPITAL LETTER I WITH ACUTE
-  0x00, 0xCE, 0xCE,  // 0xCE = LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-  0x00, 0xD3, 0xD3,  // 0xD3 = LATIN CAPITAL LETTER O WITH ACUTE
-  0x00, 0xD4, 0xD4,  // 0xD4 = LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-  0x00, 0xD6, 0xD6,  // 0xD6 = LATIN CAPITAL LETTER O WITH DIAERESIS
-  0x00, 0xD7, 0xD7,  // 0xD7 = MULTIPLICATION SIGN
-  0x00, 0xDA, 0xDA,  // 0xDA = LATIN CAPITAL LETTER U WITH ACUTE
-  0x00, 0xDC, 0xDC,  // 0xDC = LATIN CAPITAL LETTER U WITH DIAERESIS
-  0x00, 0xDD, 0xDD,  // 0xDD = LATIN CAPITAL LETTER Y WITH ACUTE
-  0x00, 0xDF, 0xDF,  // 0xDF = LATIN SMALL LETTER SHARP S
-  0x00, 0xE1, 0xE1,  // 0xE1 = LATIN SMALL LETTER A WITH ACUTE
-  0x00, 0xE2, 0xE2,  // 0xE2 = LATIN SMALL LETTER A WITH CIRCUMFLEX
-  0x00, 0xE4, 0xE4,  // 0xE4 = LATIN SMALL LETTER A WITH DIAERESIS
-  0x00, 0xE7, 0xE7,  // 0xE7 = LATIN SMALL LETTER C WITH CEDILLA
-  0x00, 0xE9, 0xE9,  // 0xE9 = LATIN SMALL LETTER E WITH ACUTE
-  0x00, 0xEB, 0xEB,  // 0xEB = LATIN SMALL LETTER E WITH DIAERESIS
-  0x00, 0xED, 0xED,  // 0xED = LATIN SMALL LETTER I WITH ACUTE
-  0x00, 0xEE, 0xEE,  // 0xEE = LATIN SMALL LETTER I WITH CIRCUMFLEX
-  0x00, 0xF3, 0xF3,  // 0xF3 = LATIN SMALL LETTER O WITH ACUTE
-  0x00, 0xF4, 0xF4,  // 0xF4 = LATIN SMALL LETTER O WITH CIRCUMFLEX
-  0x00, 0xF6, 0xF6,  // 0xF6 = LATIN SMALL LETTER O WITH DIAERESIS
-  0x00, 0xF7, 0xF7,  // 0xF7 = DIVISION SIGN
-  0x00, 0xFA, 0xFA,  // 0xFA = LATIN SMALL LETTER U WITH ACUTE
-  0x00, 0xFC, 0xFC,  // 0xFC = LATIN SMALL LETTER U WITH DIAERESIS
-  0x00, 0xFD, 0xFD,  // 0xFD = LATIN SMALL LETTER Y WITH ACUTE
-  0x01, 0x02, 0xC3,  // 0xC3 = LATIN CAPITAL LETTER A WITH BREVE
-  0x01, 0x03, 0xE3,  // 0xE3 = LATIN SMALL LETTER A WITH BREVE
-  0x01, 0x04, 0xA5,  // 0xA5 = LATIN CAPITAL LETTER A WITH OGONEK
-  0x01, 0x05, 0xB9,  // 0xB9 = LATIN SMALL LETTER A WITH OGONEK
-  0x01, 0x06, 0xC6,  // 0xC6 = LATIN CAPITAL LETTER C WITH ACUTE
-  0x01, 0x07, 0xE6,  // 0xE6 = LATIN SMALL LETTER C WITH ACUTE
-  0x01, 0x0C, 0xC8,  // 0xC8 = LATIN CAPITAL LETTER C WITH CARON
-  0x01, 0x0D, 0xE8,  // 0xE8 = LATIN SMALL LETTER C WITH CARON
-  0x01, 0x0E, 0xCF,  // 0xCF = LATIN CAPITAL LETTER D WITH CARON
-  0x01, 0x0F, 0xEF,  // 0xEF = LATIN SMALL LETTER D WITH CARON
-  0x01, 0x10, 0xD0,  // 0xD0 = LATIN CAPITAL LETTER D WITH STROKE
-  0x01, 0x11, 0xF0,  // 0xF0 = LATIN SMALL LETTER D WITH STROKE
-  0x01, 0x18, 0xCA,  // 0xCA = LATIN CAPITAL LETTER E WITH OGONEK
-  0x01, 0x19, 0xEA,  // 0xEA = LATIN SMALL LETTER E WITH OGONEK
-  0x01, 0x1A, 0xCC,  // 0xCC = LATIN CAPITAL LETTER E WITH CARON
-  0x01, 0x1B, 0xEC,  // 0xEC = LATIN SMALL LETTER E WITH CARON
-  0x01, 0x39, 0xC5,  // 0xC5 = LATIN CAPITAL LETTER L WITH ACUTE
-  0x01, 0x3A, 0xE5,  // 0xE5 = LATIN SMALL LETTER L WITH ACUTE
-  0x01, 0x3D, 0xBC,  // 0xBC = LATIN CAPITAL LETTER L WITH CARON
-  0x01, 0x3E, 0xBE,  // 0xBE = LATIN SMALL LETTER L WITH CARON
-  0x01, 0x41, 0xA3,  // 0xA3 = LATIN CAPITAL LETTER L WITH STROKE
-  0x01, 0x42, 0xB3,  // 0xB3 = LATIN SMALL LETTER L WITH STROKE
-  0x01, 0x43, 0xD1,  // 0xD1 = LATIN CAPITAL LETTER N WITH ACUTE
-  0x01, 0x44, 0xF1,  // 0xF1 = LATIN SMALL LETTER N WITH ACUTE
-  0x01, 0x47, 0xD2,  // 0xD2 = LATIN CAPITAL LETTER N WITH CARON
-  0x01, 0x48, 0xF2,  // 0xF2 = LATIN SMALL LETTER N WITH CARON
-  0x01, 0x50, 0xD5,  // 0xD5 = LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-  0x01, 0x51, 0xF5,  // 0xF5 = LATIN SMALL LETTER O WITH DOUBLE ACUTE
-  0x01, 0x54, 0xC0,  // 0xC0 = LATIN CAPITAL LETTER R WITH ACUTE
-  0x01, 0x55, 0xE0,  // 0xE0 = LATIN SMALL LETTER R WITH ACUTE
-  0x01, 0x58, 0xD8,  // 0xD8 = LATIN CAPITAL LETTER R WITH CARON
-  0x01, 0x59, 0xF8,  // 0xF8 = LATIN SMALL LETTER R WITH CARON
-  0x01, 0x5A, 0x8C,  // 0x8C = LATIN CAPITAL LETTER S WITH ACUTE
-  0x01, 0x5B, 0x9C,  // 0x9C = LATIN SMALL LETTER S WITH ACUTE
-  0x01, 0x5E, 0xAA,  // 0xAA = LATIN CAPITAL LETTER S WITH CEDILLA
-  0x01, 0x5F, 0xBA,  // 0xBA = LATIN SMALL LETTER S WITH CEDILLA
-  0x01, 0x60, 0x8A,  // 0x8A = LATIN CAPITAL LETTER S WITH CARON
-  0x01, 0x61, 0x9A,  // 0x9A = LATIN SMALL LETTER S WITH CARON
-  0x01, 0x62, 0xDE,  // 0xDE = LATIN CAPITAL LETTER T WITH CEDILLA
-  0x01, 0x63, 0xFE,  // 0xFE = LATIN SMALL LETTER T WITH CEDILLA
-  0x01, 0x64, 0x8D,  // 0x8D = LATIN CAPITAL LETTER T WITH CARON
-  0x01, 0x65, 0x9D,  // 0x9D = LATIN SMALL LETTER T WITH CARON
-  0x01, 0x6E, 0xD9,  // 0xD9 = LATIN CAPITAL LETTER U WITH RING ABOVE
-  0x01, 0x6F, 0xF9,  // 0xF9 = LATIN SMALL LETTER U WITH RING ABOVE
-  0x01, 0x70, 0xDB,  // 0xDB = LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-  0x01, 0x71, 0xFB,  // 0xFB = LATIN SMALL LETTER U WITH DOUBLE ACUTE
-  0x01, 0x79, 0x8F,  // 0x8F = LATIN CAPITAL LETTER Z WITH ACUTE
-  0x01, 0x7A, 0x9F,  // 0x9F = LATIN SMALL LETTER Z WITH ACUTE
-  0x01, 0x7B, 0xAF,  // 0xAF = LATIN CAPITAL LETTER Z WITH DOT ABOVE
-  0x01, 0x7C, 0xBF,  // 0xBF = LATIN SMALL LETTER Z WITH DOT ABOVE
-  0x01, 0x7D, 0x8E,  // 0x8E = LATIN CAPITAL LETTER Z WITH CARON
-  0x01, 0x7E, 0x9E,  // 0x9E = LATIN SMALL LETTER Z WITH CARON
-  0x02, 0xC7, 0xA1,  // 0xA1 = CARON
-  0x02, 0xD8, 0xA2,  // 0xA2 = BREVE
-  0x02, 0xD9, 0xFF,  // 0xFF = DOT ABOVE
-  0x02, 0xDB, 0xB2,  // 0xB2 = OGONEK
-  0x02, 0xDD, 0xBD,  // 0xBD = DOUBLE ACUTE ACCENT
-  0x20, 0x13, 0x96,  // 0x96 = EN DASH
-  0x20, 0x14, 0x97,  // 0x97 = EM DASH
-  0x20, 0x18, 0x91,  // 0x91 = LEFT SINGLE QUOTATION MARK
-  0x20, 0x19, 0x92,  // 0x92 = RIGHT SINGLE QUOTATION MARK
-  0x20, 0x1A, 0x82,  // 0x82 = SINGLE LOW-9 QUOTATION MARK
-  0x20, 0x1C, 0x93,  // 0x93 = LEFT DOUBLE QUOTATION MARK
-  0x20, 0x1D, 0x94,  // 0x94 = RIGHT DOUBLE QUOTATION MARK
-  0x20, 0x1E, 0x84,  // 0x84 = DOUBLE LOW-9 QUOTATION MARK
-  0x20, 0x20, 0x86,  // 0x86 = DAGGER
-  0x20, 0x21, 0x87,  // 0x87 = DOUBLE DAGGER
-  0x20, 0x22, 0x95,  // 0x95 = BULLET
-  0x20, 0x26, 0x85,  // 0x85 = HORIZONTAL ELLIPSIS
-  0x20, 0x30, 0x89,  // 0x89 = PER MILLE SIGN
-  0x20, 0x39, 0x8B,  // 0x8B = SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-  0x20, 0x3A, 0x9B,  // 0x9B = SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-  0x20, 0xAC, 0x80,  // 0x80 = EURO SIGN
-  0x21, 0x22, 0x99   // 0x99 = TRADE MARK SIGN
-};
-
-#endif
diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 29461aa5..5351b222 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -1,9 +1,5 @@
 #include "SuplaOled.h"
 #include "SuplaDeviceGUI.h"
-#include "CharsetConverter.h"
-#include "ArialMT_Win1250_Plain_10.h"
-#include "ArialMT_Win1250_Plain_16.h"
-#include "ArialMT_Win1250_Plain_24.h"
 
 #ifdef SUPLA_OLED
 
@@ -428,4 +424,79 @@ void SuplaOled::handleAction(int event, int action) {
     oledON = true;
   }
 }
+
+// In ESP8266 Arduino core v2.3.0 missing bsearch: https://github.com/esp8266/Arduino/issues/2314
+// Part of GNU C Library
+void * gnu_c_bsearch (const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *)) {
+  size_t l, u, idx;
+  const void *p;
+  int comparison;
+
+  l = 0;
+  u = nmemb;
+  while (l < u) {
+    idx = (l + u) / 2;
+
+    p = (void *) (((const char *) base) + (idx * size));
+    comparison = (*compar) (key, p);
+    if (comparison < 0)
+      u = idx;
+    else if (comparison > 0)
+      l = idx + 1;
+    else
+      return (void *) p;
+  }
+
+  return NULL;
+}
+
+// compare function for bsearch
+int charset_table_cmp(const void* p_key, const void* p_item) {
+  const uint16_t key = *(uint16_t *) p_key;
+  const uint16_t item = (*((char *) p_item)) << 8 | *(((char *) p_item) + 1);
+
+  if (key < item) return -1;
+  else if (key == item) return 0;
+  else return 1;
+}
+
+// convert utf-8 character to windows-1250
+// if utf-8 char continue with next byte, returns 0, otherwise windows-1250 char
+// for unconvertable char returns 0
+char utf8win1250(const uint8_t ch) {
+  static uint16_t uChar;
+  static uint8_t len;
+  char *found;
+
+  if ((ch & 0x80) == 0x00) {
+    uChar = len = 0;
+    return ch;
+  } else if ((ch & 0xE0) == 0xC0) {
+    uChar = ch & 0x1F; len = 1;
+    return 0;
+  } else if ((ch & 0xF0) == 0xE0) {
+    uChar = ch & 0x0F; len = 2;
+    return 0;
+  } else if ((ch & 0xF8) == 0xF0) {
+    uChar = ch & 0x07; len = 3;
+    return 0;
+  } else if ((ch & 0xC0) == 0x80 && len > 0) {
+    uChar = (uChar << 6) | (ch & 0x7F); len--;
+    if (len > 0)
+      return 0;
+  } else {
+    uChar = len = 0;
+    return 0;
+  }
+
+  found = (char*) gnu_c_bsearch(&uChar, utf8_win1250_table + 1, utf8_win1250_table[0], 3 * sizeof(char), charset_table_cmp);
+
+  if (found != NULL) {
+    uChar = len = 0;
+    return *(found + 2); // return win1250 char at 3rd position;
+  }
+
+  return 0;
+}
+
 #endif
diff --git a/src/SuplaOled.h b/src/SuplaOled.h
index d65a9885..d33bd99a 100644
--- a/src/SuplaOled.h
+++ b/src/SuplaOled.h
@@ -107,5 +107,1423 @@ const uint8_t pressure_bits[] PROGMEM = {
     0x8C, 0x81, 0x81, 0x31, 0x08, 0xC0, 0x03, 0x10, 0x08, 0xE0, 0x07, 0x10, 0x00, 0xE0, 0x07, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x80,
     0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
+const uint8_t ArialMT_Win1250_Plain_10[] PROGMEM = {
+  0x0A, // Width: 10
+  0x0D, // Height: 13
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table
+  0xFF, 0xFF, 0x00, 0x03, // 32:65535
+  0x00, 0x00, 0x04, 0x03, // 33:0
+  0x00, 0x04, 0x05, 0x04, // 34:4
+  0x00, 0x09, 0x09, 0x06, // 35:9
+  0x00, 0x12, 0x0A, 0x06, // 36:18
+  0x00, 0x1C, 0x10, 0x09, // 37:28
+  0x00, 0x2C, 0x0E, 0x07, // 38:44
+  0x00, 0x3A, 0x01, 0x02, // 39:58
+  0x00, 0x3B, 0x06, 0x03, // 40:59
+  0x00, 0x41, 0x06, 0x03, // 41:65
+  0x00, 0x47, 0x05, 0x04, // 42:71
+  0x00, 0x4C, 0x09, 0x06, // 43:76
+  0x00, 0x55, 0x04, 0x03, // 44:85
+  0x00, 0x59, 0x03, 0x03, // 45:89
+  0x00, 0x5C, 0x04, 0x03, // 46:92
+  0x00, 0x60, 0x05, 0x03, // 47:96
+  0x00, 0x65, 0x0A, 0x06, // 48:101
+  0x00, 0x6F, 0x08, 0x06, // 49:111
+  0x00, 0x77, 0x0A, 0x06, // 50:119
+  0x00, 0x81, 0x0A, 0x06, // 51:129
+  0x00, 0x8B, 0x0B, 0x06, // 52:139
+  0x00, 0x96, 0x0A, 0x06, // 53:150
+  0x00, 0xA0, 0x0A, 0x06, // 54:160
+  0x00, 0xAA, 0x09, 0x06, // 55:170
+  0x00, 0xB3, 0x0A, 0x06, // 56:179
+  0x00, 0xBD, 0x0A, 0x06, // 57:189
+  0x00, 0xC7, 0x04, 0x03, // 58:199
+  0x00, 0xCB, 0x04, 0x03, // 59:203
+  0x00, 0xCF, 0x0A, 0x06, // 60:207
+  0x00, 0xD9, 0x09, 0x06, // 61:217
+  0x00, 0xE2, 0x09, 0x06, // 62:226
+  0x00, 0xEB, 0x0B, 0x06, // 63:235
+  0x00, 0xF6, 0x14, 0x0A, // 64:246
+  0x01, 0x0A, 0x0E, 0x07, // 65:266
+  0x01, 0x18, 0x0C, 0x07, // 66:280
+  0x01, 0x24, 0x0C, 0x07, // 67:292
+  0x01, 0x30, 0x0B, 0x07, // 68:304
+  0x01, 0x3B, 0x0C, 0x07, // 69:315
+  0x01, 0x47, 0x09, 0x06, // 70:327
+  0x01, 0x50, 0x0D, 0x08, // 71:336
+  0x01, 0x5D, 0x0C, 0x07, // 72:349
+  0x01, 0x69, 0x04, 0x03, // 73:361
+  0x01, 0x6D, 0x08, 0x05, // 74:365
+  0x01, 0x75, 0x0E, 0x07, // 75:373
+  0x01, 0x83, 0x0C, 0x06, // 76:387
+  0x01, 0x8F, 0x10, 0x08, // 77:399
+  0x01, 0x9F, 0x0C, 0x07, // 78:415
+  0x01, 0xAB, 0x0E, 0x08, // 79:427
+  0x01, 0xB9, 0x0B, 0x07, // 80:441
+  0x01, 0xC4, 0x0E, 0x08, // 81:452
+  0x01, 0xD2, 0x0C, 0x07, // 82:466
+  0x01, 0xDE, 0x0C, 0x07, // 83:478
+  0x01, 0xEA, 0x0B, 0x06, // 84:490
+  0x01, 0xF5, 0x0C, 0x07, // 85:501
+  0x02, 0x01, 0x0D, 0x07, // 86:513
+  0x02, 0x0E, 0x11, 0x09, // 87:526
+  0x02, 0x1F, 0x0E, 0x07, // 88:543
+  0x02, 0x2D, 0x0D, 0x07, // 89:557
+  0x02, 0x3A, 0x0C, 0x06, // 90:570
+  0x02, 0x46, 0x06, 0x03, // 91:582
+  0x02, 0x4C, 0x06, 0x03, // 92:588
+  0x02, 0x52, 0x04, 0x03, // 93:594
+  0x02, 0x56, 0x09, 0x05, // 94:598
+  0x02, 0x5F, 0x0C, 0x06, // 95:607
+  0x02, 0x6B, 0x03, 0x03, // 96:619
+  0x02, 0x6E, 0x0A, 0x06, // 97:622
+  0x02, 0x78, 0x0A, 0x06, // 98:632
+  0x02, 0x82, 0x0A, 0x05, // 99:642
+  0x02, 0x8C, 0x0A, 0x06, // 100:652
+  0x02, 0x96, 0x0A, 0x06, // 101:662
+  0x02, 0xA0, 0x05, 0x03, // 102:672
+  0x02, 0xA5, 0x0A, 0x06, // 103:677
+  0x02, 0xAF, 0x0A, 0x06, // 104:687
+  0x02, 0xB9, 0x04, 0x02, // 105:697
+  0x02, 0xBD, 0x04, 0x02, // 106:701
+  0x02, 0xC1, 0x08, 0x05, // 107:705
+  0x02, 0xC9, 0x04, 0x02, // 108:713
+  0x02, 0xCD, 0x10, 0x08, // 109:717
+  0x02, 0xDD, 0x0A, 0x06, // 110:733
+  0x02, 0xE7, 0x0A, 0x06, // 111:743
+  0x02, 0xF1, 0x0A, 0x06, // 112:753
+  0x02, 0xFB, 0x0A, 0x06, // 113:763
+  0x03, 0x05, 0x05, 0x03, // 114:773
+  0x03, 0x0A, 0x08, 0x05, // 115:778
+  0x03, 0x12, 0x06, 0x03, // 116:786
+  0x03, 0x18, 0x0A, 0x06, // 117:792
+  0x03, 0x22, 0x09, 0x05, // 118:802
+  0x03, 0x2B, 0x0E, 0x07, // 119:811
+  0x03, 0x39, 0x0A, 0x05, // 120:825
+  0x03, 0x43, 0x09, 0x05, // 121:835
+  0x03, 0x4C, 0x0A, 0x05, // 122:844
+  0x03, 0x56, 0x06, 0x03, // 123:854
+  0x03, 0x5C, 0x04, 0x03, // 124:860
+  0x03, 0x60, 0x05, 0x03, // 125:864
+  0x03, 0x65, 0x09, 0x06, // 126:869
+  0xFF, 0xFF, 0x00, 0x00, // 127:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 128:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 129:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 130:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 131:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 132:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 133:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 134:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 135:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 136:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 137:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 138:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 139:65535
+  0x03, 0x6E, 0x0C, 0x07, // 140:878
+  0xFF, 0xFF, 0x00, 0x0A, // 141:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 142:65535
+  0x03, 0x7A, 0x0C, 0x06, // 143:890
+  0xFF, 0xFF, 0x00, 0x0A, // 144:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 145:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 146:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 147:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 148:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 149:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 150:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 151:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 152:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 153:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 154:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 155:65535
+  0x03, 0x86, 0x08, 0x05, // 156:902
+  0xFF, 0xFF, 0x00, 0x0A, // 157:65535
+  0xFF, 0xFF, 0x00, 0x0A, // 158:65535
+  0x03, 0x8E, 0x0A, 0x05, // 159:910
+  0xFF, 0xFF, 0x00, 0x03, // 160:65535
+  0x03, 0x98, 0x04, 0x03, // 161:920
+  0x03, 0x9C, 0x0A, 0x06, // 162:924
+  0x03, 0xA6, 0x0C, 0x06, // 163:934
+  0x03, 0xB2, 0x0A, 0x06, // 164:946
+  0x03, 0xBC, 0x0E, 0x07, // 165:956
+  0x03, 0xCA, 0x04, 0x03, // 166:970
+  0x03, 0xCE, 0x0A, 0x06, // 167:974
+  0x03, 0xD8, 0x05, 0x03, // 168:984
+  0x03, 0xDD, 0x0D, 0x07, // 169:989
+  0x03, 0xEA, 0x07, 0x04, // 170:1002
+  0x03, 0xF1, 0x0A, 0x06, // 171:1009
+  0x03, 0xFB, 0x09, 0x06, // 172:1019
+  0x04, 0x04, 0x03, 0x03, // 173:1028
+  0x04, 0x07, 0x0D, 0x07, // 174:1031
+  0x04, 0x14, 0x0C, 0x06, // 175:1044
+  0x04, 0x20, 0x07, 0x04, // 176:1056
+  0x04, 0x27, 0x0A, 0x05, // 177:1063
+  0x04, 0x31, 0x05, 0x03, // 178:1073
+  0x04, 0x36, 0x05, 0x03, // 179:1078
+  0x04, 0x3B, 0x05, 0x03, // 180:1083
+  0x04, 0x40, 0x0A, 0x06, // 181:1088
+  0x04, 0x4A, 0x09, 0x05, // 182:1098
+  0x04, 0x53, 0x03, 0x03, // 183:1107
+  0x04, 0x56, 0x06, 0x03, // 184:1110
+  0x04, 0x5C, 0x0A, 0x06, // 185:1116
+  0x04, 0x66, 0x07, 0x04, // 186:1126
+  0x04, 0x6D, 0x0A, 0x06, // 187:1133
+  0x04, 0x77, 0x10, 0x08, // 188:1143
+  0x04, 0x87, 0x10, 0x08, // 189:1159
+  0x04, 0x97, 0x10, 0x08, // 190:1175
+  0x04, 0xA7, 0x0A, 0x05, // 191:1191
+  0x04, 0xB1, 0x0E, 0x07, // 192:1201
+  0x04, 0xBF, 0x0E, 0x07, // 193:1215
+  0x04, 0xCD, 0x0E, 0x07, // 194:1229
+  0x04, 0xDB, 0x0E, 0x07, // 195:1243
+  0x04, 0xE9, 0x0E, 0x07, // 196:1257
+  0x04, 0xF7, 0x0E, 0x07, // 197:1271
+  0x05, 0x05, 0x0C, 0x07, // 198:1285
+  0x05, 0x11, 0x0C, 0x07, // 199:1297
+  0x05, 0x1D, 0x0C, 0x07, // 200:1309
+  0x05, 0x29, 0x0C, 0x07, // 201:1321
+  0x05, 0x35, 0x0C, 0x07, // 202:1333
+  0x05, 0x41, 0x0C, 0x07, // 203:1345
+  0x05, 0x4D, 0x05, 0x03, // 204:1357
+  0x05, 0x52, 0x04, 0x03, // 205:1362
+  0x05, 0x56, 0x04, 0x03, // 206:1366
+  0x05, 0x5A, 0x05, 0x03, // 207:1370
+  0x05, 0x5F, 0x0B, 0x07, // 208:1375
+  0x05, 0x6A, 0x0C, 0x07, // 209:1386
+  0x05, 0x76, 0x0E, 0x08, // 210:1398
+  0x05, 0x84, 0x0E, 0x08, // 211:1412
+  0x05, 0x92, 0x0E, 0x08, // 212:1426
+  0x05, 0xA0, 0x0E, 0x08, // 213:1440
+  0x05, 0xAE, 0x0E, 0x08, // 214:1454
+  0x05, 0xBC, 0x0A, 0x06, // 215:1468
+  0x05, 0xC6, 0x0D, 0x08, // 216:1478
+  0x05, 0xD3, 0x0C, 0x07, // 217:1491
+  0x05, 0xDF, 0x0C, 0x07, // 218:1503
+  0x05, 0xEB, 0x0C, 0x07, // 219:1515
+  0x05, 0xF7, 0x0C, 0x07, // 220:1527
+  0x06, 0x03, 0x0D, 0x07, // 221:1539
+  0x06, 0x10, 0x0B, 0x07, // 222:1552
+  0x06, 0x1B, 0x0C, 0x06, // 223:1563
+  0x06, 0x27, 0x0A, 0x06, // 224:1575
+  0x06, 0x31, 0x0A, 0x06, // 225:1585
+  0x06, 0x3B, 0x0A, 0x06, // 226:1595
+  0x06, 0x45, 0x0A, 0x06, // 227:1605
+  0x06, 0x4F, 0x0A, 0x06, // 228:1615
+  0x06, 0x59, 0x0A, 0x06, // 229:1625
+  0x06, 0x63, 0x0A, 0x05, // 230:1635
+  0x06, 0x6D, 0x0A, 0x05, // 231:1645
+  0x06, 0x77, 0x0A, 0x06, // 232:1655
+  0x06, 0x81, 0x0A, 0x06, // 233:1665
+  0x06, 0x8B, 0x0A, 0x06, // 234:1675
+  0x06, 0x95, 0x0A, 0x06, // 235:1685
+  0x06, 0x9F, 0x05, 0x03, // 236:1695
+  0x06, 0xA4, 0x04, 0x03, // 237:1700
+  0x06, 0xA8, 0x05, 0x03, // 238:1704
+  0x06, 0xAD, 0x05, 0x03, // 239:1709
+  0x06, 0xB2, 0x0A, 0x06, // 240:1714
+  0x06, 0xBC, 0x0A, 0x06, // 241:1724
+  0x06, 0xC6, 0x0A, 0x06, // 242:1734
+  0x06, 0xD0, 0x0A, 0x06, // 243:1744
+  0x06, 0xDA, 0x0A, 0x06, // 244:1754
+  0x06, 0xE4, 0x0A, 0x06, // 245:1764
+  0x06, 0xEE, 0x0A, 0x06, // 246:1774
+  0x06, 0xF8, 0x09, 0x05, // 247:1784
+  0x07, 0x01, 0x0A, 0x06, // 248:1793
+  0x07, 0x0B, 0x0A, 0x06, // 249:1803
+  0x07, 0x15, 0x0A, 0x06, // 250:1813
+  0x07, 0x1F, 0x0A, 0x06, // 251:1823
+  0x07, 0x29, 0x0A, 0x06, // 252:1833
+  0x07, 0x33, 0x09, 0x05, // 253:1843
+  0x07, 0x3C, 0x0A, 0x06, // 254:1852
+  0x07, 0x46, 0x09, 0x05, // 255:1862
+
+  // Font Data
+  0x00,0x00,0xF8,0x02, // 33
+  0x38,0x00,0x00,0x00,0x38, // 34
+  0xA0,0x03,0xE0,0x00,0xB8,0x03,0xE0,0x00,0xB8, // 35
+  0x30,0x01,0x28,0x02,0xF8,0x07,0x48,0x02,0x90,0x01, // 36
+  0x00,0x00,0x30,0x00,0x48,0x00,0x30,0x03,0xC0,0x00,0xB0,0x01,0x48,0x02,0x80,0x01, // 37
+  0x80,0x01,0x50,0x02,0x68,0x02,0xA8,0x02,0x18,0x01,0x80,0x03,0x80,0x02, // 38
+  0x38, // 39
+  0xE0,0x03,0x10,0x04,0x08,0x08, // 40
+  0x08,0x08,0x10,0x04,0xE0,0x03, // 41
+  0x28,0x00,0x18,0x00,0x28, // 42
+  0x40,0x00,0x40,0x00,0xF0,0x01,0x40,0x00,0x40, // 43
+  0x00,0x00,0x00,0x06, // 44
+  0x80,0x00,0x80, // 45
+  0x00,0x00,0x00,0x02, // 46
+  0x00,0x03,0xE0,0x00,0x18, // 47
+  0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01, // 48
+  0x00,0x00,0x20,0x00,0x10,0x00,0xF8,0x03, // 49
+  0x10,0x02,0x08,0x03,0x88,0x02,0x48,0x02,0x30,0x02, // 50
+  0x10,0x01,0x08,0x02,0x48,0x02,0x48,0x02,0xB0,0x01, // 51
+  0xC0,0x00,0xA0,0x00,0x90,0x00,0x88,0x00,0xF8,0x03,0x80, // 52
+  0x60,0x01,0x38,0x02,0x28,0x02,0x28,0x02,0xC8,0x01, // 53
+  0xF0,0x01,0x28,0x02,0x28,0x02,0x28,0x02,0xD0,0x01, // 54
+  0x08,0x00,0x08,0x03,0xC8,0x00,0x38,0x00,0x08, // 55
+  0xB0,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0xB0,0x01, // 56
+  0x70,0x01,0x88,0x02,0x88,0x02,0x88,0x02,0xF0,0x01, // 57
+  0x00,0x00,0x20,0x02, // 58
+  0x00,0x00,0x20,0x06, // 59
+  0x00,0x00,0x40,0x00,0xA0,0x00,0xA0,0x00,0x10,0x01, // 60
+  0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0, // 61
+  0x00,0x00,0x10,0x01,0xA0,0x00,0xA0,0x00,0x40, // 62
+  0x10,0x00,0x08,0x00,0x08,0x00,0xC8,0x02,0x48,0x00,0x30, // 63
+  0x00,0x00,0xC0,0x03,0x30,0x04,0xD0,0x09,0x28,0x0A,0x28,0x0A,0xC8,0x0B,0x68,0x0A,0x10,0x05,0xE0,0x04, // 64
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x00,0xC0,0x01,0x00,0x02, // 65
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0xF0,0x01, // 66
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x10,0x01, // 67
+  0x00,0x00,0xF8,0x03,0x08,0x02,0x08,0x02,0x10,0x01,0xE0, // 68
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0x48,0x02, // 69
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x08, // 70
+  0x00,0x00,0xE0,0x00,0x10,0x01,0x08,0x02,0x48,0x02,0x50,0x01,0xC0, // 71
+  0x00,0x00,0xF8,0x03,0x40,0x00,0x40,0x00,0x40,0x00,0xF8,0x03, // 72
+  0x00,0x00,0xF8,0x03, // 73
+  0x00,0x03,0x00,0x02,0x00,0x02,0xF8,0x01, // 74
+  0x00,0x00,0xF8,0x03,0x80,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02, // 75
+  0x00,0x00,0xF8,0x03,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, // 76
+  0x00,0x00,0xF8,0x03,0x30,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x30,0x00,0xF8,0x03, // 77
+  0x00,0x00,0xF8,0x03,0x30,0x00,0x40,0x00,0x80,0x01,0xF8,0x03, // 78
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01, // 79
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x48,0x00,0x30, // 80
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x03,0x08,0x03,0xF0,0x02, // 81
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0xC8,0x00,0x30,0x03, // 82
+  0x00,0x00,0x30,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0x90,0x01, // 83
+  0x00,0x00,0x08,0x00,0x08,0x00,0xF8,0x03,0x08,0x00,0x08, // 84
+  0x00,0x00,0xF8,0x01,0x00,0x02,0x00,0x02,0x00,0x02,0xF8,0x01, // 85
+  0x08,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x80,0x01,0x70,0x00,0x08, // 86
+  0x18,0x00,0xE0,0x01,0x00,0x02,0xF0,0x01,0x08,0x00,0xF0,0x01,0x00,0x02,0xE0,0x01,0x18, // 87
+  0x00,0x02,0x08,0x01,0x90,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02, // 88
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC0,0x03,0x20,0x00,0x10,0x00,0x08, // 89
+  0x08,0x03,0x88,0x03,0xC8,0x02,0x68,0x02,0x38,0x02,0x18,0x02, // 90
+  0x00,0x00,0xF8,0x0F,0x08,0x08, // 91
+  0x18,0x00,0xE0,0x00,0x00,0x03, // 92
+  0x08,0x08,0xF8,0x0F, // 93
+  0x40,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x40, // 94
+  0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08, // 95
+  0x08,0x00,0x10, // 96
+  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x02,0xE0,0x03, // 97
+  0x00,0x00,0xF8,0x03,0x20,0x02,0x20,0x02,0xC0,0x01, // 98
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0x40,0x01, // 99
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xF8,0x03, // 100
+  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02, // 101
+  0x20,0x00,0xF0,0x03,0x28, // 102
+  0x00,0x00,0xC0,0x05,0x20,0x0A,0x20,0x0A,0xE0,0x07, // 103
+  0x00,0x00,0xF8,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 104
+  0x00,0x00,0xE8,0x03, // 105
+  0x00,0x08,0xE8,0x07, // 106
+  0xF8,0x03,0x80,0x00,0xC0,0x01,0x20,0x02, // 107
+  0x00,0x00,0xF8,0x03, // 108
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 109
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03, // 110
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xC0,0x01, // 111
+  0x00,0x00,0xE0,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01, // 112
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xE0,0x0F, // 113
+  0x00,0x00,0xE0,0x03,0x20, // 114
+  0x40,0x02,0xA0,0x02,0xA0,0x02,0x20,0x01, // 115
+  0x20,0x00,0xF8,0x03,0x20,0x02, // 116
+  0x00,0x00,0xE0,0x01,0x00,0x02,0x00,0x02,0xE0,0x03, // 117
+  0x20,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x20, // 118
+  0xE0,0x01,0x00,0x02,0xC0,0x01,0x20,0x00,0xC0,0x01,0x00,0x02,0xE0,0x01, // 119
+  0x20,0x02,0x40,0x01,0x80,0x00,0x40,0x01,0x20,0x02, // 120
+  0x20,0x00,0xC0,0x09,0x00,0x06,0xC0,0x01,0x20, // 121
+  0x20,0x02,0x20,0x03,0xA0,0x02,0x60,0x02,0x20,0x02, // 122
+  0x80,0x00,0x78,0x0F,0x08,0x08, // 123
+  0x00,0x00,0xF8,0x0F, // 124
+  0x08,0x08,0x78,0x0F,0x80, // 125
+  0xC0,0x00,0x40,0x00,0xC0,0x00,0x80,0x00,0xC0, // 126
+  0x00,0x00,0x30,0x01,0x48,0x02,0x4A,0x02,0x49,0x02,0x90,0x01, // 140
+  0x08,0x03,0x88,0x03,0xC8,0x02,0x6A,0x02,0x39,0x02,0x18,0x02, // 143
+  0x40,0x02,0xA8,0x02,0xA4,0x02,0x20,0x01, // 156
+  0x20,0x02,0x20,0x03,0xA8,0x02,0x64,0x02,0x20,0x02, // 159
+  0x00,0x00,0xA0,0x0F, // 161
+  0x00,0x00,0xC0,0x01,0xA0,0x0F,0x78,0x02,0x40,0x01, // 162
+  0x00,0x00,0xF8,0x03,0x40,0x02,0x20,0x02,0x10,0x02,0x00,0x02, // 163
+  0x00,0x00,0xE0,0x01,0x20,0x01,0x20,0x01,0xE0,0x01, // 164
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x14,0xC0,0x19,0x00,0x02, // 165
+  0x00,0x00,0x38,0x0F, // 166
+  0xD0,0x04,0x28,0x09,0x48,0x09,0x48,0x0A,0x90,0x05, // 167
+  0x08,0x00,0x00,0x00,0x08, // 168
+  0xE0,0x00,0x10,0x01,0x48,0x02,0xA8,0x02,0xA8,0x02,0x10,0x01,0xE0, // 169
+  0x68,0x00,0x68,0x00,0x68,0x00,0x78, // 170
+  0x00,0x00,0x80,0x01,0x40,0x02,0x80,0x01,0x40,0x02, // 171
+  0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0xE0, // 172
+  0x80,0x00,0x80, // 173
+  0xE0,0x00,0x10,0x01,0xE8,0x02,0x68,0x02,0xC8,0x02,0x10,0x01,0xE0, // 174
+  0x08,0x03,0x88,0x03,0xCA,0x02,0x6A,0x02,0x38,0x02,0x18,0x02, // 175
+  0x00,0x00,0x38,0x00,0x28,0x00,0x38, // 176
+  0x40,0x02,0x40,0x02,0xF0,0x03,0x40,0x02,0x40,0x02, // 177
+  0x48,0x00,0x68,0x00,0x58, // 178
+  0xC0,0x00,0xF8,0x03,0x30, // 179
+  0x00,0x00,0x10,0x00,0x08, // 180
+  0x00,0x00,0xE0,0x0F,0x00,0x02,0x00,0x02,0xE0,0x03, // 181
+  0x70,0x00,0xF8,0x0F,0x08,0x00,0xF8,0x0F,0x08, // 182
+  0x00,0x00,0x40, // 183
+  0x00,0x00,0x00,0x14,0x00,0x18, // 184
+  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x16,0xE0,0x1B, // 185
+  0x30,0x00,0x48,0x00,0x48,0x00,0x30, // 186
+  0x00,0x00,0x40,0x02,0x80,0x01,0x40,0x02,0x80,0x01, // 187
+  0x00,0x00,0x10,0x02,0x78,0x01,0xC0,0x00,0x20,0x01,0x90,0x01,0xC8,0x03,0x00,0x01, // 188
+  0x00,0x00,0x10,0x02,0x78,0x01,0x80,0x00,0x60,0x00,0x50,0x02,0x48,0x03,0xC0,0x02, // 189
+  0x48,0x00,0x58,0x00,0x68,0x03,0x80,0x00,0x60,0x01,0x90,0x01,0xC8,0x03,0x00,0x01, // 190
+  0x20,0x02,0x20,0x03,0xA8,0x02,0x68,0x02,0x20,0x02, // 191
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 192
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02, // 193
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 194
+  0x00,0x02,0xC2,0x01,0xB1,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02, // 195
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x88,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02, // 196
+  0x00,0x02,0xC0,0x01,0xBE,0x00,0x8A,0x00,0xBE,0x00,0xC0,0x01,0x00,0x02, // 197
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x10,0x01, // 198
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x16,0x08,0x1A,0x10,0x01, // 199
+  0x00,0x00,0xF8,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02, // 200
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x4A,0x02,0x49,0x02,0x48,0x02, // 201
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x16,0x48,0x1A,0x48,0x02, // 202
+  0x00,0x00,0xF8,0x03,0x4A,0x02,0x48,0x02,0x4A,0x02,0x48,0x02, // 203
+  0x00,0x00,0xF9,0x03,0x02, // 204
+  0x02,0x00,0xF9,0x03, // 205
+  0x01,0x00,0xFA,0x03, // 206
+  0x02,0x00,0xF8,0x03,0x02, // 207
+  0x40,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x10,0x01,0xE0, // 208
+  0x00,0x00,0xF8,0x03,0x30,0x00,0x42,0x00,0x81,0x01,0xF8,0x03, // 209
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x09,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01, // 210
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x08,0x02,0xF0,0x01, // 211
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x0A,0x02,0xF0,0x01, // 212
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x09,0x02,0x0A,0x02,0x09,0x02,0xF0,0x01, // 213
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x08,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01, // 214
+  0x10,0x01,0xA0,0x00,0xE0,0x00,0xA0,0x00,0x10,0x01, // 215
+  0x00,0x00,0xF0,0x02,0x08,0x03,0xC8,0x02,0x28,0x02,0x18,0x03,0xE8, // 216
+  0x00,0x00,0xF8,0x01,0x01,0x02,0x02,0x02,0x00,0x02,0xF8,0x01, // 217
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x00,0x02,0xF8,0x01, // 218
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x02,0x02,0xF8,0x01, // 219
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x00,0x02,0x02,0x02,0xF8,0x01, // 220
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC2,0x03,0x21,0x00,0x10,0x00,0x08, // 221
+  0x00,0x00,0xF8,0x03,0x10,0x01,0x10,0x01,0x10,0x01,0xE0, // 222
+  0x00,0x00,0xF0,0x03,0x08,0x01,0x48,0x02,0xB0,0x02,0x80,0x01, // 223
+  0x00,0x00,0x00,0x03,0xA4,0x02,0xA8,0x02,0xE0,0x03, // 224
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE0,0x03, // 225
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE8,0x03, // 226
+  0x00,0x00,0x08,0x03,0xA4,0x02,0xA8,0x02,0xE4,0x03, // 227
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA0,0x02,0xE8,0x03, // 228
+  0x00,0x00,0x00,0x03,0xAE,0x02,0xAA,0x02,0xEE,0x03, // 229
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0x40,0x01, // 230
+  0x00,0x00,0xC0,0x01,0x20,0x16,0x20,0x1A,0x40,0x01, // 231
+  0x00,0x00,0xC0,0x01,0xA4,0x02,0xA8,0x02,0xC0,0x02, // 232
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC0,0x02, // 233
+  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x16,0xC0,0x1A, // 234
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA0,0x02,0xC8,0x02, // 235
+  0x00,0x00,0xE4,0x03,0x08, // 236
+  0x08,0x00,0xE4,0x03, // 237
+  0x08,0x00,0xE4,0x03,0x08, // 238
+  0x08,0x00,0xE0,0x03,0x08, // 239
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x38,0x02,0xE0,0x01, // 240
+  0x00,0x00,0xE0,0x03,0x28,0x00,0x24,0x00,0xC0,0x03, // 241
+  0x00,0x00,0xC0,0x01,0x24,0x02,0x28,0x02,0xC0,0x01, // 242
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC0,0x01, // 243
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC8,0x01, // 244
+  0x00,0x00,0xC8,0x01,0x24,0x02,0x28,0x02,0xC4,0x01, // 245
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x20,0x02,0xC8,0x01, // 246
+  0x40,0x00,0x40,0x00,0x50,0x01,0x40,0x00,0x40, // 247
+  0x00,0x00,0xC0,0x02,0xA0,0x03,0x60,0x02,0xA0,0x01, // 248
+  0x00,0x00,0xE0,0x01,0x04,0x02,0x08,0x02,0xE0,0x03, // 249
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x04,0x02,0xE0,0x03, // 250
+  0x00,0x00,0xE8,0x01,0x04,0x02,0x08,0x02,0xE0,0x03, // 251
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x00,0x02,0xE8,0x03, // 252
+  0x20,0x00,0xC0,0x09,0x08,0x06,0xC4,0x01,0x20, // 253
+  0x00,0x00,0xF8,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01, // 254
+  0x20,0x00,0xC8,0x09,0x00,0x06,0xC8,0x01,0x20 // 255
+};
+
+const uint8_t ArialMT_Win1250_Plain_16[] PROGMEM = {
+  0x10, // Width: 16
+  0x13, // Height: 19
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table
+  0xFF, 0xFF, 0x00, 0x04, // 32:65535
+  0x00, 0x00, 0x08, 0x04, // 33:0
+  0x00, 0x08, 0x0D, 0x06, // 34:8
+  0x00, 0x15, 0x1A, 0x09, // 35:21
+  0x00, 0x2F, 0x17, 0x09, // 36:47
+  0x00, 0x46, 0x26, 0x0E, // 37:70
+  0x00, 0x6C, 0x1D, 0x0B, // 38:108
+  0x00, 0x89, 0x04, 0x03, // 39:137
+  0x00, 0x8D, 0x0C, 0x05, // 40:141
+  0x00, 0x99, 0x0B, 0x05, // 41:153
+  0x00, 0xA4, 0x0D, 0x06, // 42:164
+  0x00, 0xB1, 0x17, 0x09, // 43:177
+  0x00, 0xC8, 0x09, 0x04, // 44:200
+  0x00, 0xD1, 0x0B, 0x05, // 45:209
+  0x00, 0xDC, 0x08, 0x04, // 46:220
+  0x00, 0xE4, 0x0A, 0x04, // 47:228
+  0x00, 0xEE, 0x17, 0x09, // 48:238
+  0x01, 0x05, 0x11, 0x09, // 49:261
+  0x01, 0x16, 0x17, 0x09, // 50:278
+  0x01, 0x2D, 0x17, 0x09, // 51:301
+  0x01, 0x44, 0x17, 0x09, // 52:324
+  0x01, 0x5B, 0x17, 0x09, // 53:347
+  0x01, 0x72, 0x17, 0x09, // 54:370
+  0x01, 0x89, 0x16, 0x09, // 55:393
+  0x01, 0x9F, 0x17, 0x09, // 56:415
+  0x01, 0xB6, 0x17, 0x09, // 57:438
+  0x01, 0xCD, 0x05, 0x04, // 58:461
+  0x01, 0xD2, 0x06, 0x04, // 59:466
+  0x01, 0xD8, 0x17, 0x09, // 60:472
+  0x01, 0xEF, 0x17, 0x09, // 61:495
+  0x02, 0x06, 0x17, 0x09, // 62:518
+  0x02, 0x1D, 0x16, 0x09, // 63:541
+  0x02, 0x33, 0x2F, 0x10, // 64:563
+  0x02, 0x62, 0x1D, 0x0B, // 65:610
+  0x02, 0x7F, 0x1D, 0x0B, // 66:639
+  0x02, 0x9C, 0x20, 0x0C, // 67:668
+  0x02, 0xBC, 0x20, 0x0C, // 68:700
+  0x02, 0xDC, 0x1D, 0x0B, // 69:732
+  0x02, 0xF9, 0x19, 0x0A, // 70:761
+  0x03, 0x12, 0x20, 0x0C, // 71:786
+  0x03, 0x32, 0x1D, 0x0C, // 72:818
+  0x03, 0x4F, 0x05, 0x04, // 73:847
+  0x03, 0x54, 0x14, 0x08, // 74:852
+  0x03, 0x68, 0x1D, 0x0B, // 75:872
+  0x03, 0x85, 0x17, 0x09, // 76:901
+  0x03, 0x9C, 0x23, 0x0D, // 77:924
+  0x03, 0xBF, 0x1D, 0x0C, // 78:959
+  0x03, 0xDC, 0x20, 0x0C, // 79:988
+  0x03, 0xFC, 0x1C, 0x0B, // 80:1020
+  0x04, 0x18, 0x20, 0x0C, // 81:1048
+  0x04, 0x38, 0x1D, 0x0C, // 82:1080
+  0x04, 0x55, 0x1D, 0x0B, // 83:1109
+  0x04, 0x72, 0x19, 0x0A, // 84:1138
+  0x04, 0x8B, 0x1D, 0x0C, // 85:1163
+  0x04, 0xA8, 0x1C, 0x0B, // 86:1192
+  0x04, 0xC4, 0x2B, 0x0F, // 87:1220
+  0x04, 0xEF, 0x20, 0x0B, // 88:1263
+  0x05, 0x0F, 0x19, 0x0B, // 89:1295
+  0x05, 0x28, 0x1A, 0x0A, // 90:1320
+  0x05, 0x42, 0x0C, 0x04, // 91:1346
+  0x05, 0x4E, 0x0B, 0x04, // 92:1358
+  0x05, 0x59, 0x09, 0x04, // 93:1369
+  0x05, 0x62, 0x14, 0x08, // 94:1378
+  0x05, 0x76, 0x1B, 0x09, // 95:1398
+  0x05, 0x91, 0x07, 0x05, // 96:1425
+  0x05, 0x98, 0x17, 0x09, // 97:1432
+  0x05, 0xAF, 0x17, 0x09, // 98:1455
+  0x05, 0xC6, 0x14, 0x08, // 99:1478
+  0x05, 0xDA, 0x17, 0x09, // 100:1498
+  0x05, 0xF1, 0x17, 0x09, // 101:1521
+  0x06, 0x08, 0x0A, 0x04, // 102:1544
+  0x06, 0x12, 0x17, 0x09, // 103:1554
+  0x06, 0x29, 0x14, 0x09, // 104:1577
+  0x06, 0x3D, 0x05, 0x04, // 105:1597
+  0x06, 0x42, 0x06, 0x04, // 106:1602
+  0x06, 0x48, 0x17, 0x08, // 107:1608
+  0x06, 0x5F, 0x05, 0x04, // 108:1631
+  0x06, 0x64, 0x23, 0x0D, // 109:1636
+  0x06, 0x87, 0x14, 0x09, // 110:1671
+  0x06, 0x9B, 0x17, 0x09, // 111:1691
+  0x06, 0xB2, 0x17, 0x09, // 112:1714
+  0x06, 0xC9, 0x18, 0x09, // 113:1737
+  0x06, 0xE1, 0x0D, 0x05, // 114:1761
+  0x06, 0xEE, 0x14, 0x08, // 115:1774
+  0x07, 0x02, 0x0B, 0x04, // 116:1794
+  0x07, 0x0D, 0x14, 0x09, // 117:1805
+  0x07, 0x21, 0x13, 0x08, // 118:1825
+  0x07, 0x34, 0x1F, 0x0C, // 119:1844
+  0x07, 0x53, 0x14, 0x08, // 120:1875
+  0x07, 0x67, 0x13, 0x08, // 121:1895
+  0x07, 0x7A, 0x14, 0x08, // 122:1914
+  0x07, 0x8E, 0x0F, 0x05, // 123:1934
+  0x07, 0x9D, 0x06, 0x04, // 124:1949
+  0x07, 0xA3, 0x0E, 0x05, // 125:1955
+  0x07, 0xB1, 0x17, 0x09, // 126:1969
+  0xFF, 0xFF, 0x00, 0x00, // 127:65535
+  0xFF, 0xFF, 0x00, 0x10, // 128:65535
+  0xFF, 0xFF, 0x00, 0x10, // 129:65535
+  0xFF, 0xFF, 0x00, 0x10, // 130:65535
+  0xFF, 0xFF, 0x00, 0x10, // 131:65535
+  0xFF, 0xFF, 0x00, 0x10, // 132:65535
+  0xFF, 0xFF, 0x00, 0x10, // 133:65535
+  0xFF, 0xFF, 0x00, 0x10, // 134:65535
+  0xFF, 0xFF, 0x00, 0x10, // 135:65535
+  0xFF, 0xFF, 0x00, 0x10, // 136:65535
+  0xFF, 0xFF, 0x00, 0x10, // 137:65535
+  0xFF, 0xFF, 0x00, 0x10, // 138:65535
+  0xFF, 0xFF, 0x00, 0x10, // 139:65535
+  0x07, 0xC8, 0x1D, 0x0B, // 140:1992
+  0xFF, 0xFF, 0x00, 0x10, // 141:65535
+  0xFF, 0xFF, 0x00, 0x10, // 142:65535
+  0x07, 0xE5, 0x1A, 0x0A, // 143:2021
+  0xFF, 0xFF, 0x00, 0x10, // 144:65535
+  0xFF, 0xFF, 0x00, 0x10, // 145:65535
+  0xFF, 0xFF, 0x00, 0x10, // 146:65535
+  0xFF, 0xFF, 0x00, 0x10, // 147:65535
+  0xFF, 0xFF, 0x00, 0x10, // 148:65535
+  0xFF, 0xFF, 0x00, 0x10, // 149:65535
+  0xFF, 0xFF, 0x00, 0x10, // 150:65535
+  0xFF, 0xFF, 0x00, 0x10, // 151:65535
+  0xFF, 0xFF, 0x00, 0x10, // 152:65535
+  0xFF, 0xFF, 0x00, 0x10, // 153:65535
+  0xFF, 0xFF, 0x00, 0x10, // 154:65535
+  0xFF, 0xFF, 0x00, 0x10, // 155:65535
+  0x07, 0xFF, 0x14, 0x08, // 156:2047
+  0xFF, 0xFF, 0x00, 0x10, // 157:65535
+  0xFF, 0xFF, 0x00, 0x10, // 158:65535
+  0x08, 0x13, 0x14, 0x08, // 159:2067
+  0xFF, 0xFF, 0x00, 0x04, // 160:65535
+  0x08, 0x27, 0x09, 0x05, // 161:2087
+  0x08, 0x30, 0x17, 0x09, // 162:2096
+  0x08, 0x47, 0x17, 0x09, // 163:2119
+  0x08, 0x5E, 0x14, 0x09, // 164:2142
+  0x08, 0x72, 0x1D, 0x0B, // 165:2162
+  0x08, 0x8F, 0x06, 0x04, // 166:2191
+  0x08, 0x95, 0x17, 0x09, // 167:2197
+  0x08, 0xAC, 0x07, 0x05, // 168:2220
+  0x08, 0xB3, 0x23, 0x0C, // 169:2227
+  0x08, 0xD6, 0x0E, 0x06, // 170:2262
+  0x08, 0xE4, 0x14, 0x09, // 171:2276
+  0x08, 0xF8, 0x17, 0x09, // 172:2296
+  0x09, 0x0F, 0x0B, 0x05, // 173:2319
+  0x09, 0x1A, 0x23, 0x0C, // 174:2330
+  0x09, 0x3D, 0x1A, 0x0A, // 175:2365
+  0x09, 0x57, 0x0D, 0x06, // 176:2391
+  0x09, 0x64, 0x17, 0x09, // 177:2404
+  0x09, 0x7B, 0x0E, 0x05, // 178:2427
+  0x09, 0x89, 0x0A, 0x04, // 179:2441
+  0x09, 0x93, 0x0A, 0x05, // 180:2451
+  0x09, 0x9D, 0x17, 0x09, // 181:2461
+  0x09, 0xB4, 0x19, 0x09, // 182:2484
+  0x09, 0xCD, 0x08, 0x05, // 183:2509
+  0x09, 0xD5, 0x0C, 0x05, // 184:2517
+  0x09, 0xE1, 0x17, 0x09, // 185:2529
+  0x09, 0xF8, 0x0D, 0x06, // 186:2552
+  0x0A, 0x05, 0x17, 0x09, // 187:2565
+  0x0A, 0x1C, 0x26, 0x0D, // 188:2588
+  0x0A, 0x42, 0x26, 0x0D, // 189:2626
+  0x0A, 0x68, 0x26, 0x0D, // 190:2664
+  0x0A, 0x8E, 0x14, 0x08, // 191:2702
+  0x0A, 0xA2, 0x1D, 0x0B, // 192:2722
+  0x0A, 0xBF, 0x1D, 0x0B, // 193:2751
+  0x0A, 0xDC, 0x1D, 0x0B, // 194:2780
+  0x0A, 0xF9, 0x1D, 0x0B, // 195:2809
+  0x0B, 0x16, 0x1D, 0x0B, // 196:2838
+  0x0B, 0x33, 0x1D, 0x0B, // 197:2867
+  0x0B, 0x50, 0x20, 0x0C, // 198:2896
+  0x0B, 0x70, 0x20, 0x0C, // 199:2928
+  0x0B, 0x90, 0x1D, 0x0B, // 200:2960
+  0x0B, 0xAD, 0x1D, 0x0B, // 201:2989
+  0x0B, 0xCA, 0x1D, 0x0B, // 202:3018
+  0x0B, 0xE7, 0x1D, 0x0B, // 203:3047
+  0x0C, 0x04, 0x05, 0x04, // 204:3076
+  0x0C, 0x09, 0x07, 0x04, // 205:3081
+  0x0C, 0x10, 0x0A, 0x04, // 206:3088
+  0x0C, 0x1A, 0x07, 0x04, // 207:3098
+  0x0C, 0x21, 0x20, 0x0C, // 208:3105
+  0x0C, 0x41, 0x1D, 0x0C, // 209:3137
+  0x0C, 0x5E, 0x20, 0x0C, // 210:3166
+  0x0C, 0x7E, 0x20, 0x0C, // 211:3198
+  0x0C, 0x9E, 0x20, 0x0C, // 212:3230
+  0x0C, 0xBE, 0x20, 0x0C, // 213:3262
+  0x0C, 0xDE, 0x20, 0x0C, // 214:3294
+  0x0C, 0xFE, 0x17, 0x09, // 215:3326
+  0x0D, 0x15, 0x20, 0x0C, // 216:3349
+  0x0D, 0x35, 0x1D, 0x0C, // 217:3381
+  0x0D, 0x52, 0x1D, 0x0C, // 218:3410
+  0x0D, 0x6F, 0x1D, 0x0C, // 219:3439
+  0x0D, 0x8C, 0x1D, 0x0C, // 220:3468
+  0x0D, 0xA9, 0x19, 0x0B, // 221:3497
+  0x0D, 0xC2, 0x1D, 0x0B, // 222:3522
+  0x0D, 0xDF, 0x17, 0x0A, // 223:3551
+  0x0D, 0xF6, 0x17, 0x09, // 224:3574
+  0x0E, 0x0D, 0x17, 0x09, // 225:3597
+  0x0E, 0x24, 0x17, 0x09, // 226:3620
+  0x0E, 0x3B, 0x17, 0x09, // 227:3643
+  0x0E, 0x52, 0x17, 0x09, // 228:3666
+  0x0E, 0x69, 0x17, 0x09, // 229:3689
+  0x0E, 0x80, 0x14, 0x08, // 230:3712
+  0x0E, 0x94, 0x14, 0x08, // 231:3732
+  0x0E, 0xA8, 0x17, 0x09, // 232:3752
+  0x0E, 0xBF, 0x17, 0x09, // 233:3775
+  0x0E, 0xD6, 0x17, 0x09, // 234:3798
+  0x0E, 0xED, 0x17, 0x09, // 235:3821
+  0x0F, 0x04, 0x05, 0x04, // 236:3844
+  0x0F, 0x09, 0x07, 0x04, // 237:3849
+  0x0F, 0x10, 0x0A, 0x04, // 238:3856
+  0x0F, 0x1A, 0x07, 0x04, // 239:3866
+  0x0F, 0x21, 0x17, 0x09, // 240:3873
+  0x0F, 0x38, 0x14, 0x09, // 241:3896
+  0x0F, 0x4C, 0x17, 0x09, // 242:3916
+  0x0F, 0x63, 0x17, 0x09, // 243:3939
+  0x0F, 0x7A, 0x17, 0x09, // 244:3962
+  0x0F, 0x91, 0x17, 0x09, // 245:3985
+  0x0F, 0xA8, 0x17, 0x09, // 246:4008
+  0x0F, 0xBF, 0x17, 0x09, // 247:4031
+  0x0F, 0xD6, 0x17, 0x0A, // 248:4054
+  0x0F, 0xED, 0x14, 0x09, // 249:4077
+  0x10, 0x01, 0x14, 0x09, // 250:4097
+  0x10, 0x15, 0x14, 0x09, // 251:4117
+  0x10, 0x29, 0x14, 0x09, // 252:4137
+  0x10, 0x3D, 0x13, 0x08, // 253:4157
+  0x10, 0x50, 0x17, 0x09, // 254:4176
+  0x10, 0x67, 0x13, 0x08, // 255:4199
+
+  // Font Data
+  0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x5F, // 33
+  0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78, // 34
+  0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08, // 35
+  0x00,0x00,0x00,0xE0,0x10,0x00,0x10,0x21,0x00,0x08,0x41,0x00,0xFC,0xFF,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 36
+  0x00,0x00,0x00,0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x61,0x00,0xF0,0x18,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x30,0x3C,0x00,0x08,0x42,0x00,0x00,0x42,0x00,0x00,0x42,0x00,0x00,0x3C, // 37
+  0x00,0x00,0x00,0x00,0x1C,0x00,0x70,0x22,0x00,0x88,0x41,0x00,0x08,0x43,0x00,0x88,0x44,0x00,0x70,0x28,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0x00,0x44, // 38
+  0x00,0x00,0x00,0x78, // 39
+  0x00,0x00,0x00,0x80,0x3F,0x00,0x70,0xC0,0x01,0x08,0x00,0x02, // 40
+  0x00,0x00,0x00,0x08,0x00,0x02,0x70,0xC0,0x01,0x80,0x3F, // 41
+  0x10,0x00,0x00,0xD0,0x00,0x00,0x38,0x00,0x00,0xD0,0x00,0x00,0x10, // 42
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0xC0,0x1F,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01, // 44
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40, // 46
+  0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 47
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xE0,0x1F, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0xF8,0x7F, // 49
+  0x00,0x00,0x00,0x20,0x40,0x00,0x10,0x60,0x00,0x08,0x50,0x00,0x08,0x48,0x00,0x08,0x44,0x00,0x10,0x43,0x00,0xE0,0x40, // 50
+  0x00,0x00,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x88,0x41,0x00,0xF0,0x22,0x00,0x00,0x1C, // 51
+  0x00,0x0C,0x00,0x00,0x0A,0x00,0x00,0x09,0x00,0xC0,0x08,0x00,0x20,0x08,0x00,0x10,0x08,0x00,0xF8,0x7F,0x00,0x00,0x08, // 52
+  0x00,0x00,0x00,0xC0,0x11,0x00,0xB8,0x20,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x08,0x21,0x00,0x08,0x1E, // 53
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x21,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x10,0x21,0x00,0x20,0x1E, // 54
+  0x00,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x78,0x00,0x08,0x07,0x00,0xC8,0x00,0x00,0x28,0x00,0x00,0x18, // 55
+  0x00,0x00,0x00,0x60,0x1C,0x00,0x90,0x22,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 56
+  0x00,0x00,0x00,0xE0,0x11,0x00,0x10,0x22,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x10,0x22,0x00,0xE0,0x1F, // 57
+  0x00,0x00,0x00,0x40,0x40, // 58
+  0x00,0x00,0x00,0x40,0xC0,0x01, // 59
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x40,0x10, // 60
+  0x00,0x00,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08, // 61
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x00,0x02, // 62
+  0x00,0x00,0x00,0x60,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x08,0x5C,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0, // 63
+  0x00,0x00,0x00,0x00,0x3F,0x00,0xC0,0x40,0x00,0x20,0x80,0x00,0x10,0x1E,0x01,0x10,0x21,0x01,0x88,0x40,0x02,0x48,0x40,0x02,0x48,0x40,0x02,0x48,0x20,0x02,0x88,0x7C,0x02,0xC8,0x43,0x02,0x10,0x40,0x02,0x10,0x20,0x01,0x60,0x10,0x01,0x80,0x8F, // 64
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 65
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 66
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 67
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 68
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 69
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08, // 70
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x12,0x00,0x00,0x0E, // 71
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0xF8,0x7F, // 72
+  0x00,0x00,0x00,0xF8,0x7F, // 73
+  0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0xF8,0x3F, // 74
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x04,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0x80,0x03,0x00,0x40,0x04,0x00,0x20,0x18,0x00,0x10,0x20,0x00,0x08,0x40, // 75
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 76
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0xF8,0x7F, // 77
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x04,0x00,0x00,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 78
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 79
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0, // 80
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x50,0x00,0x08,0x50,0x00,0x10,0x20,0x00,0x20,0x70,0x00,0xC0,0x4F, // 81
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x06,0x00,0x08,0x1A,0x00,0x10,0x21,0x00,0xE0,0x40, // 82
+  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 83
+  0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0x7F,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 84
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 85
+  0x00,0x00,0x00,0x18,0x00,0x00,0xE0,0x00,0x00,0x00,0x07,0x00,0x00,0x18,0x00,0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x07,0x00,0xE0,0x00,0x00,0x18, // 86
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x03,0x00,0x70,0x00,0x00,0x08,0x00,0x00,0x70,0x00,0x00,0x80,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 87
+  0x00,0x40,0x00,0x08,0x20,0x00,0x10,0x10,0x00,0x60,0x0C,0x00,0x80,0x02,0x00,0x00,0x01,0x00,0x80,0x02,0x00,0x60,0x0C,0x00,0x10,0x10,0x00,0x08,0x20,0x00,0x00,0x40, // 88
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x00,0x7E,0x00,0x80,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 89
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x88,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 90
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x08,0x00,0x02,0x08,0x00,0x02, // 91
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60, // 92
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF8,0xFF,0x03, // 93
+  0x00,0x01,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0x08,0x00,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x01, // 94
+  0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 95
+  0x00,0x00,0x00,0x08,0x00,0x00,0x10, // 96
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 97
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 98
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20, // 99
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xF8,0x7F, // 100
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 101
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x48,0x00,0x00,0x48, // 102
+  0x00,0x00,0x00,0x00,0x1F,0x01,0x80,0x20,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x80,0x20,0x01,0xC0,0xFF, // 103
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 104
+  0x00,0x00,0x00,0xC8,0x7F, // 105
+  0x00,0x00,0x02,0xC8,0xFF,0x01, // 106
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x06,0x00,0x00,0x19,0x00,0x80,0x20,0x00,0x40,0x40, // 107
+  0x00,0x00,0x00,0xF8,0x7F, // 108
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 109
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 110
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 111
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 112
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xC0,0xFF,0x03, // 113
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40, // 114
+  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x38, // 115
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x40,0x40,0x00,0x40,0x40, // 116
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 117
+  0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0, // 118
+  0xC0,0x00,0x00,0x00,0x1F,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1F,0x00,0xC0, // 119
+  0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x40,0x40, // 120
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x00,0xE0,0x01,0x00,0x38,0x00,0x00,0x07,0x00,0xC0, // 121
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x40,0x44,0x00,0x40,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 122
+  0x00,0x04,0x00,0x00,0x04,0x00,0xF0,0xFB,0x01,0x08,0x00,0x02,0x08,0x00,0x02, // 123
+  0x00,0x00,0x00,0xF8,0xFF,0x03, // 124
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF0,0xFB,0x01,0x00,0x04,0x00,0x00,0x04, // 125
+  0x00,0x02,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01, // 126
+  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 140
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x8A,0x40,0x00,0x69,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 143
+  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x40,0x44,0x00,0x80,0x38, // 156
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x50,0x44,0x00,0x48,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 159
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0xFF,0x03, // 161
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x03,0x40,0xF0,0x00,0x40,0x4E,0x00,0xC0,0x41,0x00,0xB8,0x20,0x00,0x00,0x11, // 162
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x42,0x00,0x00,0x41,0x00,0x80,0x40,0x00,0x40,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 163
+  0x00,0x00,0x00,0x40,0x0B,0x00,0x80,0x04,0x00,0x40,0x08,0x00,0x40,0x08,0x00,0x80,0x04,0x00,0x40,0x0B, // 164
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x02,0x80,0x87,0x02,0x00,0x1C,0x03,0x00,0x60, // 165
+  0x00,0x00,0x00,0xF8,0xF1,0x03, // 166
+  0x00,0x86,0x00,0x70,0x09,0x01,0xC8,0x10,0x02,0x88,0x10,0x02,0x08,0x21,0x02,0x08,0x61,0x02,0x30,0xD2,0x01,0x00,0x0C, // 167
+  0x08,0x00,0x00,0x00,0x00,0x00,0x08, // 168
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xC8,0x47,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x48,0x44,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 169
+  0xD0,0x00,0x00,0x48,0x01,0x00,0x28,0x01,0x00,0x28,0x01,0x00,0xF0,0x01, // 170
+  0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20, // 171
+  0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x0F, // 172
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 173
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xE8,0x4F,0x00,0x28,0x41,0x00,0x28,0x41,0x00,0x28,0x43,0x00,0x28,0x45,0x00,0xC8,0x48,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 174
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x0A,0x43,0x00,0x8A,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40, // 175
+  0x00,0x00,0x00,0x30,0x00,0x00,0x48,0x00,0x00,0x48,0x00,0x00,0x30, // 176
+  0x00,0x00,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0xE0,0x4F,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41, // 177
+  0x10,0x01,0x00,0x88,0x01,0x00,0x48,0x01,0x00,0x48,0x01,0x00,0x30,0x01, // 178
+  0x00,0x06,0x00,0xF8,0x7F,0x00,0x80,0x01,0x00,0x40, // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08, // 180
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 181
+  0xF0,0x00,0x00,0xF8,0x00,0x00,0xF8,0x01,0x00,0xF8,0x01,0x00,0xF8,0xFF,0x03,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0xFF,0x03,0x08, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02, // 183
+  0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x80,0x02,0x00,0x00,0x03, // 184
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x02,0x40,0xC2,0x02,0x40,0x22,0x03,0x80,0x7F, // 185
+  0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0xF0, // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04, // 187
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x21,0x00,0x00,0x10,0x00,0x00,0x0C,0x00,0x00,0x02,0x00,0x80,0x01,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20, // 188
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x31,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x60,0x44,0x00,0x10,0x62,0x00,0x08,0x52,0x00,0x00,0x52,0x00,0x00,0x4C, // 189
+  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x41,0x00,0x28,0x21,0x00,0xD8,0x18,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20, // 190
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x50,0x44,0x00,0x50,0x43,0x00,0xC0,0x40,0x00,0x40,0x40, // 191
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x71,0x04,0x00,0x0A,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 192
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x0A,0x04,0x00,0x71,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 193
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x71,0x04,0x00,0x82,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 194
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x72,0x04,0x00,0x81,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 195
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x08,0x04,0x00,0x72,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 196
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x7E,0x04,0x00,0x0A,0x04,0x00,0x7E,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 197
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 198
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x02,0x08,0xC0,0x02,0x08,0x40,0x03,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10, // 199
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 200
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 201
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x02,0x08,0xC1,0x02,0x08,0x41,0x03,0x08,0x41,0x00,0x08,0x40, // 202
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 203
+  0x01,0x00,0x00,0xFA,0x7F, // 204
+  0x00,0x00,0x00,0xFA,0x7F,0x00,0x01, // 205
+  0x02,0x00,0x00,0xF9,0x7F,0x00,0x01,0x00,0x00,0x02, // 206
+  0x02,0x00,0x00,0xF8,0x7F,0x00,0x02, // 207
+  0x00,0x02,0x00,0xF8,0x7F,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 208
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x02,0x04,0x00,0x01,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 209
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 210
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 211
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 212
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 213
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 214
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x07,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x40,0x10, // 215
+  0x00,0x00,0x00,0xC0,0x4F,0x00,0x20,0x30,0x00,0x10,0x30,0x00,0x08,0x4C,0x00,0x08,0x42,0x00,0x08,0x41,0x00,0xC8,0x40,0x00,0x30,0x20,0x00,0x30,0x10,0x00,0xC8,0x0F, // 216
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 217
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 218
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 219
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 220
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x02,0x7E,0x00,0x81,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 221
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x40,0x08,0x00,0x80,0x07, // 222
+  0x00,0x00,0x00,0xE0,0x7F,0x00,0x10,0x00,0x00,0x08,0x20,0x00,0x88,0x43,0x00,0x70,0x42,0x00,0x00,0x44,0x00,0x00,0x38, // 223
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 224
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 225
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x42,0x00,0x50,0x22,0x00,0x80,0x7F, // 226
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x48,0x22,0x00,0x80,0x7F, // 227
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 228
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x5C,0x44,0x00,0x54,0x44,0x00,0x5C,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 229
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20, // 230
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x02,0x40,0xC0,0x02,0x40,0x40,0x03,0x80,0x20, // 231
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x48,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 232
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 233
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x02,0x40,0xC4,0x02,0x80,0x24,0x03,0x00,0x17, // 234
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 235
+  0x08,0x00,0x00,0xD0,0x7F, // 236
+  0x00,0x00,0x00,0xD0,0x7F,0x00,0x08, // 237
+  0x10,0x00,0x00,0xC8,0x7F,0x00,0x08,0x00,0x00,0x10, // 238
+  0x10,0x00,0x00,0xC0,0x7F,0x00,0x10, // 239
+  0x00,0x00,0x00,0x00,0x1F,0x00,0xA0,0x20,0x00,0x68,0x40,0x00,0x58,0x40,0x00,0x70,0x40,0x00,0xE8,0x20,0x00,0x00,0x1F, // 240
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x50,0x00,0x00,0x48,0x00,0x00,0x80,0x7F, // 241
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 242
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 243
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x48,0x40,0x00,0x90,0x20,0x00,0x00,0x1F, // 244
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x88,0x20,0x00,0x00,0x1F, // 245
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 246
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x80,0x0A,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 247
+  0x00,0x00,0x00,0x00,0x5F,0x00,0x80,0x30,0x00,0x40,0x48,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x80,0x21,0x00,0x40,0x1F, // 248
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 249
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x08,0x20,0x00,0xC0,0x7F, // 250
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x10,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xC0,0x7F, // 251
+  0x00,0x00,0x00,0xD0,0x3F,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 252
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x10,0xE0,0x01,0x08,0x38,0x00,0x00,0x07,0x00,0xC0, // 253
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 254
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x10,0x38,0x02,0x00,0xE0,0x01,0x10,0x38,0x00,0x00,0x07,0x00,0xC0 // 255
+};
+
+const uint8_t ArialMT_Win1250_Plain_24[] PROGMEM = {
+  0x18, // Width: 24
+  0x1C, // Height: 28
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table
+  0xFF, 0xFF, 0x00, 0x07, // 32:65535
+  0x00, 0x00, 0x13, 0x07, // 33:0
+  0x00, 0x13, 0x1A, 0x09, // 34:19
+  0x00, 0x2D, 0x33, 0x0D, // 35:45
+  0x00, 0x60, 0x2F, 0x0D, // 36:96
+  0x00, 0x8F, 0x4F, 0x15, // 37:143
+  0x00, 0xDE, 0x3B, 0x10, // 38:222
+  0x01, 0x19, 0x0A, 0x05, // 39:281
+  0x01, 0x23, 0x1C, 0x08, // 40:291
+  0x01, 0x3F, 0x1B, 0x08, // 41:319
+  0x01, 0x5A, 0x21, 0x09, // 42:346
+  0x01, 0x7B, 0x32, 0x0E, // 43:379
+  0x01, 0xAD, 0x10, 0x07, // 44:429
+  0x01, 0xBD, 0x1B, 0x08, // 45:445
+  0x01, 0xD8, 0x0F, 0x07, // 46:472
+  0x01, 0xE7, 0x19, 0x07, // 47:487
+  0x02, 0x00, 0x2F, 0x0D, // 48:512
+  0x02, 0x2F, 0x23, 0x0D, // 49:559
+  0x02, 0x52, 0x2F, 0x0D, // 50:594
+  0x02, 0x81, 0x2F, 0x0D, // 51:641
+  0x02, 0xB0, 0x2F, 0x0D, // 52:688
+  0x02, 0xDF, 0x2F, 0x0D, // 53:735
+  0x03, 0x0E, 0x2F, 0x0D, // 54:782
+  0x03, 0x3D, 0x2D, 0x0D, // 55:829
+  0x03, 0x6A, 0x2F, 0x0D, // 56:874
+  0x03, 0x99, 0x2F, 0x0D, // 57:921
+  0x03, 0xC8, 0x0F, 0x07, // 58:968
+  0x03, 0xD7, 0x10, 0x07, // 59:983
+  0x03, 0xE7, 0x2F, 0x0E, // 60:999
+  0x04, 0x16, 0x2F, 0x0E, // 61:1046
+  0x04, 0x45, 0x2E, 0x0E, // 62:1093
+  0x04, 0x73, 0x2E, 0x0D, // 63:1139
+  0x04, 0xA1, 0x5B, 0x18, // 64:1185
+  0x04, 0xFC, 0x3B, 0x10, // 65:1276
+  0x05, 0x37, 0x3B, 0x10, // 66:1335
+  0x05, 0x72, 0x3F, 0x11, // 67:1394
+  0x05, 0xB1, 0x3F, 0x11, // 68:1457
+  0x05, 0xF0, 0x3B, 0x10, // 69:1520
+  0x06, 0x2B, 0x35, 0x0F, // 70:1579
+  0x06, 0x60, 0x43, 0x13, // 71:1632
+  0x06, 0xA3, 0x3B, 0x11, // 72:1699
+  0x06, 0xDE, 0x0F, 0x07, // 73:1758
+  0x06, 0xED, 0x27, 0x0C, // 74:1773
+  0x07, 0x14, 0x3F, 0x10, // 75:1812
+  0x07, 0x53, 0x2F, 0x0D, // 76:1875
+  0x07, 0x82, 0x43, 0x14, // 77:1922
+  0x07, 0xC5, 0x3B, 0x11, // 78:1989
+  0x08, 0x00, 0x47, 0x13, // 79:2048
+  0x08, 0x47, 0x3A, 0x10, // 80:2119
+  0x08, 0x81, 0x47, 0x13, // 81:2177
+  0x08, 0xC8, 0x3F, 0x11, // 82:2248
+  0x09, 0x07, 0x3B, 0x10, // 83:2311
+  0x09, 0x42, 0x35, 0x0F, // 84:2370
+  0x09, 0x77, 0x3B, 0x11, // 85:2423
+  0x09, 0xB2, 0x39, 0x10, // 86:2482
+  0x09, 0xEB, 0x59, 0x17, // 87:2539
+  0x0A, 0x44, 0x3B, 0x10, // 88:2628
+  0x0A, 0x7F, 0x3D, 0x10, // 89:2687
+  0x0A, 0xBC, 0x37, 0x0F, // 90:2748
+  0x0A, 0xF3, 0x14, 0x07, // 91:2803
+  0x0B, 0x07, 0x1B, 0x07, // 92:2823
+  0x0B, 0x22, 0x18, 0x07, // 93:2850
+  0x0B, 0x3A, 0x2A, 0x0B, // 94:2874
+  0x0B, 0x64, 0x34, 0x0D, // 95:2916
+  0x0B, 0x98, 0x11, 0x08, // 96:2968
+  0x0B, 0xA9, 0x2F, 0x0D, // 97:2985
+  0x0B, 0xD8, 0x33, 0x0D, // 98:3032
+  0x0C, 0x0B, 0x2B, 0x0C, // 99:3083
+  0x0C, 0x36, 0x2F, 0x0D, // 100:3126
+  0x0C, 0x65, 0x2F, 0x0D, // 101:3173
+  0x0C, 0x94, 0x1A, 0x07, // 102:3220
+  0x0C, 0xAE, 0x2F, 0x0D, // 103:3246
+  0x0C, 0xDD, 0x2F, 0x0D, // 104:3293
+  0x0D, 0x0C, 0x0F, 0x05, // 105:3340
+  0x0D, 0x1B, 0x10, 0x05, // 106:3355
+  0x0D, 0x2B, 0x2F, 0x0C, // 107:3371
+  0x0D, 0x5A, 0x0F, 0x05, // 108:3418
+  0x0D, 0x69, 0x47, 0x14, // 109:3433
+  0x0D, 0xB0, 0x2F, 0x0D, // 110:3504
+  0x0D, 0xDF, 0x2F, 0x0D, // 111:3551
+  0x0E, 0x0E, 0x33, 0x0D, // 112:3598
+  0x0E, 0x41, 0x30, 0x0D, // 113:3649
+  0x0E, 0x71, 0x1E, 0x08, // 114:3697
+  0x0E, 0x8F, 0x2B, 0x0C, // 115:3727
+  0x0E, 0xBA, 0x1B, 0x07, // 116:3770
+  0x0E, 0xD5, 0x2F, 0x0D, // 117:3797
+  0x0F, 0x04, 0x2A, 0x0C, // 118:3844
+  0x0F, 0x2E, 0x42, 0x11, // 119:3886
+  0x0F, 0x70, 0x2B, 0x0C, // 120:3952
+  0x0F, 0x9B, 0x2A, 0x0C, // 121:3995
+  0x0F, 0xC5, 0x2B, 0x0C, // 122:4037
+  0x0F, 0xF0, 0x1C, 0x08, // 123:4080
+  0x10, 0x0C, 0x10, 0x06, // 124:4108
+  0x10, 0x1C, 0x1B, 0x08, // 125:4124
+  0x10, 0x37, 0x32, 0x0E, // 126:4151
+  0xFF, 0xFF, 0x00, 0x00, // 127:65535
+  0xFF, 0xFF, 0x00, 0x18, // 128:65535
+  0xFF, 0xFF, 0x00, 0x18, // 129:65535
+  0xFF, 0xFF, 0x00, 0x18, // 130:65535
+  0xFF, 0xFF, 0x00, 0x18, // 131:65535
+  0xFF, 0xFF, 0x00, 0x18, // 132:65535
+  0xFF, 0xFF, 0x00, 0x18, // 133:65535
+  0xFF, 0xFF, 0x00, 0x18, // 134:65535
+  0xFF, 0xFF, 0x00, 0x18, // 135:65535
+  0xFF, 0xFF, 0x00, 0x18, // 136:65535
+  0xFF, 0xFF, 0x00, 0x18, // 137:65535
+  0xFF, 0xFF, 0x00, 0x18, // 138:65535
+  0xFF, 0xFF, 0x00, 0x18, // 139:65535
+  0x10, 0x69, 0x3B, 0x10, // 140:4201
+  0xFF, 0xFF, 0x00, 0x18, // 141:65535
+  0xFF, 0xFF, 0x00, 0x18, // 142:65535
+  0x10, 0xA4, 0x37, 0x0F, // 143:4260
+  0xFF, 0xFF, 0x00, 0x18, // 144:65535
+  0xFF, 0xFF, 0x00, 0x18, // 145:65535
+  0xFF, 0xFF, 0x00, 0x18, // 146:65535
+  0xFF, 0xFF, 0x00, 0x18, // 147:65535
+  0xFF, 0xFF, 0x00, 0x18, // 148:65535
+  0xFF, 0xFF, 0x00, 0x18, // 149:65535
+  0xFF, 0xFF, 0x00, 0x18, // 150:65535
+  0xFF, 0xFF, 0x00, 0x18, // 151:65535
+  0xFF, 0xFF, 0x00, 0x18, // 152:65535
+  0xFF, 0xFF, 0x00, 0x18, // 153:65535
+  0xFF, 0xFF, 0x00, 0x18, // 154:65535
+  0xFF, 0xFF, 0x00, 0x18, // 155:65535
+  0x10, 0xDB, 0x2B, 0x0C, // 156:4315
+  0xFF, 0xFF, 0x00, 0x18, // 157:65535
+  0xFF, 0xFF, 0x00, 0x18, // 158:65535
+  0x11, 0x06, 0x2B, 0x0C, // 159:4358
+  0xFF, 0xFF, 0x00, 0x07, // 160:65535
+  0x11, 0x31, 0x14, 0x08, // 161:4401
+  0x11, 0x45, 0x2B, 0x0D, // 162:4421
+  0x11, 0x70, 0x2F, 0x0D, // 163:4464
+  0x11, 0x9F, 0x33, 0x0D, // 164:4511
+  0x11, 0xD2, 0x3B, 0x10, // 165:4562
+  0x12, 0x0D, 0x10, 0x06, // 166:4621
+  0x12, 0x1D, 0x2F, 0x0D, // 167:4637
+  0x12, 0x4C, 0x19, 0x08, // 168:4684
+  0x12, 0x65, 0x46, 0x12, // 169:4709
+  0x12, 0xAB, 0x1A, 0x09, // 170:4779
+  0x12, 0xC5, 0x27, 0x0D, // 171:4805
+  0x12, 0xEC, 0x2F, 0x0E, // 172:4844
+  0x13, 0x1B, 0x1B, 0x08, // 173:4891
+  0x13, 0x36, 0x46, 0x12, // 174:4918
+  0x13, 0x7C, 0x37, 0x0F, // 175:4988
+  0x13, 0xB3, 0x1E, 0x0A, // 176:5043
+  0x13, 0xD1, 0x33, 0x0D, // 177:5073
+  0x14, 0x04, 0x1A, 0x08, // 178:5124
+  0x14, 0x1E, 0x16, 0x06, // 179:5150
+  0x14, 0x34, 0x19, 0x08, // 180:5172
+  0x14, 0x4D, 0x2F, 0x0E, // 181:5197
+  0x14, 0x7C, 0x31, 0x0D, // 182:5244
+  0x14, 0xAD, 0x12, 0x08, // 183:5293
+  0x14, 0xBF, 0x18, 0x08, // 184:5311
+  0x14, 0xD7, 0x2F, 0x0D, // 185:5335
+  0x15, 0x06, 0x1E, 0x09, // 186:5382
+  0x15, 0x24, 0x2E, 0x0D, // 187:5412
+  0x15, 0x52, 0x4F, 0x14, // 188:5458
+  0x15, 0xA1, 0x4B, 0x14, // 189:5537
+  0x15, 0xEC, 0x4B, 0x14, // 190:5612
+  0x16, 0x37, 0x2B, 0x0C, // 191:5687
+  0x16, 0x62, 0x3B, 0x10, // 192:5730
+  0x16, 0x9D, 0x3B, 0x10, // 193:5789
+  0x16, 0xD8, 0x3B, 0x10, // 194:5848
+  0x17, 0x13, 0x3B, 0x10, // 195:5907
+  0x17, 0x4E, 0x3B, 0x10, // 196:5966
+  0x17, 0x89, 0x3B, 0x10, // 197:6025
+  0x17, 0xC4, 0x3F, 0x11, // 198:6084
+  0x18, 0x03, 0x3F, 0x11, // 199:6147
+  0x18, 0x42, 0x3B, 0x10, // 200:6210
+  0x18, 0x7D, 0x3B, 0x10, // 201:6269
+  0x18, 0xB8, 0x3B, 0x10, // 202:6328
+  0x18, 0xF3, 0x3B, 0x10, // 203:6387
+  0x19, 0x2E, 0x11, 0x07, // 204:6446
+  0x19, 0x3F, 0x11, 0x07, // 205:6463
+  0x19, 0x50, 0x15, 0x07, // 206:6480
+  0x19, 0x65, 0x15, 0x07, // 207:6501
+  0x19, 0x7A, 0x3F, 0x11, // 208:6522
+  0x19, 0xB9, 0x3B, 0x11, // 209:6585
+  0x19, 0xF4, 0x47, 0x13, // 210:6644
+  0x1A, 0x3B, 0x47, 0x13, // 211:6715
+  0x1A, 0x82, 0x47, 0x13, // 212:6786
+  0x1A, 0xC9, 0x47, 0x13, // 213:6857
+  0x1B, 0x10, 0x47, 0x13, // 214:6928
+  0x1B, 0x57, 0x2B, 0x0E, // 215:6999
+  0x1B, 0x82, 0x47, 0x13, // 216:7042
+  0x1B, 0xC9, 0x3B, 0x11, // 217:7113
+  0x1C, 0x04, 0x3B, 0x11, // 218:7172
+  0x1C, 0x3F, 0x3B, 0x11, // 219:7231
+  0x1C, 0x7A, 0x3B, 0x11, // 220:7290
+  0x1C, 0xB5, 0x3D, 0x10, // 221:7349
+  0x1C, 0xF2, 0x3A, 0x10, // 222:7410
+  0x1D, 0x2C, 0x37, 0x0F, // 223:7468
+  0x1D, 0x63, 0x2F, 0x0D, // 224:7523
+  0x1D, 0x92, 0x2F, 0x0D, // 225:7570
+  0x1D, 0xC1, 0x2F, 0x0D, // 226:7617
+  0x1D, 0xF0, 0x2F, 0x0D, // 227:7664
+  0x1E, 0x1F, 0x2F, 0x0D, // 228:7711
+  0x1E, 0x4E, 0x2F, 0x0D, // 229:7758
+  0x1E, 0x7D, 0x2B, 0x0C, // 230:7805
+  0x1E, 0xA8, 0x2B, 0x0C, // 231:7848
+  0x1E, 0xD3, 0x2F, 0x0D, // 232:7891
+  0x1F, 0x02, 0x2F, 0x0D, // 233:7938
+  0x1F, 0x31, 0x2F, 0x0D, // 234:7985
+  0x1F, 0x60, 0x2F, 0x0D, // 235:8032
+  0x1F, 0x8F, 0x11, 0x07, // 236:8079
+  0x1F, 0xA0, 0x11, 0x07, // 237:8096
+  0x1F, 0xB1, 0x15, 0x07, // 238:8113
+  0x1F, 0xC6, 0x15, 0x07, // 239:8134
+  0x1F, 0xDB, 0x2F, 0x0D, // 240:8155
+  0x20, 0x0A, 0x2F, 0x0D, // 241:8202
+  0x20, 0x39, 0x2F, 0x0D, // 242:8249
+  0x20, 0x68, 0x2F, 0x0D, // 243:8296
+  0x20, 0x97, 0x2F, 0x0D, // 244:8343
+  0x20, 0xC6, 0x2F, 0x0D, // 245:8390
+  0x20, 0xF5, 0x2F, 0x0D, // 246:8437
+  0x21, 0x24, 0x32, 0x0D, // 247:8484
+  0x21, 0x56, 0x33, 0x0F, // 248:8534
+  0x21, 0x89, 0x2F, 0x0D, // 249:8585
+  0x21, 0xB8, 0x2F, 0x0D, // 250:8632
+  0x21, 0xE7, 0x2F, 0x0D, // 251:8679
+  0x22, 0x16, 0x2F, 0x0D, // 252:8726
+  0x22, 0x45, 0x2A, 0x0C, // 253:8773
+  0x22, 0x6F, 0x2F, 0x0D, // 254:8815
+  0x22, 0x9E, 0x2A, 0x0C, // 255:8862
+
+  // Font Data
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x33,0x00,0xE0,0xFF,0x33, // 33
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07, // 34
+  0x00,0x0C,0x03,0x00,0x00,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x03,0x00,0x00,0x0C,0x03, // 35
+  0x00,0x00,0x00,0x00,0x80,0x07,0x06,0x00,0xC0,0x0F,0x1E,0x00,0xC0,0x18,0x1C,0x00,0x60,0x18,0x38,0x00,0x60,0x30,0x30,0x00,0xF0,0xFF,0xFF,0x00,0x60,0x30,0x30,0x00,0x60,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0xC1,0x1F,0x00,0x00,0x81,0x07, // 36
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x00,0x60,0x30,0x38,0x00,0xC0,0x1F,0x1E,0x00,0x80,0x8F,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x8F,0x0F,0x00,0xC0,0xC3,0x1F,0x00,0xE0,0x60,0x30,0x00,0x20,0x20,0x20,0x00,0x00,0x20,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 37
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0xC0,0x0F,0x00,0x80,0xE3,0x1C,0x00,0xC0,0x77,0x38,0x00,0xE0,0x3C,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x78,0x30,0x00,0xE0,0xEC,0x38,0x00,0xC0,0x8F,0x1B,0x00,0x80,0x03,0x1F,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xC0,0x38,0x00,0x00,0x00,0x10, // 38
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07, // 39
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x0F,0x00,0x00,0xFE,0x7F,0x00,0x80,0x0F,0xF0,0x01,0xC0,0x01,0x80,0x03,0x60,0x00,0x00,0x06,0x20,0x00,0x00,0x04, // 40
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x04,0x60,0x00,0x00,0x06,0xC0,0x01,0x80,0x03,0x80,0x0F,0xF0,0x01,0x00,0xFE,0x7F,0x00,0x00,0xF0,0x0F, // 41
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x04,0x00,0x00,0x80,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x80,0x04,0x00,0x00,0x80, // 42
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xFF,0x0F,0x00,0x00,0xFF,0x0F,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x03,0x00,0x00,0xF0,0x01, // 44
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 46
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x3F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60, // 47
+  0x00,0x00,0x00,0x00,0x00,0xFE,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x01,0x1C,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x03, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 49
+  0x00,0x00,0x00,0x00,0x00,0x03,0x30,0x00,0xC0,0x03,0x38,0x00,0xC0,0x00,0x3C,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x33,0x00,0x60,0x80,0x31,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x30,0x00,0xC0,0x30,0x30,0x00,0xC0,0x1F,0x30,0x00,0x00,0x0F,0x30, // 50
+  0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x00,0xC0,0x01,0x0E,0x00,0xC0,0x00,0x1C,0x00,0x60,0x00,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x0F,0x00,0x00,0x80,0x07, // 51
+  0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x03,0x00,0x00,0x3C,0x03,0x00,0x00,0x0E,0x03,0x00,0x80,0x07,0x03,0x00,0xC0,0x01,0x03,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x03, // 52
+  0x00,0x00,0x00,0x00,0x00,0x30,0x06,0x00,0x80,0x3F,0x0E,0x00,0xE0,0x1F,0x18,0x00,0x60,0x08,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x18,0x1C,0x00,0x60,0xF0,0x0F,0x00,0x00,0xE0,0x03, // 53
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x63,0x1C,0x00,0xC0,0x30,0x38,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0xE0,0x30,0x18,0x00,0xC0,0xF1,0x0F,0x00,0x80,0xC1,0x07, // 54
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x3C,0x00,0x60,0x80,0x3F,0x00,0x60,0xE0,0x03,0x00,0x60,0x78,0x00,0x00,0x60,0x0E,0x00,0x00,0x60,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60, // 55
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x80,0xC7,0x1F,0x00,0xC0,0x6F,0x18,0x00,0xE0,0x38,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xE0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 56
+  0x00,0x00,0x00,0x00,0x00,0x1F,0x0C,0x00,0x80,0x7F,0x1C,0x00,0xC0,0x61,0x38,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x18,0x00,0xC0,0x31,0x1E,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x01, // 57
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 58
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x03,0x00,0x06,0xF0,0x01, // 59
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x04,0x01,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x03,0x06, // 60
+  0x00,0x00,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01, // 61
+  0x00,0x00,0x00,0x00,0x00,0x03,0x06,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x04,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x20, // 62
+  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x33,0x00,0x60,0xE0,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x00,0x07, // 63
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x0F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x1E,0xF0,0x00,0x00,0x07,0xC0,0x01,0x80,0xC3,0x87,0x01,0xC0,0xF1,0x9F,0x03,0xC0,0x38,0x18,0x03,0xC0,0x0C,0x30,0x03,0x60,0x0E,0x30,0x06,0x60,0x06,0x30,0x06,0x60,0x06,0x18,0x06,0x60,0x06,0x0C,0x06,0x60,0x0C,0x1E,0x06,0x60,0xF8,0x3F,0x06,0xE0,0xFE,0x31,0x06,0xC0,0x0E,0x30,0x06,0xC0,0x01,0x18,0x03,0x80,0x03,0x1C,0x03,0x00,0x07,0x8F,0x01,0x00,0xFE,0x87,0x01,0x00,0xF8,0xC1,0x00,0x00,0x00,0x40, // 64
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 65
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x78,0x30,0x00,0xC0,0xFF,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 66
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 67
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 68
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 69
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60, // 70
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x60,0x30,0x00,0x60,0x60,0x30,0x00,0xE0,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0x61,0x18,0x00,0x80,0xE3,0x0F,0x00,0x00,0xE2,0x0F, // 71
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 72
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 73
+  0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0xE0,0xFF,0x1F,0x00,0xE0,0xFF,0x0F, // 74
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE7,0x01,0x00,0x80,0x83,0x07,0x00,0xC0,0x01,0x0F,0x00,0xE0,0x00,0x1E,0x00,0x60,0x00,0x38,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 75
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 76
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x07,0x00,0x00,0xFE,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 77
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 78
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 79
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0xC0,0x30,0x00,0x00,0xC0,0x3F,0x00,0x00,0x00,0x0F, // 80
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x0C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x36,0x00,0xE0,0x00,0x3C,0x00,0xC0,0x00,0x1C,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x3F,0x00,0x00,0xFF,0x77,0x00,0x00,0xFC,0x61, // 81
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x70,0x00,0x00,0x60,0xF0,0x00,0x00,0x60,0xF0,0x03,0x00,0x60,0xB0,0x07,0x00,0xE0,0x18,0x1F,0x00,0xC0,0x1F,0x3C,0x00,0x80,0x0F,0x30,0x00,0x00,0x00,0x20, // 82
+  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x70,0x30,0x00,0xC0,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 83
+  0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 84
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 85
+  0x20,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xF8,0x01,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0x20, // 86
+  0x60,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x80,0xFF,0x00,0x00,0x00,0xF8,0x0F,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x80,0x3F,0x00,0x00,0xF8,0x0F,0x00,0x80,0xFF,0x00,0x00,0xE0,0x07,0x00,0x00,0x60, // 87
+  0x00,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x60,0x00,0x3C,0x00,0xE0,0x01,0x1E,0x00,0xC0,0x83,0x07,0x00,0x00,0xCF,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0x38,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0xCF,0x03,0x00,0xC0,0x03,0x07,0x00,0xE0,0x01,0x1E,0x00,0x60,0x00,0x3C,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 88
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x3C,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 89
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 90
+  0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06, // 91
+  0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 92
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07, // 93
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xE0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x20, // 94
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06, // 95
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x80, // 96
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 97
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 98
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 99
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 100
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 101
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x60,0x06, // 102
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x83,0x01,0x00,0xF8,0x8F,0x03,0x00,0x1C,0x1C,0x07,0x00,0x0E,0x38,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x0C,0x18,0x07,0x00,0x18,0x8C,0x03,0x00,0xFE,0xFF,0x01,0x00,0xFE,0xFF, // 103
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 104
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F, // 105
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x60,0xFE,0xFF,0x07,0x60,0xFE,0xFF,0x03, // 106
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xF0,0x01,0x00,0x00,0x98,0x07,0x00,0x00,0x0C,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x02,0x30,0x00,0x00,0x00,0x20, // 107
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 108
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 109
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 110
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 111
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 112
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07, // 113
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06, // 114
+  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x31,0x00,0x00,0xC6,0x31,0x00,0x00,0x8E,0x39,0x00,0x00,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 115
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 116
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 117
+  0x00,0x06,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xF8,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 118
+  0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x7C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xF0,0x03,0x00,0x00,0x7E,0x00,0x00,0x00,0x0E, // 119
+  0x00,0x02,0x20,0x00,0x00,0x06,0x30,0x00,0x00,0x1E,0x3C,0x00,0x00,0x38,0x0E,0x00,0x00,0xF0,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x07,0x00,0x00,0x38,0x0E,0x00,0x00,0x1C,0x3C,0x00,0x00,0x0E,0x30,0x00,0x00,0x02,0x20, // 120
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0x00,0xC0,0x1F,0x00,0x00,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 121
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x00,0xE6,0x30,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 122
+  0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x03,0x00,0xC0,0x7F,0xFE,0x03,0xE0,0x3F,0xFC,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06, // 123
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x0F,0xE0,0xFF,0xFF,0x0F, // 124
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0x3F,0xFC,0x07,0xC0,0x7F,0xFF,0x03,0x00,0xC0,0x03,0x00,0x00,0x80,0x01, // 125
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60, // 126
+  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x70,0x30,0x00,0xC2,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 140
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x68,0x1C,0x30,0x00,0x6E,0x0E,0x30,0x00,0x66,0x07,0x30,0x00,0xE2,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 143
+  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x80,0xC6,0x31,0x00,0xE0,0xC6,0x31,0x00,0x60,0x8E,0x39,0x00,0x20,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 156
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x80,0xE6,0x30,0x00,0xE0,0x76,0x30,0x00,0x60,0x3E,0x30,0x00,0x20,0x1E,0x30,0x00,0x00,0x06,0x30, // 159
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE6,0xFF,0x07,0x00,0xE6,0xFF,0x07, // 161
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x9C,0x07,0x00,0x0E,0x78,0x00,0x00,0x06,0x3F,0x00,0x00,0xF6,0x30,0x00,0x00,0x0E,0x30,0x00,0xE0,0x0D,0x1C,0x00,0x00,0x1C,0x0E,0x00,0x00,0x10,0x06, // 162
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x30,0x00,0x00,0x18,0x30,0x00,0x00,0x0C,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x03,0x30,0x00,0x00,0x01,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 163
+  0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x00,0x00,0xF7,0x0E,0x00,0x00,0xFE,0x07,0x00,0x00,0x0C,0x03,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x0C,0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xF7,0x0E,0x00,0x00,0x02,0x04, // 164
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x02,0x80,0x8F,0x01,0x02,0x00,0xFE,0xC1,0x02,0x00,0xF0,0x83,0x03,0x00,0x80,0x0F,0x01,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 165
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x7F,0xF8,0x0F,0xE0,0x7F,0xF8,0x0F, // 166
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0xF3,0xC1,0x00,0xC0,0x1F,0xC3,0x03,0xE0,0x0C,0x07,0x03,0x60,0x1C,0x06,0x06,0x60,0x18,0x0C,0x06,0x60,0x30,0x1C,0x06,0xE0,0x70,0x38,0x07,0xC0,0xE1,0xF4,0x03,0x80,0xC1,0xE7,0x01,0x00,0x80,0x03, // 167
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 168
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x79,0x1C,0x00,0xC0,0xFE,0x19,0x00,0x60,0x86,0x31,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x87,0x33,0x00,0xC0,0x86,0x19,0x00,0xC0,0x85,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8, // 169
+  0x00,0x00,0x00,0x00,0xC0,0x1C,0x00,0x00,0xE0,0x3E,0x00,0x00,0x60,0x32,0x00,0x00,0x60,0x32,0x00,0x00,0xE0,0x3F,0x00,0x00,0xC0,0x3F, // 170
+  0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x84,0x10,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x04,0x10, // 171
+  0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFC,0x01, // 172
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 173
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x01,0x1C,0x00,0xC0,0xFE,0x1B,0x00,0x60,0xFE,0x33,0x00,0x60,0x66,0x30,0x00,0x60,0x66,0x30,0x00,0x60,0xE6,0x30,0x00,0x60,0xFE,0x31,0x00,0x60,0x3C,0x33,0x00,0xC0,0x00,0x1A,0x00,0xC0,0x01,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8, // 174
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x6C,0xE0,0x30,0x00,0x6C,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 175
+  0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x40,0x04,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x40,0x04,0x00,0x00,0x80,0x03, // 176
+  0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0xFF,0x3F,0x00,0x00,0xFF,0x3F,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30, // 177
+  0x40,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x38,0x00,0x00,0x20,0x2C,0x00,0x00,0x20,0x26,0x00,0x00,0xE0,0x23,0x00,0x00,0xC0,0x21, // 178
+  0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C, // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 180
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x00,0x1C,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x1C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 181
+  0x00,0x0F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 183
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0xC0,0x02,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01, // 184
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x02,0x00,0xC6,0x18,0x02,0x00,0xCE,0xCC,0x02,0x00,0xFC,0x9F,0x03,0x00,0xF8,0x3F,0x01,0x00,0x00,0x20, // 185
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xE0,0x38,0x00,0x00,0x60,0x30,0x00,0x00,0xE0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x84,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x80, // 187
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x38,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x0C,0x00,0xC0,0x01,0x0E,0x00,0xE0,0x80,0x0B,0x00,0x60,0xC0,0x08,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,0x00,0x00,0x00,0x08, // 188
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x30,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x4E,0x20,0x00,0x00,0x67,0x30,0x00,0xC0,0x21,0x38,0x00,0xE0,0x20,0x2C,0x00,0x60,0x20,0x26,0x00,0x00,0xE0,0x27,0x00,0x00,0xC0,0x21, // 189
+  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x20,0x00,0x20,0x22,0x30,0x00,0xE0,0x3D,0x38,0x00,0xC0,0x1D,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x0E,0x0C,0x00,0x00,0x07,0x0E,0x00,0x80,0x83,0x0B,0x00,0xE0,0xC0,0x08,0x00,0x60,0xE0,0x3F,0x00,0x20,0xE0,0x3F,0x00,0x00,0x00,0x08, // 190
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0xC0,0xE6,0x30,0x00,0xC0,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 191
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x82,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE8,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 192
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE8,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x82,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 193
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x88,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x08,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 194
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x0C,0xFE,0x01,0x00,0x8E,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xEC,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0E,0xFE,0x01,0x00,0x06,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 195
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x8C,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0C,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 196
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x9C,0x8F,0x01,0x00,0xE2,0x83,0x01,0x00,0x62,0x80,0x01,0x00,0xE2,0x83,0x01,0x00,0x9C,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 197
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 198
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x02,0x60,0x00,0x30,0x02,0x60,0x00,0xF0,0x02,0x60,0x00,0xB0,0x03,0x60,0x00,0x30,0x01,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 199
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 200
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 201
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x02,0x60,0x30,0x30,0x02,0x60,0x30,0xF0,0x02,0x60,0x30,0xB0,0x03,0x60,0x30,0x30,0x01,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 202
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 203
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xEE,0xFF,0x3F,0x00,0x08, // 204
+  0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0xEE,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x02, // 205
+  0x08,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x08, // 206
+  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x0C, // 207
+  0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 208
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0x70,0x00,0x00,0x0E,0xE0,0x01,0x00,0x06,0x80,0x03,0x00,0x02,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 209
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x62,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 210
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 211
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x68,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xE8,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 212
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xCC,0x00,0x18,0x00,0xEE,0x00,0x38,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0xE6,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 213
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xEC,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 214
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x03,0x00,0x00,0x8E,0x03,0x00,0x00,0xDC,0x01,0x00,0x00,0xF8,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xDC,0x01,0x00,0x00,0x8E,0x03,0x00,0x00,0x06,0x03, // 215
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x21,0x00,0x00,0xFF,0x77,0x00,0x80,0x07,0x3F,0x00,0xC0,0x01,0x1E,0x00,0xC0,0x00,0x1F,0x00,0xE0,0x80,0x3B,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x70,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0xE0,0x0E,0x38,0x00,0xC0,0x07,0x18,0x00,0xC0,0x03,0x1C,0x00,0xE0,0x07,0x0F,0x00,0x70,0xFF,0x07,0x00,0x20,0xFC,0x01, // 216
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x02,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 217
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x02,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 218
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x08,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x08,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 219
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 220
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0xF0,0x3F,0x00,0x0E,0xF0,0x3F,0x00,0x06,0x3C,0x00,0x00,0x02,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 221
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x07,0x00,0x00,0x86,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0xF8, // 222
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x3F,0x00,0xC0,0xFF,0x3F,0x00,0xC0,0x00,0x00,0x00,0x60,0x00,0x08,0x00,0x60,0x00,0x1C,0x00,0x60,0x00,0x38,0x00,0xE0,0x78,0x30,0x00,0xC0,0x7F,0x30,0x00,0x80,0xC7,0x30,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x0F, // 223
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x20,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 224
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x80,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x18,0x00,0x20,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 225
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x80,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0x60,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0x80,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 226
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0xC0,0x1C,0x1F,0x00,0xE0,0x8C,0x39,0x00,0x60,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xC0,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xE0,0xCE,0x0C,0x00,0x60,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 227
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0xC0,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xC0,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 228
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x70,0x86,0x31,0x00,0x88,0x86,0x31,0x00,0x88,0xC6,0x30,0x00,0x88,0xC6,0x18,0x00,0x70,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 229
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x0E,0x38,0x00,0x20,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 230
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x02,0x00,0x06,0x30,0x02,0x00,0x06,0xF0,0x02,0x00,0x06,0xB0,0x03,0x00,0x0E,0x38,0x01,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 231
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x20,0xCE,0x38,0x00,0x60,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 232
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x80,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x20,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 233
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x02,0x00,0xC6,0x30,0x02,0x00,0xCE,0xF8,0x02,0x00,0xDC,0x98,0x03,0x00,0xF8,0x0C,0x01,0x00,0xF0,0x04, // 234
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 235
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0xE0,0xFE,0x3F,0x00,0x80, // 236
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0x20, // 237
+  0x80,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0x80, // 238
+  0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0xC0, // 239
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1D,0x1C,0x00,0xA0,0x0F,0x38,0x00,0xA0,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0F,0x38,0x00,0x20,0x1F,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xE0,0x07, // 240
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x80,0x06,0x00,0x00,0xE0,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x20,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 241
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x20,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 242
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x20,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 243
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x80,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0x80,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 244
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0xC0,0x1C,0x1C,0x00,0xE0,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xE0,0x1C,0x1C,0x00,0x60,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 245
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 246
+  0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0xB6,0x01,0x00,0x00,0xB6,0x01,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 247
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x67,0x00,0x00,0xF8,0x7F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x3F,0x00,0x00,0x86,0x33,0x00,0x00,0xE6,0x31,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xFF,0x0F,0x00,0x00,0xF3,0x07, // 248
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x20,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 249
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x18,0x00,0x20,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 250
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x80,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0x80,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 251
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0xC0,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 252
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x80,0x00,0xFE,0x03,0xE0,0x00,0xFC,0x00,0x60,0xC0,0x1F,0x00,0x20,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06, // 253
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x00,0x1C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x03, // 254
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0xC0,0xF0,0x01,0x06,0xC0,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0xC0,0xC0,0x1F,0x00,0xC0,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06 // 255
+};
+
+char utf8win1250(const uint8_t ch);
+
+const char utf8_win1250_table[] = {
+  0x7A,              // length of table
+
+  // format: 0xaa, 0xbb, 0xcc
+  // 0xaabb (unicode)
+  // 0xcc (win1250)
+  // sorted by unicode to search with bsearch
+  0x00, 0xA0, 0xA0,  // 0xA0 = NO-BREAK SPACE
+  0x00, 0xA4, 0xA4,  // 0xA4 = CURRENCY SIGN
+  0x00, 0xA6, 0xA6,  // 0xA6 = BROKEN BAR
+  0x00, 0xA7, 0xA7,  // 0xA7 = SECTION SIGN
+  0x00, 0xA8, 0xA8,  // 0xA8 = DIAERESIS
+  0x00, 0xA9, 0xA9,  // 0xA9 = COPYRIGHT SIGN
+  0x00, 0xAB, 0xAB,  // 0xAB = LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+  0x00, 0xAC, 0xAC,  // 0xAC = NOT SIGN
+  0x00, 0xAD, 0xAD,  // 0xAD = SOFT HYPHEN
+  0x00, 0xAE, 0xAE,  // 0xAE = REGISTERED SIGN
+  0x00, 0xB0, 0xB0,  // 0xB0 = DEGREE SIGN
+  0x00, 0xB1, 0xB1,  // 0xB1 = PLUS-MINUS SIGN
+  0x00, 0xB4, 0xB4,  // 0xB4 = ACUTE ACCENT
+  0x00, 0xB5, 0xB5,  // 0xB5 = MICRO SIGN
+  0x00, 0xB6, 0xB6,  // 0xB6 = PILCROW SIGN
+  0x00, 0xB7, 0xB7,  // 0xB7 = MIDDLE DOT
+  0x00, 0xB8, 0xB8,  // 0xB8 = CEDILLA
+  0x00, 0xBB, 0xBB,  // 0xBB = RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+  0x00, 0xC1, 0xC1,  // 0xC1 = LATIN CAPITAL LETTER A WITH ACUTE
+  0x00, 0xC2, 0xC2,  // 0xC2 = LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+  0x00, 0xC4, 0xC4,  // 0xC4 = LATIN CAPITAL LETTER A WITH DIAERESIS
+  0x00, 0xC7, 0xC7,  // 0xC7 = LATIN CAPITAL LETTER C WITH CEDILLA
+  0x00, 0xC9, 0xC9,  // 0xC9 = LATIN CAPITAL LETTER E WITH ACUTE
+  0x00, 0xCB, 0xCB,  // 0xCB = LATIN CAPITAL LETTER E WITH DIAERESIS
+  0x00, 0xCD, 0xCD,  // 0xCD = LATIN CAPITAL LETTER I WITH ACUTE
+  0x00, 0xCE, 0xCE,  // 0xCE = LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+  0x00, 0xD3, 0xD3,  // 0xD3 = LATIN CAPITAL LETTER O WITH ACUTE
+  0x00, 0xD4, 0xD4,  // 0xD4 = LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+  0x00, 0xD6, 0xD6,  // 0xD6 = LATIN CAPITAL LETTER O WITH DIAERESIS
+  0x00, 0xD7, 0xD7,  // 0xD7 = MULTIPLICATION SIGN
+  0x00, 0xDA, 0xDA,  // 0xDA = LATIN CAPITAL LETTER U WITH ACUTE
+  0x00, 0xDC, 0xDC,  // 0xDC = LATIN CAPITAL LETTER U WITH DIAERESIS
+  0x00, 0xDD, 0xDD,  // 0xDD = LATIN CAPITAL LETTER Y WITH ACUTE
+  0x00, 0xDF, 0xDF,  // 0xDF = LATIN SMALL LETTER SHARP S
+  0x00, 0xE1, 0xE1,  // 0xE1 = LATIN SMALL LETTER A WITH ACUTE
+  0x00, 0xE2, 0xE2,  // 0xE2 = LATIN SMALL LETTER A WITH CIRCUMFLEX
+  0x00, 0xE4, 0xE4,  // 0xE4 = LATIN SMALL LETTER A WITH DIAERESIS
+  0x00, 0xE7, 0xE7,  // 0xE7 = LATIN SMALL LETTER C WITH CEDILLA
+  0x00, 0xE9, 0xE9,  // 0xE9 = LATIN SMALL LETTER E WITH ACUTE
+  0x00, 0xEB, 0xEB,  // 0xEB = LATIN SMALL LETTER E WITH DIAERESIS
+  0x00, 0xED, 0xED,  // 0xED = LATIN SMALL LETTER I WITH ACUTE
+  0x00, 0xEE, 0xEE,  // 0xEE = LATIN SMALL LETTER I WITH CIRCUMFLEX
+  0x00, 0xF3, 0xF3,  // 0xF3 = LATIN SMALL LETTER O WITH ACUTE
+  0x00, 0xF4, 0xF4,  // 0xF4 = LATIN SMALL LETTER O WITH CIRCUMFLEX
+  0x00, 0xF6, 0xF6,  // 0xF6 = LATIN SMALL LETTER O WITH DIAERESIS
+  0x00, 0xF7, 0xF7,  // 0xF7 = DIVISION SIGN
+  0x00, 0xFA, 0xFA,  // 0xFA = LATIN SMALL LETTER U WITH ACUTE
+  0x00, 0xFC, 0xFC,  // 0xFC = LATIN SMALL LETTER U WITH DIAERESIS
+  0x00, 0xFD, 0xFD,  // 0xFD = LATIN SMALL LETTER Y WITH ACUTE
+  0x01, 0x02, 0xC3,  // 0xC3 = LATIN CAPITAL LETTER A WITH BREVE
+  0x01, 0x03, 0xE3,  // 0xE3 = LATIN SMALL LETTER A WITH BREVE
+  0x01, 0x04, 0xA5,  // 0xA5 = LATIN CAPITAL LETTER A WITH OGONEK
+  0x01, 0x05, 0xB9,  // 0xB9 = LATIN SMALL LETTER A WITH OGONEK
+  0x01, 0x06, 0xC6,  // 0xC6 = LATIN CAPITAL LETTER C WITH ACUTE
+  0x01, 0x07, 0xE6,  // 0xE6 = LATIN SMALL LETTER C WITH ACUTE
+  0x01, 0x0C, 0xC8,  // 0xC8 = LATIN CAPITAL LETTER C WITH CARON
+  0x01, 0x0D, 0xE8,  // 0xE8 = LATIN SMALL LETTER C WITH CARON
+  0x01, 0x0E, 0xCF,  // 0xCF = LATIN CAPITAL LETTER D WITH CARON
+  0x01, 0x0F, 0xEF,  // 0xEF = LATIN SMALL LETTER D WITH CARON
+  0x01, 0x10, 0xD0,  // 0xD0 = LATIN CAPITAL LETTER D WITH STROKE
+  0x01, 0x11, 0xF0,  // 0xF0 = LATIN SMALL LETTER D WITH STROKE
+  0x01, 0x18, 0xCA,  // 0xCA = LATIN CAPITAL LETTER E WITH OGONEK
+  0x01, 0x19, 0xEA,  // 0xEA = LATIN SMALL LETTER E WITH OGONEK
+  0x01, 0x1A, 0xCC,  // 0xCC = LATIN CAPITAL LETTER E WITH CARON
+  0x01, 0x1B, 0xEC,  // 0xEC = LATIN SMALL LETTER E WITH CARON
+  0x01, 0x39, 0xC5,  // 0xC5 = LATIN CAPITAL LETTER L WITH ACUTE
+  0x01, 0x3A, 0xE5,  // 0xE5 = LATIN SMALL LETTER L WITH ACUTE
+  0x01, 0x3D, 0xBC,  // 0xBC = LATIN CAPITAL LETTER L WITH CARON
+  0x01, 0x3E, 0xBE,  // 0xBE = LATIN SMALL LETTER L WITH CARON
+  0x01, 0x41, 0xA3,  // 0xA3 = LATIN CAPITAL LETTER L WITH STROKE
+  0x01, 0x42, 0xB3,  // 0xB3 = LATIN SMALL LETTER L WITH STROKE
+  0x01, 0x43, 0xD1,  // 0xD1 = LATIN CAPITAL LETTER N WITH ACUTE
+  0x01, 0x44, 0xF1,  // 0xF1 = LATIN SMALL LETTER N WITH ACUTE
+  0x01, 0x47, 0xD2,  // 0xD2 = LATIN CAPITAL LETTER N WITH CARON
+  0x01, 0x48, 0xF2,  // 0xF2 = LATIN SMALL LETTER N WITH CARON
+  0x01, 0x50, 0xD5,  // 0xD5 = LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+  0x01, 0x51, 0xF5,  // 0xF5 = LATIN SMALL LETTER O WITH DOUBLE ACUTE
+  0x01, 0x54, 0xC0,  // 0xC0 = LATIN CAPITAL LETTER R WITH ACUTE
+  0x01, 0x55, 0xE0,  // 0xE0 = LATIN SMALL LETTER R WITH ACUTE
+  0x01, 0x58, 0xD8,  // 0xD8 = LATIN CAPITAL LETTER R WITH CARON
+  0x01, 0x59, 0xF8,  // 0xF8 = LATIN SMALL LETTER R WITH CARON
+  0x01, 0x5A, 0x8C,  // 0x8C = LATIN CAPITAL LETTER S WITH ACUTE
+  0x01, 0x5B, 0x9C,  // 0x9C = LATIN SMALL LETTER S WITH ACUTE
+  0x01, 0x5E, 0xAA,  // 0xAA = LATIN CAPITAL LETTER S WITH CEDILLA
+  0x01, 0x5F, 0xBA,  // 0xBA = LATIN SMALL LETTER S WITH CEDILLA
+  0x01, 0x60, 0x8A,  // 0x8A = LATIN CAPITAL LETTER S WITH CARON
+  0x01, 0x61, 0x9A,  // 0x9A = LATIN SMALL LETTER S WITH CARON
+  0x01, 0x62, 0xDE,  // 0xDE = LATIN CAPITAL LETTER T WITH CEDILLA
+  0x01, 0x63, 0xFE,  // 0xFE = LATIN SMALL LETTER T WITH CEDILLA
+  0x01, 0x64, 0x8D,  // 0x8D = LATIN CAPITAL LETTER T WITH CARON
+  0x01, 0x65, 0x9D,  // 0x9D = LATIN SMALL LETTER T WITH CARON
+  0x01, 0x6E, 0xD9,  // 0xD9 = LATIN CAPITAL LETTER U WITH RING ABOVE
+  0x01, 0x6F, 0xF9,  // 0xF9 = LATIN SMALL LETTER U WITH RING ABOVE
+  0x01, 0x70, 0xDB,  // 0xDB = LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+  0x01, 0x71, 0xFB,  // 0xFB = LATIN SMALL LETTER U WITH DOUBLE ACUTE
+  0x01, 0x79, 0x8F,  // 0x8F = LATIN CAPITAL LETTER Z WITH ACUTE
+  0x01, 0x7A, 0x9F,  // 0x9F = LATIN SMALL LETTER Z WITH ACUTE
+  0x01, 0x7B, 0xAF,  // 0xAF = LATIN CAPITAL LETTER Z WITH DOT ABOVE
+  0x01, 0x7C, 0xBF,  // 0xBF = LATIN SMALL LETTER Z WITH DOT ABOVE
+  0x01, 0x7D, 0x8E,  // 0x8E = LATIN CAPITAL LETTER Z WITH CARON
+  0x01, 0x7E, 0x9E,  // 0x9E = LATIN SMALL LETTER Z WITH CARON
+  0x02, 0xC7, 0xA1,  // 0xA1 = CARON
+  0x02, 0xD8, 0xA2,  // 0xA2 = BREVE
+  0x02, 0xD9, 0xFF,  // 0xFF = DOT ABOVE
+  0x02, 0xDB, 0xB2,  // 0xB2 = OGONEK
+  0x02, 0xDD, 0xBD,  // 0xBD = DOUBLE ACUTE ACCENT
+  0x20, 0x13, 0x96,  // 0x96 = EN DASH
+  0x20, 0x14, 0x97,  // 0x97 = EM DASH
+  0x20, 0x18, 0x91,  // 0x91 = LEFT SINGLE QUOTATION MARK
+  0x20, 0x19, 0x92,  // 0x92 = RIGHT SINGLE QUOTATION MARK
+  0x20, 0x1A, 0x82,  // 0x82 = SINGLE LOW-9 QUOTATION MARK
+  0x20, 0x1C, 0x93,  // 0x93 = LEFT DOUBLE QUOTATION MARK
+  0x20, 0x1D, 0x94,  // 0x94 = RIGHT DOUBLE QUOTATION MARK
+  0x20, 0x1E, 0x84,  // 0x84 = DOUBLE LOW-9 QUOTATION MARK
+  0x20, 0x20, 0x86,  // 0x86 = DAGGER
+  0x20, 0x21, 0x87,  // 0x87 = DOUBLE DAGGER
+  0x20, 0x22, 0x95,  // 0x95 = BULLET
+  0x20, 0x26, 0x85,  // 0x85 = HORIZONTAL ELLIPSIS
+  0x20, 0x30, 0x89,  // 0x89 = PER MILLE SIGN
+  0x20, 0x39, 0x8B,  // 0x8B = SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+  0x20, 0x3A, 0x9B,  // 0x9B = SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+  0x20, 0xAC, 0x80,  // 0x80 = EURO SIGN
+  0x21, 0x22, 0x99   // 0x99 = TRADE MARK SIGN
+};
 #endif
-#endif  // SuplaOled_H
\ No newline at end of file
+
+#endif  // SuplaOled_H

From 89375a80522b7e3b0d4c64833b1159d415d8b37c Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 22 Feb 2021 09:36:55 +0100
Subject: [PATCH 106/165] metody setLevel, setMemory, setAction, setEvent

---
 src/SuplaConfigESP.cpp     | 73 +++++++++++++++++++++-----------------
 src/SuplaConfigESP.h       |  8 ++++-
 src/SuplaTemplateBoard.cpp | 11 +++---
 3 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index d6e0c54f..a31fc51d 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -17,7 +17,6 @@
 #include <ESP8266WiFi.h>
 
 #include "SuplaConfigESP.h"
-#include "SuplaConfigManager.h"
 #include "SuplaDeviceGUI.h"
 #include "GUIGenericCommon.h"
 #include "SuplaWebPageSensor.h"
@@ -422,46 +421,54 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
   }
 }
 
-void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function, int level, int memory, int action, int event) {
-  uint8_t _key, _level, _memory, _action, _event;
-  _key = KEY_GPIO + gpio;
+void SuplaConfigESP::setLevel(uint8_t gpio, int level, uint8_t function) {
+  uint8_t key = KEY_GPIO + gpio;
 
-  if (function == FUNCTION_CFG_BUTTON) {
-    ConfigManager->setElement(_key, CFG, 1);
-    return;
+  if (function == FUNCTION_BUTTON) {
+    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+  }
+  else {
+    ConfigManager->setElement(key, LEVEL_RELAY, level);
   }
+}
+void SuplaConfigESP::setMemory(uint8_t gpio, int memory) {
+  uint8_t key = KEY_GPIO + gpio;
 
-  ConfigManager->setElement(_key, NR, nr);
-  ConfigManager->setElement(_key, FUNCTION, function);
+  ConfigManager->setElement(key, MEMORY, memory);
+}
 
-  if (level == -1)
-    _level = ConfigESP->getLevel(nr, function);
-  else
-    _level = level;
-  if (memory == -1)
-    _memory = ConfigESP->getMemory(nr, function);
-  else
-    _memory = memory;
+void SuplaConfigESP::setAction(uint8_t gpio, int action) {
+  uint8_t key = KEY_GPIO + gpio;
 
-  if (action == -1)
-    _action = ConfigESP->getAction(nr, function);
-  else
-    _action = action;
+  ConfigManager->setElement(key, ACTION_BUTTON, action);
+}
+void SuplaConfigESP::setEvent(uint8_t gpio, int event) {
+  uint8_t key = KEY_GPIO + gpio;
 
-  if (event == -1)
-    _event = ConfigESP->getEvent(nr, function);
-  else
-    _event = event;
+  ConfigManager->setElement(key, EVENT_BUTTON, event);
+}
 
-  if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(_key, LEVEL_BUTTON, _level);
-    ConfigManager->setElement(_key, ACTION_BUTTON, _action);
-    ConfigManager->setElement(_key, EVENT_BUTTON, _event);
-  }
-  if (function == FUNCTION_RELAY) {
-    ConfigManager->setElement(_key, LEVEL_RELAY, _level);
-    ConfigManager->setElement(_key, MEMORY, _memory);
+void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function) {
+  uint8_t key, level, memory, action, event;
+  key = KEY_GPIO + gpio;
+
+  if (function == FUNCTION_CFG_BUTTON) {
+    ConfigManager->setElement(key, CFG, 1);
+    return;
   }
+
+  ConfigManager->setElement(key, NR, nr);
+  ConfigManager->setElement(key, FUNCTION, function);
+
+  level = ConfigESP->getLevel(nr, function);
+  memory = ConfigESP->getMemory(nr, function);
+  action = ConfigESP->getAction(nr, function);
+  event = ConfigESP->getEvent(nr, function);
+
+  setLevel(gpio, level, function);
+  setMemory(gpio, memory);
+  setAction(gpio, action);
+  setEvent(gpio, event);
 }
 
 void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 9e67ddc5..d43468a4 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -21,6 +21,7 @@
 #include <supla/triggerable.h>
 #include <supla/element.h>
 #include "GUI-Generic_Config.h"
+#include "SuplaConfigManager.h"
 
 #include <cont.h>
 #include <user_interface.h>
@@ -84,7 +85,12 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
   int checkBusyGpio(int gpio, int function);
   uint8_t countFreeGpio(uint8_t exception = 0);
 
-  void setGpio(uint8_t gpio, uint8_t nr, uint8_t function, int level = -1, int memory = -1, int action = -1, int event = -1);
+  void setLevel(uint8_t gpio, int level, uint8_t function = FUNCTION_RELAY);
+  void setMemory(uint8_t gpio, int memory);
+  void setAction(uint8_t gpio, int action);
+  void setEvent(uint8_t gpio, int event);
+
+  void setGpio(uint8_t gpio, uint8_t nr, uint8_t function);
   void setGpio(uint8_t gpio, uint8_t function) {
     setGpio(gpio, 1, function);
   }
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 7ce53ae6..e5f67dac 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -5,14 +5,17 @@
 void addButton(uint8_t gpio, uint8_t event) {
   uint8_t nr = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   nr++;
-  ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON, -1, -1, -1, event);
+  ConfigESP->setEvent(gpio, event);
+  ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON);
   ConfigManager->set(KEY_MAX_BUTTON, nr++);
 }
 
 void addRelay(uint8_t gpio, uint8_t level) {
   uint8_t nr = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   nr++;
-  ConfigESP->setGpio(gpio, nr, FUNCTION_RELAY, level, MEMORY_RELAY_RESTORE);
+  ConfigESP->setLevel(gpio, level, FUNCTION_RELAY);
+  ConfigESP->setMemory(gpio, MEMORY_RELAY_RESTORE);
+  ConfigESP->setGpio(gpio, nr, FUNCTION_RELAY);
   ConfigManager->set(KEY_MAX_RELAY, nr++);
 }
 
@@ -20,12 +23,12 @@ void addLimitSwitch(uint8_t gpio) {
   uint8_t nr = ConfigManager->get(KEY_MAX_LIMIT_SWITCH)->getValueInt();
   nr++;
   ConfigESP->setGpio(gpio, nr, FUNCTION_LIMIT_SWITCH);
-  ConfigESP->setGpio(4, 1, FUNCTION_LIMIT_SWITCH);
   ConfigManager->set(KEY_MAX_LIMIT_SWITCH, nr++);
 }
 
 void addLedCFG(uint8_t gpio, uint8_t level) {
-  ConfigESP->setGpio(gpio, FUNCTION_CFG_LED, level);
+  ConfigESP->setLevel(gpio, level);
+  ConfigESP->setGpio(gpio, FUNCTION_CFG_LED);
 }
 
 void addLed(uint8_t gpio) {

From 2df97bdf64487b51cc4e3591132321598f49b450 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 22 Feb 2021 09:37:30 +0100
Subject: [PATCH 107/165] =?UTF-8?q?HJ101=20zapami=C4=99tywanie=20stanu=20l?=
 =?UTF-8?q?icznika?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/SuplaDevice/src/supla/sensor/HJ101.cpp | 20 ++++++++++++++++++--
 platformio.ini                             | 18 +++++++++---------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
index 80253563..1bfd3181 100644
--- a/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
+++ b/lib/SuplaDevice/src/supla/sensor/HJ101.cpp
@@ -26,8 +26,18 @@ void HJ101::onInit() {
 }
 
 void HJ101::readValuesFromDevice() {
-  energy = _energy +
-           (hj101->getEnergy() / 36);  // current energy value = value at start
+  for (auto element = Supla::Element::begin(); element != nullptr;
+       element = element->next()) {
+    if (element->getChannel()) {
+      auto channel = element->getChannel();
+      if (channel->getChannelType() == SUPLA_CHANNELTYPE_RELAY) {
+        if (channel->getValueBool()) {
+          energy = _energy + (hj101->getEnergy() /
+                              36);  // current energy value = value at start
+        }
+      }
+    }
+  }
 
   unsigned int _reactive = 0;
   double _pf = 0;
@@ -83,16 +93,22 @@ void HJ101::onLoadState() {
   if (Supla::Storage::ReadState((unsigned char *)&current_multiplier,
                                 sizeof(current_multiplier))) {
     setCurrentMultiplier(current_multiplier);
+  } else {
+    setCurrentMultiplier(18388);
   }
 
   if (Supla::Storage::ReadState((unsigned char *)&voltage_multiplier,
                                 sizeof(voltage_multiplier))) {
     setVoltageMultiplier(voltage_multiplier);
+  } else {
+    setVoltageMultiplier(247704);
   }
 
   if (Supla::Storage::ReadState((unsigned char *)&power_multiplier,
                                 sizeof(power_multiplier))) {
     setPowerMultiplier(power_multiplier);
+  } else {
+    setPowerMultiplier(2586583);
   }
 }
 
diff --git a/platformio.ini b/platformio.ini
index cc70f785..2538272e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,10 +10,10 @@
 
 [platformio]
 default_envs = 
-                 GUI_Generic_1M
-;                 GUI_Generic_1M-en  
-                 GUI_Generic_2M 
-;                 GUI_Generic_4M
+                 GUI_Generic_1MB
+;                 GUI_Generic_1MB-en  
+                 GUI_Generic_2MB 
+;                 GUI_Generic_4MB
 ;                 GUI_Generic_minimal
 ;                 GUI_Generic_lite
 ;                 GUI_Generic_sensors
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.2"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.3"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
@@ -72,23 +72,23 @@ lib_deps =
     xoseperez/HLW8012 @ ^1.1.1
 extra_scripts = tools/copy_files.py       
 
-[env:GUI_Generic_1M]
+[env:GUI_Generic_1MB]
 board = esp8285
 board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}   
 
-[env:GUI_Generic_1M-en]
+[env:GUI_Generic_1MB-en]
 board = esp8285
 board_build.ldscript = eagle.flash.1m64.ld
 build_flags =   ${common.build_flags}
 				-D UI_LANGUAGE=en     				 
 
-[env:GUI_Generic_2M]
+[env:GUI_Generic_2MB]
 board = esp8285
 board_build.ldscript = eagle.flash.2m64.ld
 build_flags =   ${common.build_flags}   
 
-[env:GUI_Generic_4M]
+[env:GUI_Generic_4MB]
 board = esp12e
 board_build.ldscript = eagle.flash.4m1m.ld
 build_flags =   ${common.build_flags}

From 4159c820353889dfb2c3d679277feb7337cf9dc1 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 22 Feb 2021 09:57:35 +0100
Subject: [PATCH 108/165] =?UTF-8?q?wyrzucenie=20DS=20ze=20strony=20g=C5=82?=
 =?UTF-8?q?=C3=B3wnej?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebServer.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 1eba6672..848cbb19 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -170,10 +170,6 @@ void SuplaWebServer::supla_webpage_start(int save) {
   }
 #endif
 
-#ifdef SUPLA_DS18B20
-  WebPageSensor->showDS18B20(true);
-#endif
-
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
 

From 73acaef6b56576eacec382959a39505e392654e0 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 22 Feb 2021 13:32:28 +0100
Subject: [PATCH 109/165] Update SuplaOled.cpp

---
 src/SuplaOled.cpp | 66 ++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/SuplaOled.cpp b/src/SuplaOled.cpp
index 5351b222..6f885367 100644
--- a/src/SuplaOled.cpp
+++ b/src/SuplaOled.cpp
@@ -403,18 +403,18 @@ void SuplaOled::addButtonOled(int pin) {
   if (pin != OFF_GPIO) {
     Supla::Control::Button* button = new Supla::Control::Button(pin, true, true);
 
-    if (ConfigManager->get(KEY_OLED_BACK_LIGHT_TIME)->getValueInt() != 0) {
-      button->addAction(TURN_ON_OLED, this, Supla::ON_PRESS);
-    }
-
     if (ConfigManager->get(KEY_OLED_ANIMATION)->getValueInt() == OLED_CONTROLL_MANUAL && frameCount > 1) {
       button->addAction(NEXT_FRAME, this, Supla::ON_PRESS);
     }
+
+    if (ConfigManager->get(KEY_OLED_BACK_LIGHT_TIME)->getValueInt() != 0) {
+      button->addAction(TURN_ON_OLED, this, Supla::ON_PRESS);
+    }
   }
 }
 
 void SuplaOled::handleAction(int event, int action) {
-  if (action == NEXT_FRAME) {
+  if (action == NEXT_FRAME && oledON == true) {
     ui->nextFrame();
   }
 
@@ -427,9 +427,9 @@ void SuplaOled::handleAction(int event, int action) {
 
 // In ESP8266 Arduino core v2.3.0 missing bsearch: https://github.com/esp8266/Arduino/issues/2314
 // Part of GNU C Library
-void * gnu_c_bsearch (const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *)) {
+void* gnu_c_bsearch(const void* key, const void* base, size_t nmemb, size_t size, int (*compar)(const void*, const void*)) {
   size_t l, u, idx;
-  const void *p;
+  const void* p;
   int comparison;
 
   l = 0;
@@ -437,14 +437,14 @@ void * gnu_c_bsearch (const void *key, const void *base, size_t nmemb, size_t si
   while (l < u) {
     idx = (l + u) / 2;
 
-    p = (void *) (((const char *) base) + (idx * size));
-    comparison = (*compar) (key, p);
+    p = (void*)(((const char*)base) + (idx * size));
+    comparison = (*compar)(key, p);
     if (comparison < 0)
       u = idx;
     else if (comparison > 0)
       l = idx + 1;
     else
-      return (void *) p;
+      return (void*)p;
   }
 
   return NULL;
@@ -452,12 +452,15 @@ void * gnu_c_bsearch (const void *key, const void *base, size_t nmemb, size_t si
 
 // compare function for bsearch
 int charset_table_cmp(const void* p_key, const void* p_item) {
-  const uint16_t key = *(uint16_t *) p_key;
-  const uint16_t item = (*((char *) p_item)) << 8 | *(((char *) p_item) + 1);
+  const uint16_t key = *(uint16_t*)p_key;
+  const uint16_t item = (*((char*)p_item)) << 8 | *(((char*)p_item) + 1);
 
-  if (key < item) return -1;
-  else if (key == item) return 0;
-  else return 1;
+  if (key < item)
+    return -1;
+  else if (key == item)
+    return 0;
+  else
+    return 1;
 }
 
 // convert utf-8 character to windows-1250
@@ -466,34 +469,43 @@ int charset_table_cmp(const void* p_key, const void* p_item) {
 char utf8win1250(const uint8_t ch) {
   static uint16_t uChar;
   static uint8_t len;
-  char *found;
+  char* found;
 
   if ((ch & 0x80) == 0x00) {
     uChar = len = 0;
     return ch;
-  } else if ((ch & 0xE0) == 0xC0) {
-    uChar = ch & 0x1F; len = 1;
+  }
+  else if ((ch & 0xE0) == 0xC0) {
+    uChar = ch & 0x1F;
+    len = 1;
     return 0;
-  } else if ((ch & 0xF0) == 0xE0) {
-    uChar = ch & 0x0F; len = 2;
+  }
+  else if ((ch & 0xF0) == 0xE0) {
+    uChar = ch & 0x0F;
+    len = 2;
     return 0;
-  } else if ((ch & 0xF8) == 0xF0) {
-    uChar = ch & 0x07; len = 3;
+  }
+  else if ((ch & 0xF8) == 0xF0) {
+    uChar = ch & 0x07;
+    len = 3;
     return 0;
-  } else if ((ch & 0xC0) == 0x80 && len > 0) {
-    uChar = (uChar << 6) | (ch & 0x7F); len--;
+  }
+  else if ((ch & 0xC0) == 0x80 && len > 0) {
+    uChar = (uChar << 6) | (ch & 0x7F);
+    len--;
     if (len > 0)
       return 0;
-  } else {
+  }
+  else {
     uChar = len = 0;
     return 0;
   }
 
-  found = (char*) gnu_c_bsearch(&uChar, utf8_win1250_table + 1, utf8_win1250_table[0], 3 * sizeof(char), charset_table_cmp);
+  found = (char*)gnu_c_bsearch(&uChar, utf8_win1250_table + 1, utf8_win1250_table[0], 3 * sizeof(char), charset_table_cmp);
 
   if (found != NULL) {
     uChar = len = 0;
-    return *(found + 2); // return win1250 char at 3rd position;
+    return *(found + 2);  // return win1250 char at 3rd position;
   }
 
   return 0;

From 24554463b889a05252baa6e4bddfc3bec1d6ac48 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 23 Feb 2021 08:24:37 +0100
Subject: [PATCH 110/165] =?UTF-8?q?domy=C5=9Blne=20warto=C5=9Bci=20dla=20s?=
 =?UTF-8?q?zablon=C3=B3w=20p=C5=82ytek?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaTemplateBoard.cpp | 3 ++-
 src/SuplaTemplateBoard.h   | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index e5f67dac..2f18f4a6 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -1,10 +1,11 @@
 #include "SuplaTemplateBoard.h"
 #include "SuplaWebPageRelay.h"
-#include <supla/events.h>
 
 void addButton(uint8_t gpio, uint8_t event) {
   uint8_t nr = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   nr++;
+  ConfigESP->setLevel(gpio, HIGH, FUNCTION_BUTTON);
+  ConfigESP->setAction(gpio, Supla::Action::TOGGLE);
   ConfigESP->setEvent(gpio, event);
   ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON);
   ConfigManager->set(KEY_MAX_BUTTON, nr++);
diff --git a/src/SuplaTemplateBoard.h b/src/SuplaTemplateBoard.h
index 99b1bd4f..80179fca 100644
--- a/src/SuplaTemplateBoard.h
+++ b/src/SuplaTemplateBoard.h
@@ -4,8 +4,9 @@
 #include <pgmspace.h>
 #include "SuplaWebPageRelay.h"
 #include "GUIGenericCommon.h"
+#include <supla/events.h>
 
-void addButton(uint8_t gpio, uint8_t event = 0);
+void addButton(uint8_t gpio, uint8_t event = Supla::Event::ON_RELEASE);
 void addRelay(uint8_t gpio, uint8_t level = HIGH);
 void addLimitSwitch(uint8_t gpio);
 void addLedCFG(uint8_t gpio, uint8_t level = HIGH);
@@ -66,8 +67,9 @@ const char H801[] PROGMEM = "H801 RGBW";
 const char SONOFF_MINI[] PROGMEM = "SONOFF Mini";
 
 const char* const BOARD_P[MAX_MODULE] PROGMEM = {
-    BOARD_NULL, ELECTRODRAGON, INCAN3,    INCAN4,       MELINK,           NEO_COOLCAM,      SHELLY1,    SHELLY2, SONOFF_BASIC,  SONOFF_DUAL_R2,
-    SONOFF_S2X, SONOFF_SV,     SONOFF_TH, SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH, SONOFF_4CH, YUNSHAN, YUNTONG_SMART, GOSUNG_SP111, DRIMMER_LUKASZH, H801};
+    BOARD_NULL,   ELECTRODRAGON,  INCAN3,        INCAN4,       MELINK,          NEO_COOLCAM,  SHELLY1,          SHELLY2,
+    SONOFF_BASIC, SONOFF_DUAL_R2, SONOFF_S2X,    SONOFF_SV,    SONOFF_TH,       SONOFF_TOUCH, SONOFF_TOUCH_2CH, SONOFF_TOUCH_3CH,
+    SONOFF_4CH,   YUNSHAN,        YUNTONG_SMART, GOSUNG_SP111, DRIMMER_LUKASZH, H801};
 
 void chooseTemplateBoard(uint8_t board);
 

From f15f0c65a5545d42962c78cbf63ad1461bdc0c09 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Tue, 23 Feb 2021 20:15:16 +0100
Subject: [PATCH 111/165] Update platformio.ini

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 2538272e..d959f7cc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.3"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.4"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC

From 038a926c1c88f61997e36fec2c6d4d7c0c150918 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 24 Feb 2021 13:38:45 +0100
Subject: [PATCH 112/165] pullup dla przycisku

---
 src/Markup.cpp              | 14 ++++++++++++
 src/Markup.h                |  2 ++
 src/SuplaCommonPROGMEM.h    |  3 ++-
 src/SuplaConfigESP.cpp      | 43 ++++++++++++++++++++++++++-----------
 src/SuplaConfigESP.h        |  2 ++
 src/SuplaConfigManager.h    |  2 +-
 src/SuplaDeviceGUI.cpp      |  2 +-
 src/SuplaTemplateBoard.cpp  | 14 ++++++------
 src/SuplaWebPageControl.cpp | 27 +++++++++++++----------
 9 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index 49c1215a..f339a0ed 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -100,6 +100,20 @@ void addTextBoxPassword(String& html, const String& input_id, const String& name
   return addTextBox(html, input_id, name, value_key, "", minlength, maxlength, required, false, true);
 }
 
+void addCheckBox(String& html, const String& input_id, const String& name, bool checked) {
+  html += F("<i><label>");
+  html += name;
+  html += F("</label><input type='checkbox' name='");
+  html += input_id;
+  if (checked) {
+    html += F("' checked>");
+  }
+  else {
+    html += F("'>");
+  }
+  html += F("</i>");
+}
+
 void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max) {
   html += F("<i><label>");
   html += name;
diff --git a/src/Markup.h b/src/Markup.h
index 98336e98..4d28c73a 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -45,6 +45,8 @@ void addTextBox(String& html,
 
 void addTextBoxPassword(String& html, const String& input_id, const String& name, uint8_t value_key, int minlength, int maxlength, bool required);
 
+void addCheckBox(String& html, const String& input_id, const String& name, bool checked);
+
 void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
 
 void addNumberBox(String& html, const String& input_id, const String& name, const String& placeholder, bool required, const String& value = "\n");
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index eb9bccbc..50a2b1df 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -32,7 +32,8 @@ const char HTTP_STYLE[] PROGMEM =
     "12px;color:#00d151;font-size:13px;position:relative;line-height:18px}i 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}}iframe{margin:auto;display:block;}.formcenter{color:#000;width:50%;margin: 25px auto 25px "
-    "auto;}</style> ";
+    "auto;} input[type='checkbox' i]{appearance: auto; margin-top: 10px; height: 20px;} @media (max-width: 900px)input[type='checkbox' i]{width: auto;}</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,"
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index a31fc51d..544274f6 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -296,10 +296,32 @@ int SuplaConfigESP::getLevel(int nr, int function) {
     key = KEY_GPIO + gpio;
     if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
       if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
-        if (function == FUNCTION_BUTTON)
-          return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-        else
+        return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
+      }
+    }
+
+#ifdef SUPLA_MCP23017
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
+      uint8_t address = getAdressMCP23017(nr, function);
+
+      if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
+        if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
           return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
+        }
+      }
+    }
+#endif
+  }
+  return OFF_GPIO;
+}
+
+int SuplaConfigESP::getPullUp(int nr, int function) {
+  uint8_t key;
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    key = KEY_GPIO + gpio;
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
+        return ConfigManager->get(key)->getElement(PULL_UP_BUTTON).toInt();
       }
     }
 
@@ -309,12 +331,7 @@ int SuplaConfigESP::getLevel(int nr, int function) {
 
       if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
         if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
-          if (function == FUNCTION_BUTTON) {
-            return ConfigManager->get(key)->getElement(LEVEL_BUTTON).toInt();
-          }
-          else {
-            return ConfigManager->get(key)->getElement(LEVEL_RELAY).toInt();
-          }
+          return ConfigManager->get(key)->getElement(PULL_UP_BUTTON).toInt();
         }
       }
     }
@@ -425,7 +442,7 @@ void SuplaConfigESP::setLevel(uint8_t gpio, int level, uint8_t function) {
   uint8_t key = KEY_GPIO + gpio;
 
   if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+    ConfigManager->setElement(key, PULL_UP_BUTTON, level);
   }
   else {
     ConfigManager->setElement(key, LEVEL_RELAY, level);
@@ -483,7 +500,7 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
   ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
 
   if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, LEVEL_BUTTON, 1);
+    ConfigManager->setElement(key, PULL_UP_BUTTON, 1);
     ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
     ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
   }
@@ -586,7 +603,7 @@ void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, u
   event = ConfigESP->getEvent(1, function);
 
   if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+    ConfigManager->setElement(key, PULL_UP_BUTTON, level);
     ConfigManager->setElement(key, ACTION_BUTTON, action);
     ConfigManager->setElement(key, EVENT_BUTTON, event);
   }
@@ -606,7 +623,7 @@ void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t functio
     ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
 
   if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, LEVEL_BUTTON, 1);
+    ConfigManager->setElement(key, PULL_UP_BUTTON, 1);
     ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
     ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
   }
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index d43468a4..4504d02a 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -81,6 +81,8 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
   int getLevel(int function) {
     return getLevel(1, function);
   }
+  int getPullUp(int nr, int function);
+  
   bool checkBusyCfg(int gpio);
   int checkBusyGpio(int gpio, int function);
   uint8_t countFreeGpio(uint8_t exception = 0);
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 588236d4..19942ee9 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -101,7 +101,7 @@ enum _settings
   NR,
   FUNCTION,
   LEVEL_RELAY,
-  LEVEL_BUTTON,
+  PULL_UP_BUTTON,
   MEMORY,
   ACTION_BUTTON,
   EVENT_BUTTON,
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 40700f71..566b93f7 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -88,7 +88,7 @@ void addRelayButton(uint8_t nr) {
     relay[size]->getChannel()->setDefault(SUPLA_CHANNELFNC_POWERSWITCH);
 
     if (pinButton != OFF_GPIO) {
-      auto button = new Supla::Control::Button(pinButton, ConfigESP->getLevel(nr, FUNCTION_BUTTON));
+      auto button = new Supla::Control::Button(pinButton, ConfigESP->getPullUp(nr, FUNCTION_BUTTON), true);
 
       button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getEvent(nr, FUNCTION_BUTTON));
       button->setSwNoiseFilterDelay(50);
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 2f18f4a6..62447e0f 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -87,8 +87,8 @@ void chooseTemplateBoard(uint8_t board) {
     case BOARD_INCAN3:
       addLedCFG(2, LOW);
       addButtonCFG(0);
-      addButton(14, Supla::ON_CHANGE);
-      addButton(12, Supla::ON_CHANGE);
+      addButton(14, Supla::Event::ON_CHANGE);
+      addButton(12, Supla::Event::ON_CHANGE);
       addRelay(5);
       addRelay(13);
       addLimitSwitch(4);
@@ -97,8 +97,8 @@ void chooseTemplateBoard(uint8_t board) {
     case BOARD_INCAN4:
       addLedCFG(12);
       addButtonCFG(0);
-      addButton(2, Supla::ON_CHANGE);
-      addButton(10, Supla::ON_CHANGE);
+      addButton(2, Supla::Event::ON_CHANGE);
+      addButton(10, Supla::Event::ON_CHANGE);
       addRelay(4);
       addRelay(14);
       addLimitSwitch(4);
@@ -202,21 +202,21 @@ void chooseTemplateBoard(uint8_t board) {
     case BOARD_YUNSHAN:
       addLedCFG(2, LOW);
       addButtonCFG(0);
-      addButton(3, Supla::ON_CHANGE);
+      addButton(3, Supla::Event::ON_CHANGE);
       addRelay(4);
       break;
 
     case BOARD_YUNTONG_SMART:
       addLedCFG(15);
       addButtonCFG(12);
-      addButton(12, Supla::ON_CHANGE);
+      addButton(12, Supla::Event::ON_CHANGE);
       addRelay(4);
       break;
 
     case BOARD_GOSUND_SP111:
       addLedCFG(2, LOW);
       addButtonCFG(13);
-      addButton(13, Supla::ON_RELEASE);
+      addButton(13);
       addRelay(15);
       addLed(0);
 #ifdef SUPLA_HLW8012
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 73e9d9c8..7e39b889 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -173,13 +173,18 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   gpio = ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
   key = KEY_GPIO + gpio;
 
-  input = INPUT_BUTTON_EVENT;
+  input = INPUT_RELAY_LEVEL;
   input += nr_button;
-  ConfigManager->setElement(key, EVENT_BUTTON, WebServer->httpServer->arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(key, PULL_UP_BUTTON, 1);
+  }
+  else {
+    ConfigManager->setElement(key, PULL_UP_BUTTON, 0);
+  }
 
-  input = INPUT_RELAY_LEVEL;
+  input = INPUT_BUTTON_EVENT;
   input += nr_button;
-  ConfigManager->setElement(key, LEVEL_BUTTON, WebServer->httpServer->arg(input).toInt());
+  ConfigManager->setElement(key, EVENT_BUTTON, WebServer->httpServer->arg(input).toInt());
 
   input = INPUT_BUTTON_ACTION;
   input += nr_button;
@@ -220,8 +225,8 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET + nr_button);
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
-  selected = ConfigESP->getLevel(nr_button.toInt(), FUNCTION_BUTTON);
-  addListBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, S_STATE_CONTROL, LEVEL_P, 2, selected);
+  selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
+  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Pull-UP", selected);
 
   selected = ConfigESP->getEvent(nr_button.toInt(), FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
@@ -337,8 +342,8 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET);
   addFormHeader(webContentBuffer, F("Ustawienia dla przycisków"));
 
-  selected = ConfigESP->getLevel(1, FUNCTION_BUTTON);
-  addListBox(webContentBuffer, INPUT_RELAY_LEVEL, S_STATE_CONTROL, LEVEL_P, 2, selected);
+  selected = ConfigESP->getPullUp(1, FUNCTION_BUTTON);
+  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL, "Pull-UP", selected);
 
   selected = ConfigESP->getEvent(1, FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT, S_REACTION_TO, TRIGGER_P, 3, selected);
@@ -360,7 +365,7 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   }
 
   String input;
-  uint8_t key, gpio, level, event, action, address;
+  uint8_t key, gpio, pullup, event, action, address;
 
   input.reserve(10);
 
@@ -368,14 +373,14 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   event = WebServer->httpServer->arg(input).toInt();
 
   input = INPUT_RELAY_LEVEL;
-  level = WebServer->httpServer->arg(input).toInt();
+  pullup = WebServer->httpServer->arg(input).toInt();
 
   input = INPUT_BUTTON_ACTION;
   action = WebServer->httpServer->arg(input).toInt();
 
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
-    ConfigManager->setElement(key, LEVEL_BUTTON, level);
+    ConfigManager->setElement(key, PULL_UP_BUTTON, pullup);
     ConfigManager->setElement(key, EVENT_BUTTON, event);
     ConfigManager->setElement(key, ACTION_BUTTON, action);
   }

From fd1a8bce42b3dd71584fe0426b5b8df60d7a5273 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 24 Feb 2021 14:05:36 +0100
Subject: [PATCH 113/165] pullup przyciski

---
 src/SuplaConfigESP.cpp     | 31 +++++++++++++------------------
 src/SuplaConfigESP.h       |  6 ++++--
 src/SuplaTemplateBoard.cpp |  4 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index 544274f6..fe8ae437 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -438,15 +438,9 @@ int SuplaConfigESP::checkBusyGpio(int gpio, int function) {
   }
 }
 
-void SuplaConfigESP::setLevel(uint8_t gpio, int level, uint8_t function) {
+void SuplaConfigESP::setLevel(uint8_t gpio, int level) {
   uint8_t key = KEY_GPIO + gpio;
-
-  if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, PULL_UP_BUTTON, level);
-  }
-  else {
-    ConfigManager->setElement(key, LEVEL_RELAY, level);
-  }
+  ConfigManager->setElement(key, LEVEL_RELAY, level);
 }
 void SuplaConfigESP::setMemory(uint8_t gpio, int memory) {
   uint8_t key = KEY_GPIO + gpio;
@@ -454,6 +448,11 @@ void SuplaConfigESP::setMemory(uint8_t gpio, int memory) {
   ConfigManager->setElement(key, MEMORY, memory);
 }
 
+void SuplaConfigESP::setPullUp(uint8_t gpio, int pullup) {
+  uint8_t key = KEY_GPIO + gpio;
+  ConfigManager->setElement(key, PULL_UP_BUTTON, pullup);
+}
+
 void SuplaConfigESP::setAction(uint8_t gpio, int action) {
   uint8_t key = KEY_GPIO + gpio;
 
@@ -466,7 +465,7 @@ void SuplaConfigESP::setEvent(uint8_t gpio, int event) {
 }
 
 void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function) {
-  uint8_t key, level, memory, action, event;
+  uint8_t key;
   key = KEY_GPIO + gpio;
 
   if (function == FUNCTION_CFG_BUTTON) {
@@ -477,15 +476,11 @@ void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function) {
   ConfigManager->setElement(key, NR, nr);
   ConfigManager->setElement(key, FUNCTION, function);
 
-  level = ConfigESP->getLevel(nr, function);
-  memory = ConfigESP->getMemory(nr, function);
-  action = ConfigESP->getAction(nr, function);
-  event = ConfigESP->getEvent(nr, function);
-
-  setLevel(gpio, level, function);
-  setMemory(gpio, memory);
-  setAction(gpio, action);
-  setEvent(gpio, event);
+  setLevel(gpio, ConfigESP->getLevel(nr, function));
+  setMemory(gpio, ConfigESP->getMemory(nr, function));
+  setPullUp(gpio, ConfigESP->getPullUp(nr, function));
+  setAction(gpio, ConfigESP->getAction(nr, function));
+  setEvent(gpio, ConfigESP->getEvent(nr, function));
 }
 
 void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index 4504d02a..cdb3d8c3 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -82,13 +82,15 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
     return getLevel(1, function);
   }
   int getPullUp(int nr, int function);
-  
+
   bool checkBusyCfg(int gpio);
   int checkBusyGpio(int gpio, int function);
   uint8_t countFreeGpio(uint8_t exception = 0);
 
-  void setLevel(uint8_t gpio, int level, uint8_t function = FUNCTION_RELAY);
+  void setLevel(uint8_t gpio, int level);
   void setMemory(uint8_t gpio, int memory);
+
+  void setPullUp(uint8_t gpio, int pullup);
   void setAction(uint8_t gpio, int action);
   void setEvent(uint8_t gpio, int event);
 
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 62447e0f..1510f22d 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -4,7 +4,7 @@
 void addButton(uint8_t gpio, uint8_t event) {
   uint8_t nr = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   nr++;
-  ConfigESP->setLevel(gpio, HIGH, FUNCTION_BUTTON);
+  ConfigESP->setPullUp(gpio, HIGH);
   ConfigESP->setAction(gpio, Supla::Action::TOGGLE);
   ConfigESP->setEvent(gpio, event);
   ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON);
@@ -14,7 +14,7 @@ void addButton(uint8_t gpio, uint8_t event) {
 void addRelay(uint8_t gpio, uint8_t level) {
   uint8_t nr = ConfigManager->get(KEY_MAX_RELAY)->getValueInt();
   nr++;
-  ConfigESP->setLevel(gpio, level, FUNCTION_RELAY);
+  ConfigESP->setLevel(gpio, level);
   ConfigESP->setMemory(gpio, MEMORY_RELAY_RESTORE);
   ConfigESP->setGpio(gpio, nr, FUNCTION_RELAY);
   ConfigManager->set(KEY_MAX_RELAY, nr++);

From ce7ec1a1b25b9b5411129c870d926a6ee71da50d Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Wed, 24 Feb 2021 14:34:36 +0100
Subject: [PATCH 114/165] INVERSED_BUTTON

---
 platformio.ini              |  2 +-
 src/SuplaConfigESP.cpp      | 77 +++++++++++++++++++++++--------------
 src/SuplaConfigESP.h        |  2 +
 src/SuplaConfigManager.cpp  |  2 +-
 src/SuplaConfigManager.h    |  2 +-
 src/SuplaDeviceGUI.cpp      |  2 +-
 src/SuplaTemplateBoard.cpp  |  3 +-
 src/SuplaWebPageControl.cpp | 21 +++++++++-
 src/SuplaWebPageControl.h   |  1 +
 9 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index d959f7cc..07f374c3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.4"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.5"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index fe8ae437..a7ec19b0 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -340,6 +340,29 @@ int SuplaConfigESP::getPullUp(int nr, int function) {
   return OFF_GPIO;
 }
 
+int SuplaConfigESP::getInversed(int nr, int function) {
+  for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
+    uint8_t key = KEY_GPIO + gpio;
+    if (ConfigManager->get(key)->getElement(FUNCTION).toInt() == function) {
+      if (ConfigManager->get(key)->getElement(NR).toInt() == nr) {
+        return ConfigManager->get(key)->getElement(INVERSED_BUTTON).toInt();
+      }
+    }
+
+#ifdef SUPLA_MCP23017
+    if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt()) {
+      uint8_t address = getAdressMCP23017(nr, function);
+      if (ConfigManager->get(key)->getElement(getFunctionMCP23017(address)).toInt() == function) {
+        if (ConfigManager->get(key)->getElement(getNrMCP23017(address)).toInt() == nr) {
+          return ConfigManager->get(key)->getElement(INVERSED_BUTTON).toInt();
+        }
+      }
+    }
+#endif
+  }
+  return OFF_GPIO;
+}
+
 int SuplaConfigESP::getMemory(int nr, int function) {
   for (uint8_t gpio = 0; gpio <= OFF_GPIO; gpio++) {
     uint8_t key = KEY_GPIO + gpio;
@@ -444,7 +467,6 @@ void SuplaConfigESP::setLevel(uint8_t gpio, int level) {
 }
 void SuplaConfigESP::setMemory(uint8_t gpio, int memory) {
   uint8_t key = KEY_GPIO + gpio;
-
   ConfigManager->setElement(key, MEMORY, memory);
 }
 
@@ -453,14 +475,18 @@ void SuplaConfigESP::setPullUp(uint8_t gpio, int pullup) {
   ConfigManager->setElement(key, PULL_UP_BUTTON, pullup);
 }
 
-void SuplaConfigESP::setAction(uint8_t gpio, int action) {
+void SuplaConfigESP::setInversed(uint8_t gpio, int inversed) {
   uint8_t key = KEY_GPIO + gpio;
+  ConfigManager->setElement(key, INVERSED_BUTTON, inversed);
+}
 
+void SuplaConfigESP::setAction(uint8_t gpio, int action) {
+  uint8_t key = KEY_GPIO + gpio;
   ConfigManager->setElement(key, ACTION_BUTTON, action);
 }
+
 void SuplaConfigESP::setEvent(uint8_t gpio, int event) {
   uint8_t key = KEY_GPIO + gpio;
-
   ConfigManager->setElement(key, EVENT_BUTTON, event);
 }
 
@@ -479,6 +505,7 @@ void SuplaConfigESP::setGpio(uint8_t gpio, uint8_t nr, uint8_t function) {
   setLevel(gpio, ConfigESP->getLevel(nr, function));
   setMemory(gpio, ConfigESP->getMemory(nr, function));
   setPullUp(gpio, ConfigESP->getPullUp(nr, function));
+  setInversed(gpio, ConfigESP->getInversed(nr, function));
   setAction(gpio, ConfigESP->getAction(nr, function));
   setEvent(gpio, ConfigESP->getEvent(nr, function));
 }
@@ -495,13 +522,14 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
   ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
 
   if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, PULL_UP_BUTTON, 1);
-    ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
-    ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
+    setPullUp(gpio, true);
+    setInversed(gpio, true);
+    setAction(gpio, Supla::Action::TOGGLE);
+    setEvent(gpio, Supla::Event::ON_CHANGE);
   }
   if (function == FUNCTION_RELAY) {
-    ConfigManager->setElement(key, LEVEL_RELAY, 0);
-    ConfigManager->setElement(key, MEMORY, 2);
+    setLevel(gpio, false);
+    setMemory(gpio, 2);
   }
 }
 
@@ -585,27 +613,19 @@ uint8_t SuplaConfigESP::getAdressMCP23017(uint8_t nr, uint8_t function) {
 }
 
 void SuplaConfigESP::setGpioMCP23017(uint8_t gpio, uint8_t adress, uint8_t nr, uint8_t function) {
-  uint8_t key, level, memory, action, event;
+  uint8_t key;
   key = KEY_GPIO + gpio;
 
   ConfigManager->setElement(key, getNrMCP23017(adress), nr);
   ConfigManager->setElement(key, getFunctionMCP23017(adress), function);
 
   // dla MCP23017 zawsze ustawiać taką samą wartość level, memory, action, event jak dla pierwszego elementu
-  level = ConfigESP->getLevel(1, function);
-  memory = ConfigESP->getMemory(1, function);
-  action = ConfigESP->getAction(1, function);
-  event = ConfigESP->getEvent(1, function);
-
-  if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, PULL_UP_BUTTON, level);
-    ConfigManager->setElement(key, ACTION_BUTTON, action);
-    ConfigManager->setElement(key, EVENT_BUTTON, event);
-  }
-  if (function == FUNCTION_RELAY) {
-    ConfigManager->setElement(key, LEVEL_RELAY, level);
-    ConfigManager->setElement(key, MEMORY, memory);
-  }
+  setLevel(gpio, ConfigESP->getLevel(1, function));
+  setMemory(gpio, ConfigESP->getMemory(1, function));
+  setPullUp(gpio, ConfigESP->getPullUp(1, function));
+  setInversed(gpio, ConfigESP->getInversed(1, function));
+  setAction(gpio, ConfigESP->getAction(1, function));
+  setEvent(gpio, ConfigESP->getEvent(1, function));
 }
 
 void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t function) {
@@ -618,13 +638,14 @@ void SuplaConfigESP::clearGpioMCP23017(uint8_t gpio, uint8_t nr, uint8_t functio
     ConfigManager->setElement(key, getFunctionMCP23017(adress), FUNCTION_OFF);
 
   if (function == FUNCTION_BUTTON) {
-    ConfigManager->setElement(key, PULL_UP_BUTTON, 1);
-    ConfigManager->setElement(key, ACTION_BUTTON, Supla::Action::TOGGLE);
-    ConfigManager->setElement(key, EVENT_BUTTON, Supla::Event::ON_CHANGE);
+    setPullUp(gpio, true);
+    setInversed(gpio, true);
+    setAction(gpio, Supla::Action::TOGGLE);
+    setEvent(gpio, Supla::Event::ON_CHANGE);
   }
   if (function == FUNCTION_RELAY) {
-    ConfigManager->setElement(key, LEVEL_RELAY, 0);
-    ConfigManager->setElement(key, MEMORY, 2);
+    setLevel(gpio, false);
+    setMemory(gpio, 2);
   }
 }
 
diff --git a/src/SuplaConfigESP.h b/src/SuplaConfigESP.h
index cdb3d8c3..9b8ed5ae 100644
--- a/src/SuplaConfigESP.h
+++ b/src/SuplaConfigESP.h
@@ -82,6 +82,7 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
     return getLevel(1, function);
   }
   int getPullUp(int nr, int function);
+  int getInversed(int nr, int function);
 
   bool checkBusyCfg(int gpio);
   int checkBusyGpio(int gpio, int function);
@@ -91,6 +92,7 @@ class SuplaConfigESP : public Supla::ActionHandler, public Supla::Element {
   void setMemory(uint8_t gpio, int memory);
 
   void setPullUp(uint8_t gpio, int pullup);
+  void setInversed(uint8_t gpio, int inversed);
   void setAction(uint8_t gpio, int action);
   void setEvent(uint8_t gpio, int event);
 
diff --git a/src/SuplaConfigManager.cpp b/src/SuplaConfigManager.cpp
index d6500b37..530df1e1 100644
--- a/src/SuplaConfigManager.cpp
+++ b/src/SuplaConfigManager.cpp
@@ -174,7 +174,7 @@ SuplaConfigManager::SuplaConfigManager() {
   uint8_t nr, key;
   for (nr = 0; nr <= MAX_GPIO; nr++) {
     key = KEY_GPIO + nr;
-    this->addKey(key, "", SETTINGSCOUNT * 2);
+    this->addKey(key, "", 16 * 2);
   }
 
   this->addKey(KEY_LEVEL_LED, "0", 1);
diff --git a/src/SuplaConfigManager.h b/src/SuplaConfigManager.h
index 19942ee9..314cb209 100644
--- a/src/SuplaConfigManager.h
+++ b/src/SuplaConfigManager.h
@@ -114,7 +114,7 @@ enum _settings
   MCP23017_FUNCTION_3,
   MCP23017_NR_4,
   MCP23017_FUNCTION_4,
-  SETTINGSCOUNT
+  INVERSED_BUTTON
 };
 
 enum _function
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 566b93f7..4cd686ff 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -88,7 +88,7 @@ void addRelayButton(uint8_t nr) {
     relay[size]->getChannel()->setDefault(SUPLA_CHANNELFNC_POWERSWITCH);
 
     if (pinButton != OFF_GPIO) {
-      auto button = new Supla::Control::Button(pinButton, ConfigESP->getPullUp(nr, FUNCTION_BUTTON), true);
+      auto button = new Supla::Control::Button(pinButton, ConfigESP->getPullUp(nr, FUNCTION_BUTTON), ConfigESP->getInversed(nr, FUNCTION_BUTTON));
 
       button->addAction(ConfigESP->getAction(nr, FUNCTION_BUTTON), *relay[size], ConfigESP->getEvent(nr, FUNCTION_BUTTON));
       button->setSwNoiseFilterDelay(50);
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 1510f22d..65b1e963 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -4,7 +4,8 @@
 void addButton(uint8_t gpio, uint8_t event) {
   uint8_t nr = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   nr++;
-  ConfigESP->setPullUp(gpio, HIGH);
+  ConfigESP->setPullUp(gpio, true);
+  ConfigESP->setInversed(gpio, true);
   ConfigESP->setAction(gpio, Supla::Action::TOGGLE);
   ConfigESP->setEvent(gpio, event);
   ConfigESP->setGpio(gpio, nr, FUNCTION_BUTTON);
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 7e39b889..ecd8976b 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -173,6 +173,15 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   gpio = ConfigESP->getGpio(nr_button.toInt(), FUNCTION_BUTTON);
   key = KEY_GPIO + gpio;
 
+  input = INPUT_BUTTON_INVERSED;
+  input += nr_button;
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(key, INVERSED_BUTTON, 1);
+  }
+  else {
+    ConfigManager->setElement(key, INVERSED_BUTTON, 0);
+  }
+
   input = INPUT_RELAY_LEVEL;
   input += nr_button;
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
@@ -228,6 +237,9 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Pull-UP", selected);
 
+  selected = ConfigESP->getInversed(nr_button.toInt(), FUNCTION_BUTTON);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócony", selected);
+
   selected = ConfigESP->getEvent(nr_button.toInt(), FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
 
@@ -345,6 +357,9 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   selected = ConfigESP->getPullUp(1, FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL, "Pull-UP", selected);
 
+  selected = ConfigESP->getInversed(1, FUNCTION_BUTTON);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED, "Odwrócony", selected);
+
   selected = ConfigESP->getEvent(1, FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT, S_REACTION_TO, TRIGGER_P, 3, selected);
 
@@ -365,7 +380,7 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   }
 
   String input;
-  uint8_t key, gpio, pullup, event, action, address;
+  uint8_t key, gpio, pullup, inversed, event, action, address;
 
   input.reserve(10);
 
@@ -375,12 +390,16 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   input = INPUT_RELAY_LEVEL;
   pullup = WebServer->httpServer->arg(input).toInt();
 
+  input = INPUT_BUTTON_INVERSED;
+  inversed = WebServer->httpServer->arg(input).toInt();
+
   input = INPUT_BUTTON_ACTION;
   action = WebServer->httpServer->arg(input).toInt();
 
   for (gpio = 0; gpio <= OFF_GPIO; gpio++) {
     key = KEY_GPIO + gpio;
     ConfigManager->setElement(key, PULL_UP_BUTTON, pullup);
+    ConfigManager->setElement(key, INVERSED_BUTTON, inversed);
     ConfigManager->setElement(key, EVENT_BUTTON, event);
     ConfigManager->setElement(key, ACTION_BUTTON, action);
   }
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index b6fa73f4..d3938441 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -13,6 +13,7 @@
 #define INPUT_TRIGGER           "trs"
 #define INPUT_BUTTON_SET        "bts"
 #define INPUT_BUTTON_GPIO       "btg"
+#define INPUT_BUTTON_INVERSED   "ibi"
 #define INPUT_BUTTON_EVENT      "icl"
 #define INPUT_BUTTON_ACTION     "bta"
 #define INPUT_LIMIT_SWITCH_GPIO "lsg"

From 7445b003e9f09640aa50e64495f22ab9e30ac3a5 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 25 Feb 2021 07:36:43 +0100
Subject: [PATCH 115/165] =?UTF-8?q?poprawa=20dla=20MCP=20i=20przycisk?=
 =?UTF-8?q?=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini              |  2 +-
 src/SuplaWebPageControl.cpp | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 07f374c3..2eb276a1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.5"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.6"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index ecd8976b..2dc29f6f 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -388,10 +388,20 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   event = WebServer->httpServer->arg(input).toInt();
 
   input = INPUT_RELAY_LEVEL;
-  pullup = WebServer->httpServer->arg(input).toInt();
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    pullup = 1;
+  }
+  else {
+    pullup = 0;
+  }
 
   input = INPUT_BUTTON_INVERSED;
-  inversed = WebServer->httpServer->arg(input).toInt();
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    inversed = 1;
+  }
+  else {
+    inversed = 0;
+  }
 
   input = INPUT_BUTTON_ACTION;
   action = WebServer->httpServer->arg(input).toInt();

From eda925e3177585c9e06df39aa54085aa1af5af40 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 25 Feb 2021 21:12:32 +0100
Subject: [PATCH 116/165] poprawa dla rolet

---
 src/GUI-Generic.ino    |  2 +-
 src/SuplaDeviceGUI.cpp | 44 +++++++++++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/GUI-Generic.ino b/src/GUI-Generic.ino
index b597255a..f894f7d4 100644
--- a/src/GUI-Generic.ino
+++ b/src/GUI-Generic.ino
@@ -39,7 +39,7 @@ void setup() {
 #ifdef SUPLA_ROLLERSHUTTER
       if (rollershutters > 0) {
 #ifdef SUPLA_BUTTON
-        if (ConfigESP->getLevel(nr, FUNCTION_BUTTON) == Supla::ON_CHANGE && ConfigESP->getLevel(nr + 1, FUNCTION_BUTTON) == Supla::ON_CHANGE) {
+        if (ConfigESP->getEvent(nr, FUNCTION_BUTTON) == Supla::Event::ON_CHANGE && ConfigESP->getEvent(nr + 1, FUNCTION_BUTTON) == Supla::Event::ON_CHANGE) {
           Supla::GUI::addRolleShutterMomentary(nr);
         }
         else {
diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 4cd686ff..fc4bf242 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -160,13 +160,22 @@ void addConfigESP(int pinNumberConfig, int pinLedConfig, int modeConfigButton, b
 
 #ifdef SUPLA_ROLLERSHUTTER
 void addRolleShutter(uint8_t nr) {
-  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinLedUP, pinLedDown;
+  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pullupButtonUp, pullupButtonDown, inversedButtonUp, inversedButtonDown, pinLedUP,
+      pinLedDown;
   bool highIsOn, levelLed;
 
   pinRelayUp = ConfigESP->getGpio(nr, FUNCTION_RELAY);
   pinRelayDown = ConfigESP->getGpio(nr + 1, FUNCTION_RELAY);
+
   pinButtonUp = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
   pinButtonDown = ConfigESP->getGpio(nr + 1, FUNCTION_BUTTON);
+
+  pullupButtonUp = ConfigESP->getPullUp(nr, FUNCTION_BUTTON);
+  pullupButtonDown = ConfigESP->getPullUp(nr + 1, FUNCTION_BUTTON);
+
+  inversedButtonUp = ConfigESP->getInversed(nr, FUNCTION_BUTTON);
+  inversedButtonDown = ConfigESP->getInversed(nr + 1, FUNCTION_BUTTON);
+
   pinLedUP = ConfigESP->getGpio(nr, FUNCTION_LED);
   pinLedDown = ConfigESP->getGpio(nr + 1, FUNCTION_LED);
 
@@ -176,13 +185,13 @@ void addRolleShutter(uint8_t nr) {
   auto RollerShutterRelay = new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn);
 
   if (pinButtonUp != OFF_GPIO && pinButtonDown != OFF_GPIO) {
-    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, true, true);
-    auto RollerShutterButtonClose = new Supla::Control::Button(pinButtonDown, true, true);
-    RollerShutterButtonOpen->addAction(Supla::OPEN_OR_STOP, RollerShutterRelay, Supla::ON_PRESS);
-    RollerShutterButtonClose->addAction(Supla::CLOSE_OR_STOP, RollerShutterRelay, Supla::ON_PRESS);
+    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, pullupButtonUp, inversedButtonUp);
+    auto RollerShutterButtonClose = new Supla::Control::Button(pinButtonDown, pullupButtonDown, inversedButtonDown);
+    RollerShutterButtonOpen->addAction(Supla::Action::OPEN_OR_STOP, RollerShutterRelay, Supla::Event::ON_PRESS);
+    RollerShutterButtonClose->addAction(Supla::Action::CLOSE_OR_STOP, RollerShutterRelay, Supla::Event::ON_PRESS);
   }
   else if ((pinButtonUp == OFF_GPIO && pinButtonDown != OFF_GPIO) || (pinButtonUp != OFF_GPIO && pinButtonDown == OFF_GPIO)) {
-    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, true, true);
+    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, pullupButtonUp, inversedButtonUp);
     RollerShutterButtonOpen->addAction(Supla::STEP_BY_STEP, RollerShutterRelay, Supla::ON_PRESS);
   }
   // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
@@ -197,13 +206,22 @@ void addRolleShutter(uint8_t nr) {
 }
 
 void addRolleShutterMomentary(uint8_t nr) {
-  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinLedUP, pinLedDown;
+  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinButtonDown, pullupButtonUp, pullupButtonDown, inversedButtonUp, inversedButtonDown,
+      pinLedUP, pinLedDown;
   bool highIsOn, levelLed;
 
   pinRelayUp = ConfigESP->getGpio(nr, FUNCTION_RELAY);
   pinRelayDown = ConfigESP->getGpio(nr + 1, FUNCTION_RELAY);
+
   pinButtonUp = ConfigESP->getGpio(nr, FUNCTION_BUTTON);
   pinButtonDown = ConfigESP->getGpio(nr + 1, FUNCTION_BUTTON);
+
+  pullupButtonUp = ConfigESP->getPullUp(nr, FUNCTION_BUTTON);
+  pullupButtonDown = ConfigESP->getPullUp(nr + 1, FUNCTION_BUTTON);
+
+  inversedButtonUp = ConfigESP->getInversed(nr, FUNCTION_BUTTON);
+  inversedButtonDown = ConfigESP->getInversed(nr + 1, FUNCTION_BUTTON);
+
   pinLedUP = ConfigESP->getGpio(nr, FUNCTION_LED);
   pinLedDown = ConfigESP->getGpio(nr + 1, FUNCTION_LED);
 
@@ -213,13 +231,13 @@ void addRolleShutterMomentary(uint8_t nr) {
   auto RollerShutterRelay = new Supla::Control::RollerShutter(pinRelayUp, pinRelayDown, highIsOn);
 
   if (pinButtonUp != OFF_GPIO && pinButtonDown != OFF_GPIO) {
-    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, true, true);
-    auto RollerShutterButtonClose = new Supla::Control::Button(pinButtonDown, true, true);
-    RollerShutterButtonOpen->addAction(Supla::OPEN, RollerShutterRelay, Supla::ON_PRESS);
-    RollerShutterButtonOpen->addAction(Supla::STOP, RollerShutterRelay, Supla::ON_RELEASE);
+    auto RollerShutterButtonOpen = new Supla::Control::Button(pinButtonUp, pullupButtonUp, inversedButtonUp);
+    auto RollerShutterButtonClose = new Supla::Control::Button(pinButtonDown, pullupButtonDown, inversedButtonDown);
+    RollerShutterButtonOpen->addAction(Supla::Action::OPEN, RollerShutterRelay, Supla::Event::ON_PRESS);
+    RollerShutterButtonOpen->addAction(Supla::Action::STOP, RollerShutterRelay, Supla::Event::ON_RELEASE);
 
-    RollerShutterButtonClose->addAction(Supla::CLOSE, RollerShutterRelay, Supla::ON_PRESS);
-    RollerShutterButtonClose->addAction(Supla::STOP, RollerShutterRelay, Supla::ON_RELEASE);
+    RollerShutterButtonClose->addAction(Supla::Action::CLOSE, RollerShutterRelay, Supla::Event::ON_PRESS);
+    RollerShutterButtonClose->addAction(Supla::Action::STOP, RollerShutterRelay, Supla::Event::ON_RELEASE);
   }
   // eeprom.setStateSavePeriod(TIME_SAVE_PERIOD_SEK * 1000);
 

From df8deb4d06f5e3b2d7bdb8b4d1b493367f136dbd Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 25 Feb 2021 21:13:20 +0100
Subject: [PATCH 117/165] =?UTF-8?q?Poprawa=20nazw=20dla=20ustawie=C5=84=20?=
 =?UTF-8?q?przycisku=20+=20domy=C5=9Blne=20warto=C5=9Bci=20pullup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaConfigESP.cpp      | 2 +-
 src/SuplaTemplateBoard.cpp  | 2 +-
 src/SuplaWebPageControl.cpp | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SuplaConfigESP.cpp b/src/SuplaConfigESP.cpp
index a7ec19b0..549d9ef7 100644
--- a/src/SuplaConfigESP.cpp
+++ b/src/SuplaConfigESP.cpp
@@ -522,7 +522,7 @@ void SuplaConfigESP::clearGpio(uint8_t gpio, uint8_t function) {
   ConfigManager->setElement(key, FUNCTION, FUNCTION_OFF);
 
   if (function == FUNCTION_BUTTON) {
-    setPullUp(gpio, true);
+    setPullUp(gpio, false);
     setInversed(gpio, true);
     setAction(gpio, Supla::Action::TOGGLE);
     setEvent(gpio, Supla::Event::ON_CHANGE);
diff --git a/src/SuplaTemplateBoard.cpp b/src/SuplaTemplateBoard.cpp
index 65b1e963..478e9838 100644
--- a/src/SuplaTemplateBoard.cpp
+++ b/src/SuplaTemplateBoard.cpp
@@ -4,7 +4,7 @@
 void addButton(uint8_t gpio, uint8_t event) {
   uint8_t nr = ConfigManager->get(KEY_MAX_BUTTON)->getValueInt();
   nr++;
-  ConfigESP->setPullUp(gpio, true);
+  ConfigESP->setPullUp(gpio, false);
   ConfigESP->setInversed(gpio, true);
   ConfigESP->setAction(gpio, Supla::Action::TOGGLE);
   ConfigESP->setEvent(gpio, event);
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 2dc29f6f..7d8c7440 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -235,10 +235,10 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
   selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Pull-UP", selected);
+  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
 
   selected = ConfigESP->getInversed(nr_button.toInt(), FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócony", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócona logika", selected);
 
   selected = ConfigESP->getEvent(nr_button.toInt(), FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
@@ -355,10 +355,10 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   addFormHeader(webContentBuffer, F("Ustawienia dla przycisków"));
 
   selected = ConfigESP->getPullUp(1, FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL, "Pull-UP", selected);
+  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL, "Wewnętrzny pull-up", selected);
 
   selected = ConfigESP->getInversed(1, FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED, "Odwrócony", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED, "Odwrócona logika", selected);
 
   selected = ConfigESP->getEvent(1, FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT, S_REACTION_TO, TRIGGER_P, 3, selected);

From 05e394194923a905fcb020d816646f21da2dd84e Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 25 Feb 2021 21:15:36 +0100
Subject: [PATCH 118/165] Update SuplaDeviceGUI.cpp

---
 src/SuplaDeviceGUI.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index fc4bf242..859fa4c2 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -206,8 +206,8 @@ void addRolleShutter(uint8_t nr) {
 }
 
 void addRolleShutterMomentary(uint8_t nr) {
-  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pinButtonDown, pullupButtonUp, pullupButtonDown, inversedButtonUp, inversedButtonDown,
-      pinLedUP, pinLedDown;
+  int pinRelayUp, pinRelayDown, pinButtonUp, pinButtonDown, pullupButtonUp, pullupButtonDown, inversedButtonUp, inversedButtonDown, pinLedUP,
+      pinLedDown;
   bool highIsOn, levelLed;
 
   pinRelayUp = ConfigESP->getGpio(nr, FUNCTION_RELAY);

From 00559b018930045082e8188871e697d2d14fa892 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Thu, 25 Feb 2021 21:19:53 +0100
Subject: [PATCH 119/165] 1.3.7

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 2eb276a1..c97f8ad7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.6"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.7"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC

From 879f7751992407819da5715de2384269f46e09dc Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 26 Feb 2021 15:35:45 +0100
Subject: [PATCH 120/165] defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER)

---
 src/SuplaWebPageControl.cpp | 2 +-
 src/SuplaWebPageControl.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 7d8c7440..2c79901e 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -141,7 +141,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
 }
 #endif
 
-#if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_BUTTON) && defined(SUPLA_ROLLERSHUTTER))
+#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER)
 void SuplaWebPageControl::handleButtonSet() {
   if (!WebServer->isLoggedIn()) {
     return;
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index d3938441..9120b988 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -38,7 +38,7 @@ class SuplaWebPageControl {
   void suplaWebpageLimitSwitch(int save);
 #endif
 
-#if (defined(SUPLA_BUTTON) && defined(SUPLA_RELAY)) || (defined(SUPLA_RSUPLA_BUTTONELAY) || defined(SUPLA_ROLLERSHUTTER))
+#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER)
   void handleButtonSet();
   void handleButtonSaveSet();
 

From f727a79c220e044c2b5fa657dac0880414bd78a2 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 26 Feb 2021 15:46:42 +0100
Subject: [PATCH 121/165] poprawa defined dla pageSensor

---
 src/SuplaWebPageSensor.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 8d6b0cca..1a234a79 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -41,6 +41,7 @@
 #define INPUT_MAX6675         "max6675"
 #define INPUT_OLED_NAME       "ion"
 
+#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
 enum _sensorI2C
 {
   SENSOR_I2C_BME280,
@@ -50,6 +51,7 @@ enum _sensorI2C
   SENSOR_I2C_OLED,
   SENSOR_I2C_MCP23017
 };
+#endif
 
 #ifdef SUPLA_BME280
 enum _bmeAdress
@@ -81,11 +83,10 @@ class SuplaWebPageSensor {
   void handleSearchDS();
   void handleDSSave();
   void showDS18B20(bool readonly = false);
+  void supla_webpage_search(int save);
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
-  void handle1Wire();
-  void handle1WireSave();
   void handlei2c();
   void handlei2cSave();
   void supla_webpage_i2c(int save);
@@ -96,12 +97,10 @@ class SuplaWebPageSensor {
   void handleSpiSave();
 #endif
 
- private:
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
+  void handle1Wire();
+  void handle1WireSave();
   void supla_webpage_1wire(int save);
-#ifdef SUPLA_DS18B20
-  void supla_webpage_search(int save);
-#endif
 #endif
 
 #if defined(SUPLA_MAX6675)

From 098c0ebcdb4f08967bd1da3b8d1e70ca5fc130c5 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 26 Feb 2021 17:01:59 +0100
Subject: [PATCH 122/165] defined pageControl

---
 src/SuplaWebPageControl.cpp |  8 +++++---
 src/SuplaWebPageControl.h   | 17 +++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 2c79901e..d1170815 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -8,12 +8,14 @@ SuplaWebPageControl *WebPageControl = new SuplaWebPageControl();
 
 void SuplaWebPageControl::createWebPageControl() {
   String path;
+#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_MCP23017)
   path += PATH_START;
   path += PATH_CONTROL;
   WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleControl, this));
   path = PATH_START;
   path += PATH_SAVE_CONTROL;
   WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleControlSave, this));
+#endif
 
 #ifdef SUPLA_BUTTON
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
@@ -50,7 +52,7 @@ void SuplaWebPageControl::createWebPageControl() {
 #endif
 }
 
-#ifdef SUPLA_BUTTON
+#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_MCP23017)
 void SuplaWebPageControl::handleControl() {
   if (!WebServer->isLoggedIn()) {
     return;
@@ -59,8 +61,6 @@ void SuplaWebPageControl::handleControl() {
 }
 
 void SuplaWebPageControl::handleControlSave() {
-  //  Serial.println(F("HTTP_POST - metoda handleControlSave"));
-
   if (!WebServer->isLoggedIn()) {
     return;
   }
@@ -345,6 +345,7 @@ void SuplaWebPageControl::handleButtonSetMCP23017() {
   supla_webpage_button_set_MCP23017(0);
 }
 
+#ifdef SUPLA_MCP23017 || defined(SUPLA_ROLLERSHUTTER)
 void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   uint8_t selected;
 
@@ -422,3 +423,4 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
       break;
   }
 }
+#endif
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index 9120b988..bbfb3023 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -20,17 +20,14 @@
 #define INPUT_MAX_BUTTON        "mbt"
 #define INPUT_MAX_LIMIT_SWITCH  "mls"
 
-/*enum _trigger_button {
-  TRIGGER_PRESS,
-  TRIGGER_RELEASE,
-  TRIGGER_CHANGE
-};*/
-
 class SuplaWebPageControl {
  public:
+#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_MCP23017)
   void createWebPageControl();
   void handleControl();
   void handleControlSave();
+  void supla_webpage_control(int save);
+#endif
 
 #ifdef SUPLA_LIMIT_SWITCH
   void handleLimitSwitch();
@@ -41,18 +38,14 @@ class SuplaWebPageControl {
 #if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER)
   void handleButtonSet();
   void handleButtonSaveSet();
-
- private:
-  void supla_webpage_control(int save);
-#endif
-
-#ifdef SUPLA_BUTTON
   void supla_webpage_button_set(int save, int nr = 0);
 #endif
 
+#ifdef SUPLA_MCP23017 || defined(SUPLA_ROLLERSHUTTER)
   void handleButtonSetMCP23017();
   void handleButtonSaveSetMCP23017();
   void supla_webpage_button_set_MCP23017(int save);
+#endif
 };
 
 extern SuplaWebPageControl* WebPageControl;

From cb56b4040f24e80452ef03c23abf47569da8614a Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Fri, 26 Feb 2021 19:18:32 +0100
Subject: [PATCH 123/165] poprawa defined

---
 platformio.ini                |  3 +-
 src/SuplaWebPageControl.cpp   | 17 +++++++----
 src/SuplaWebPageControl.h     | 11 +++++--
 src/SuplaWebPageOther.cpp     |  1 +
 src/SuplaWebPageRelay.cpp     | 10 +++++-
 src/SuplaWebPageRelay.h       | 57 ++++++++++++++++++++---------------
 src/SuplaWebPageSensor.h      |  2 --
 src/SuplaWebPageStatusLed.cpp |  4 ++-
 src/SuplaWebPageStatusLed.h   |  2 ++
 src/SuplaWebServer.cpp        | 11 ++++---
 src/SuplaWebServer.h          |  6 ----
 11 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index c97f8ad7..2598f198 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -48,7 +48,8 @@ build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.7"'
                 -D SUPLA_MCP23017
                 -D SUPLA_RGBW  
                 -D SUPLA_PUSHOVER
-                -D SUPLA_DIRECT_LINKS           
+                -D SUPLA_DIRECT_LINKS   
+                -D SUPLA_LED        
 
 [env]
 framework = arduino
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index d1170815..be1774c9 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -6,9 +6,11 @@
 
 SuplaWebPageControl *WebPageControl = new SuplaWebPageControl();
 
+#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_MCP23017)
 void SuplaWebPageControl::createWebPageControl() {
   String path;
-#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_MCP23017)
+
+#if defined(SUPLA_BUTTON) || defined(SUPLA_MCP23017)
   path += PATH_START;
   path += PATH_CONTROL;
   WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleControl, this));
@@ -17,8 +19,8 @@ void SuplaWebPageControl::createWebPageControl() {
   WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleControlSave, this));
 #endif
 
-#ifdef SUPLA_BUTTON
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
+#ifdef SUPLA_MCP23017
     path = PATH_START;
     path += PATH_BUTTON_SET;
     WebServer->httpServer->on(path, HTTP_GET, std::bind(&SuplaWebPageControl::handleButtonSetMCP23017, this));
@@ -26,8 +28,10 @@ void SuplaWebPageControl::createWebPageControl() {
     path = PATH_START;
     path += PATH_SAVE_BUTTON_SET;
     WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageControl::handleButtonSaveSetMCP23017, this));
+#endif
   }
   else {
+#if defined(SUPLA_BUTTON)
     for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_BUTTON)->getValueInt(); i++) {
       path = PATH_START;
       path += PATH_BUTTON_SET;
@@ -39,8 +43,8 @@ void SuplaWebPageControl::createWebPageControl() {
       path += i;
       WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleButtonSaveSet, this));
     }
-  }
 #endif
+  }
 
 #ifdef SUPLA_LIMIT_SWITCH
   path = PATH_START;
@@ -51,8 +55,9 @@ void SuplaWebPageControl::createWebPageControl() {
   WebServer->httpServer->on(path, std::bind(&SuplaWebPageControl::handleLimitSwitchSave, this));
 #endif
 }
+#endif
 
-#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_MCP23017)
+#if defined(SUPLA_BUTTON) || defined(SUPLA_MCP23017)
 void SuplaWebPageControl::handleControl() {
   if (!WebServer->isLoggedIn()) {
     return;
@@ -141,7 +146,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
 }
 #endif
 
-#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER)
+#if defined(SUPLA_BUTTON)
 void SuplaWebPageControl::handleButtonSet() {
   if (!WebServer->isLoggedIn()) {
     return;
@@ -338,6 +343,7 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
 }
 #endif
 
+#ifdef SUPLA_MCP23017
 void SuplaWebPageControl::handleButtonSetMCP23017() {
   if (!WebServer->isLoggedIn()) {
     return;
@@ -345,7 +351,6 @@ void SuplaWebPageControl::handleButtonSetMCP23017() {
   supla_webpage_button_set_MCP23017(0);
 }
 
-#ifdef SUPLA_MCP23017 || defined(SUPLA_ROLLERSHUTTER)
 void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   uint8_t selected;
 
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index bbfb3023..4a2cb176 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -4,6 +4,7 @@
 #include "SuplaWebServer.h"
 #include "SuplaDeviceGUI.h"
 
+#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_MCP23017)
 #define PATH_CONTROL            "control"
 #define PATH_SWITCH             "switch"
 #define PATH_SAVE_SWITCH        "saveswitch"
@@ -19,11 +20,15 @@
 #define INPUT_LIMIT_SWITCH_GPIO "lsg"
 #define INPUT_MAX_BUTTON        "mbt"
 #define INPUT_MAX_LIMIT_SWITCH  "mls"
+#endif
 
 class SuplaWebPageControl {
  public:
-#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_MCP23017)
+#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_MCP23017)
   void createWebPageControl();
+#endif
+
+#if defined(SUPLA_BUTTON) || defined(SUPLA_MCP23017)
   void handleControl();
   void handleControlSave();
   void supla_webpage_control(int save);
@@ -35,13 +40,13 @@ class SuplaWebPageControl {
   void suplaWebpageLimitSwitch(int save);
 #endif
 
-#if defined(SUPLA_BUTTON) || defined(SUPLA_ROLLERSHUTTER)
+#if defined(SUPLA_BUTTON)
   void handleButtonSet();
   void handleButtonSaveSet();
   void supla_webpage_button_set(int save, int nr = 0);
 #endif
 
-#ifdef SUPLA_MCP23017 || defined(SUPLA_ROLLERSHUTTER)
+#ifdef SUPLA_MCP23017
   void handleButtonSetMCP23017();
   void handleButtonSaveSetMCP23017();
   void supla_webpage_button_set_MCP23017(int save);
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 4e47b1e6..38e78f9f 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -245,6 +245,7 @@ void supla_impulse_counter_set(int save) {
     webContentBuffer += nr;
     webContentBuffer += F("'>");
     selected = ConfigESP->getMemory(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
+    return;
     for (suported = 0; suported < 2; suported++) {
       webContentBuffer += F("<option value='");
       webContentBuffer += suported;
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 90ea4b40..a31d974c 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -6,12 +6,12 @@
 #include "Markup.h"
 #include "SuplaWebPageSensor.h"
 
-#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
 SuplaWebPageRelay *WebPageRelay = new SuplaWebPageRelay();
 
 SuplaWebPageRelay::SuplaWebPageRelay() {
 }
 
+#if defined(SUPLA_RELAY) || defined(SUPLA_MCP23017)
 void SuplaWebPageRelay::createWebPageRelay() {
   String path;
   path.reserve(11);
@@ -24,6 +24,7 @@ void SuplaWebPageRelay::createWebPageRelay() {
   WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySave, this));
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
+#ifdef SUPLA_MCP23017
     path = PATH_START;
     path += PATH_RELAY_SET;
     WebServer->httpServer->on(path, HTTP_GET, std::bind(&SuplaWebPageRelay::handleRelaySetMCP23017, this));
@@ -31,8 +32,10 @@ void SuplaWebPageRelay::createWebPageRelay() {
     path = PATH_START;
     path += PATH_SAVE_RELAY_SET;
     WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSetMCP23017, this));
+#endif
   }
   else {
+#if defined(SUPLA_RELAY)
     for (uint8_t i = 1; i <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); i++) {
       path = PATH_START;
       path += PATH_RELAY_SET;
@@ -44,6 +47,7 @@ void SuplaWebPageRelay::createWebPageRelay() {
       path += i;
       WebServer->httpServer->on(path, HTTP_POST, std::bind(&SuplaWebPageRelay::handleRelaySaveSet, this));
     }
+#endif
   }
 }
 
@@ -133,7 +137,9 @@ void SuplaWebPageRelay::supla_webpage_relay(int save) {
 
   WebServer->sendHeaderEnd();
 }
+#endif
 
+#if defined(SUPLA_RELAY)
 void SuplaWebPageRelay::handleRelaySet() {
   if (!WebServer->isLoggedIn()) {
     return;
@@ -289,7 +295,9 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
 
   WebServer->sendContent();
 }
+#endif
 
+#ifdef SUPLA_MCP23017
 void SuplaWebPageRelay::handleRelaySetMCP23017() {
   if (!WebServer->isLoggedIn()) {
     return;
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index 2975712b..db807fbd 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -3,31 +3,25 @@
 
 #include "SuplaWebServer.h"
 
-#define PATH_RELAY            "relay"
-#define PATH_SAVE_RELAY       "saverelay"
-#define PATH_RELAY_SET        "setrelay"
-#define PATH_SAVE_RELAY_SET   "savesetrelay"
-#define INPUT_MAX_RELAY       "mrl"
-#define INPUT_RELAY_GPIO      "rlg"
 #define INPUT_ADRESS_MCP23017 "iam"
-#define INPUT_RELAY_LEVEL     "irl"
-#define INPUT_RELAY_MEMORY    "irm"
-#define INPUT_RELAY_DURATION  "ird"
-#define INPUT_ROLLERSHUTTER   "irsr"
+
+#if defined(SUPLA_RELAY) || defined(SUPLA_MCP23017)
+#define PATH_RELAY           "relay"
+#define PATH_SAVE_RELAY      "saverelay"
+#define PATH_RELAY_SET       "setrelay"
+#define PATH_SAVE_RELAY_SET  "savesetrelay"
+#define INPUT_MAX_RELAY      "mrl"
+#define INPUT_RELAY_GPIO     "rlg"
+#define INPUT_RELAY_LEVEL    "irl"
+#define INPUT_RELAY_MEMORY   "irm"
+#define INPUT_RELAY_DURATION "ird"
+#define INPUT_ROLLERSHUTTER  "irsr"
 
 #define INPUT_CONDITIONS_SENSOR_TYPE "cst"
 #define INPUT_CONDITIONS_TYPE        "ct"
 #define INPUT_CONDITIONS_MIN         "cmi"
 #define INPUT_CONDITIONS_MAX         "cma"
 
-#if defined(SUPLA_PUSHOVER)
-#define INPUT_PUSHOVER         "po"
-#define INPUT_PUSHOVER_MESSAGE "pm"
-#endif
-
-#if defined(SUPLA_DIRECT_LINKS)
-#define INPUT_DIRECT_LINK_ON  "dlo"
-#define INPUT_DIRECT_LINK_OFF "dlof"
 #endif
 
 enum _memory_relay
@@ -44,25 +38,40 @@ enum _conditions
   CONDITIONS_DHT_HUMI,
 };
 
-#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
+#if defined(SUPLA_PUSHOVER)
+#define INPUT_PUSHOVER         "po"
+#define INPUT_PUSHOVER_MESSAGE "pm"
+#endif
+
+#if defined(SUPLA_DIRECT_LINKS)
+#define INPUT_DIRECT_LINK_ON  "dlo"
+#define INPUT_DIRECT_LINK_OFF "dlof"
+#endif
 
 class SuplaWebPageRelay {
  public:
   SuplaWebPageRelay();
+
+#if defined(SUPLA_RELAY) || defined(SUPLA_MCP23017)
   void createWebPageRelay();
   void handleRelay();
   void handleRelaySave();
+  void supla_webpage_relay(int save);
+#endif
+
+#if defined(SUPLA_RELAY)
   void handleRelaySet();
   void handleRelaySaveSet();
-  void handleRelaySaveSetMCP23017();
-  void handleRelaySetMCP23017();
 
- private:
   void supla_webpage_relay_set(int save, int nr = 0);
-  void supla_webpage_relay(int save);
+#endif
+
+#ifdef SUPLA_MCP23017
   void supla_webpage_relay_set_MCP23017(int save);
+  void handleRelaySaveSetMCP23017();
+  void handleRelaySetMCP23017();
+#endif
 };
 
 extern SuplaWebPageRelay* WebPageRelay;
-#endif
 #endif  // SuplaWebPageRelay_h
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 1a234a79..9c8460b2 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -41,7 +41,6 @@
 #define INPUT_MAX6675         "max6675"
 #define INPUT_OLED_NAME       "ion"
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
 enum _sensorI2C
 {
   SENSOR_I2C_BME280,
@@ -51,7 +50,6 @@ enum _sensorI2C
   SENSOR_I2C_OLED,
   SENSOR_I2C_MCP23017
 };
-#endif
 
 #ifdef SUPLA_BME280
 enum _bmeAdress
diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
index e12763fd..92bf7eac 100644
--- a/src/SuplaWebPageStatusLed.cpp
+++ b/src/SuplaWebPageStatusLed.cpp
@@ -4,6 +4,7 @@
 #include "GUIGenericCommon.h"
 #include "Markup.h"
 
+#ifdef SUPLA_LED
 void createWebStatusLed() {
   WebServer->httpServer->on(getURL(PATH_LED), handleStatusLed);
   WebServer->httpServer->on(getURL(PATH_SAVE_LED), handleStatusLedSave);
@@ -66,4 +67,5 @@ void webStatusLed(int save) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
   WebServer->sendHeaderEnd();
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/src/SuplaWebPageStatusLed.h b/src/SuplaWebPageStatusLed.h
index 3da59441..c2d34dc4 100644
--- a/src/SuplaWebPageStatusLed.h
+++ b/src/SuplaWebPageStatusLed.h
@@ -1,6 +1,7 @@
 #ifndef SuplaWebPageStatusLed_h
 #define SuplaWebPageStatusLed_h
 
+#ifdef SUPLA_LED
 #define PATH_LED        "led"
 #define PATH_SAVE_LED   "saveled"
 #define INPUT_LED       "led"
@@ -10,5 +11,6 @@ void createWebStatusLed();
 void handleStatusLed();
 void handleStatusLedSave();
 void webStatusLed(int save);
+#endif
 
 #endif  // SuplaWebPageStatusLed_h
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 848cbb19..bc6a999d 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -61,10 +61,10 @@ void SuplaWebServer::createWebServer() {
   path += PATH_SAVE_BOARD;
   httpServer->on(path, std::bind(&SuplaWebServer::handleBoardSave, this));
 
-#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
+#if defined(SUPLA_RELAY) || defined(SUPLA_MCP23017)
   WebPageRelay->createWebPageRelay();
 #endif
-#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH)
+#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_MCP23017)
   WebPageControl->createWebPageControl();
 #endif
   WebPageSensor->createWebPageSensor();
@@ -78,7 +78,9 @@ void SuplaWebServer::createWebServer() {
   createWebDownload();
   createWebUpload();
   createWebTools();
+#ifdef SUPLA_LED
   createWebStatusLed();
+#endif
   createWebPageOther();
 }
 
@@ -90,7 +92,6 @@ void SuplaWebServer::handle() {
 }
 
 void SuplaWebServer::handleSave() {
-  //  Serial.println(F("HTTP_POST - metoda handleSave"));
   if (!isLoggedIn()) {
     return;
   }
@@ -211,10 +212,12 @@ void SuplaWebServer::deviceSettings(int save) {
 #endif
 
 #ifdef SUPLA_LIMIT_SWITCH
-  addButton(webContentBuffer, F("KONTAKTRON"), PATH_SWITCH);
+  addButton(webContentBuffer, F("KRAŃCÓWKI"), PATH_SWITCH);
 #endif
 
+#ifdef SUPLA_LED
   addButton(webContentBuffer, F("LED"), PATH_LED);
+#endif
 
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
   addButton(webContentBuffer, S_SENSORS_1WIRE, PATH_1WIRE);
diff --git a/src/SuplaWebServer.h b/src/SuplaWebServer.h
index 0f236c1d..816fa2d8 100644
--- a/src/SuplaWebServer.h
+++ b/src/SuplaWebServer.h
@@ -26,12 +26,6 @@
 
 #include "SuplaConfigManager.h"
 
-#define GUI_BLUE  "#005c96"
-#define GUI_GREEN "#00D151"
-
-#define DEFAULT_LOGIN    "admin"
-#define DEFAULT_PASSWORD "password"
-
 #define PATH_START            "/"
 #define PATH_SAVE_LOGIN       "savelogin"
 #define PATH_REBOT            "rbt"

From 5baf1dd562e6dcf3b16fc6da63021d48d03a426f Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Fri, 26 Feb 2021 22:44:49 +0100
Subject: [PATCH 124/165] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 293347b3..6d487764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 .vscode/ipch
 build_output
 src/GUI-Generic.ino.cpp
+.project

From b265f04d3d6ea47d3fc8cb33daf7985fe7ba9338 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sat, 27 Feb 2021 00:51:55 +0100
Subject: [PATCH 125/165] Update SuplaWebPageControl.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Przy włączonym SUPLA_OLED ale bez SUPLA_BUTTON, SUPLA_LIMIT_SWITCH albo SUPLA_MCP23017 makro INPUT_BUTTON_GPIO było niedostępne.
---
 src/SuplaWebPageControl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index 4a2cb176..d2c1163a 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -4,7 +4,7 @@
 #include "SuplaWebServer.h"
 #include "SuplaDeviceGUI.h"
 
-#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_MCP23017)
+#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
 #define PATH_CONTROL            "control"
 #define PATH_SWITCH             "switch"
 #define PATH_SAVE_SWITCH        "saveswitch"

From 6b08f065f33296e0cf1db9094552980546c86cc2 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 06:48:29 +0100
Subject: [PATCH 126/165] Update SuplaWebServer.cpp

---
 src/SuplaWebServer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index bc6a999d..626fdfed 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -203,7 +203,7 @@ void SuplaWebServer::deviceSettings(int save) {
   addFormEnd(webContentBuffer);
 
   addFormHeader(webContentBuffer, S_DEVICE_SETTINGS);
-#if defined(SUPLA_RELAY) || defined(SUPLA_ROLLERSHUTTER)
+#if defined(SUPLA_RELAY)
   addButton(webContentBuffer, S_RELAYS, PATH_RELAY);
 #endif
 
@@ -231,7 +231,7 @@ void SuplaWebServer::deviceSettings(int save) {
   addButton(webContentBuffer, S_SENSORS_SPI, PATH_SPI);
 #endif
 
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER)
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012) || defined(SUPLA_PUSHOVER)
   addButton(webContentBuffer, S_SENSORS_OTHER, PATH_OTHER);
 #endif
 

From 0197d0276ac6099d83975ad012fe7fb4b96dedc6 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 07:24:32 +0100
Subject: [PATCH 127/165] SUPLA_IMPULSE_COUNTER

---
 src/SuplaWebPageOther.cpp | 1 -
 src/SuplaWebPageOther.h   | 8 ++++++++
 src/SuplaWebPageSensor.h  | 4 ----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 38e78f9f..4e47b1e6 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -245,7 +245,6 @@ void supla_impulse_counter_set(int save) {
     webContentBuffer += nr;
     webContentBuffer += F("'>");
     selected = ConfigESP->getMemory(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
-    return;
     for (suported = 0; suported < 2; suported++) {
       webContentBuffer += F("<option value='");
       webContentBuffer += suported;
diff --git a/src/SuplaWebPageOther.h b/src/SuplaWebPageOther.h
index f1d00670..8ac21b7c 100644
--- a/src/SuplaWebPageOther.h
+++ b/src/SuplaWebPageOther.h
@@ -4,6 +4,9 @@
 #include "SuplaDeviceGUI.h"
 #include "SuplaWebServer.h"
 
+#define PATH_OTHER                    "other"
+#define PATH_SAVE_OTHER               "saveother"
+
 void createWebPageOther();
 
 #if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
@@ -60,4 +63,9 @@ void suplaWebpageHLW8012Calibrate(uint8_t save);
 #define INPUT_HC_SR04_MAX_SENSOR_READ "hsm"
 #endif
 
+#ifdef SUPLA_IMPULSE_COUNTER
+#define PATH_IMPULSE_COUNTER_SET      "setcounter"
+#define PATH_SAVE_IMPULSE_COUNTER_SET "savesetcounter"
+#endif
+
 #endif  // SuplaWebPageOther_h
diff --git a/src/SuplaWebPageSensor.h b/src/SuplaWebPageSensor.h
index 9c8460b2..a366606e 100644
--- a/src/SuplaWebPageSensor.h
+++ b/src/SuplaWebPageSensor.h
@@ -13,10 +13,6 @@
 #define PATH_SAVE_I2C                 "savei2c"
 #define PATH_SPI                      "spi"
 #define PATH_SAVE_SPI                 "savespi"
-#define PATH_OTHER                    "other"
-#define PATH_SAVE_OTHER               "saveother"
-#define PATH_IMPULSE_COUNTER_SET      "setimpulsecounter"
-#define PATH_SAVE_IMPULSE_COUNTER_SET "savesetimpulsecounter"
 
 #define INPUT_MULTI_DS_GPIO   "mdsg"
 #define INPUT_DHT11_GPIO      "dht11"

From 9f6ecdaf5d22c6679875cc859a4bcca9a03d587b Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 07:59:21 +0100
Subject: [PATCH 128/165] =?UTF-8?q?nowe=20GUI=20dla=20licznika=20impuls?=
 =?UTF-8?q?=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Markup.cpp            |  14 +++--
 src/Markup.h              |   2 +-
 src/SuplaWebPageOther.cpp | 106 ++++++++++++--------------------------
 src/language/de.h         |   2 -
 src/language/en.h         |   1 -
 src/language/es.h         |   1 -
 src/language/fr.h         |   1 -
 src/language/pl.h         |   1 -
 8 files changed, 43 insertions(+), 85 deletions(-)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index f339a0ed..a1a942ac 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -114,14 +114,20 @@ void addCheckBox(String& html, const String& input_id, const String& name, bool
   html += F("</i>");
 }
 
-void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max) {
+void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, int max) {
   html += F("<i><label>");
   html += name;
   html += F("</label><input name='");
   html += input_id;
-  html += F("' type='number' placeholder='0' step='1' min='0' max='");
-  html += String(max);
-  html += F("' value='");
+  html += F("' type='number' placeholder='0' step='1' min='0'");
+
+  if (max >= 0) {
+    html += F(" max='");
+    html += String(max);
+    html += F("'");
+  }
+
+  html += F(" value='");
   html += String(ConfigManager->get(value_key)->getValue());
   html += F("'></i>");
 }
diff --git a/src/Markup.h b/src/Markup.h
index 4d28c73a..e02c0fee 100644
--- a/src/Markup.h
+++ b/src/Markup.h
@@ -47,7 +47,7 @@ void addTextBoxPassword(String& html, const String& input_id, const String& name
 
 void addCheckBox(String& html, const String& input_id, const String& name, bool checked);
 
-void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, uint16_t max);
+void addNumberBox(String& html, const String& input_id, const String& name, uint8_t value_key, int max = -1);
 
 void addNumberBox(String& html, const String& input_id, const String& name, const String& placeholder, bool required, const String& value = "\n");
 
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 4e47b1e6..ee7bfd2c 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -193,11 +193,22 @@ void handleImpulseCounterSaveSet() {
 
   input = INPUT_IMPULSE_COUNTER_PULL_UP;
   input += nr;
-  ConfigManager->setElement(key, MEMORY, WebServer->httpServer->arg(input).toInt());
+
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(key, MEMORY, 1);
+  }
+  else {
+    ConfigManager->setElement(key, MEMORY, 0);
+  }
 
   input = INPUT_IMPULSE_COUNTER_RAISING_EDGE;
   input += nr;
-  ConfigManager->setElement(key, LEVEL_RELAY, WebServer->httpServer->arg(input).toInt());
+  if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
+    ConfigManager->setElement(key, LEVEL_RELAY, 1);
+  }
+  else {
+    ConfigManager->setElement(key, LEVEL_RELAY, 0);
+  }
 
   ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer->arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
   Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer->arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
@@ -228,83 +239,30 @@ void supla_impulse_counter_set(int save) {
 
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_OTHER);
-  uint8_t relays = ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt();
-  if (nr.toInt() <= relays && ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
-    webContentBuffer += F("<form method='post' action='");
-    webContentBuffer += PATH_SAVE_IMPULSE_COUNTER_SET;
-    webContentBuffer += nr;
-    webContentBuffer += F("'><div class='w'><h3>");
-    webContentBuffer += S_IMPULSE_COUNTER_SETTINGS_NR;
-    webContentBuffer += F(" ");
-    webContentBuffer += nr;
-    webContentBuffer += F("</h3>");
-    webContentBuffer += F("<i><label>");
-    webContentBuffer += S_IMPULSE_COUNTER_PULL_UP;
-    webContentBuffer += F("</label><select name='");
-    webContentBuffer += INPUT_IMPULSE_COUNTER_PULL_UP;
-    webContentBuffer += nr;
-    webContentBuffer += F("'>");
+
+  if (nr.toInt() <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt() &&
+      ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
+
+    addForm(webContentBuffer, F("post"), PATH_SAVE_IMPULSE_COUNTER_SET + nr);
+    addFormHeader(webContentBuffer, S_IMPULSE_COUNTER_SETTINGS_NR + nr);
+
     selected = ConfigESP->getMemory(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
-    for (suported = 0; suported < 2; suported++) {
-      webContentBuffer += F("<option value='");
-      webContentBuffer += suported;
-      if (selected == suported) {
-        webContentBuffer += F("' selected>");
-      }
-      else
-        webContentBuffer += F("'>");
-      webContentBuffer += PGMT(STATE_P[suported]);
-    }
-    webContentBuffer += F("</select></i>");
-    webContentBuffer += F("<i><label>");
-    webContentBuffer += S_IMPULSE_COUNTER_RAISING_EDGE;
-    webContentBuffer += F("</label><select name='");
-    webContentBuffer += INPUT_IMPULSE_COUNTER_RAISING_EDGE;
-    webContentBuffer += nr;
-    webContentBuffer += F("'>");
+    addCheckBox(webContentBuffer, INPUT_IMPULSE_COUNTER_PULL_UP + nr, S_IMPULSE_COUNTER_PULL_UP, selected);
+
     selected = ConfigESP->getLevel(nr.toInt(), FUNCTION_IMPULSE_COUNTER);
-    for (suported = 0; suported < 2; suported++) {
-      webContentBuffer += F("<option value='");
-      webContentBuffer += suported;
-      if (selected == suported) {
-        webContentBuffer += F("' selected>");
-      }
-      else
-        webContentBuffer += F("'>");
-      webContentBuffer += PGMT(STATE_P[suported]);
-    }
-    webContentBuffer += F("</select></i>");
-    addNumberBox(webContentBuffer, INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, S_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT,
-                 99999999);
-    webContentBuffer += F("<i><label>");
-    webContentBuffer += S_IMPULSE_COUNTER_CHANGE_VALUE;
-    webContentBuffer += F("</label><input name='");
-    webContentBuffer += INPUT_IMPULSE_COUNTER_CHANGE_VALUE;
-    webContentBuffer += F("' type='number' placeholder='0' step='1' min='0' max='");
-    webContentBuffer += 100;
-    webContentBuffer += F("' value='");
+    addCheckBox(webContentBuffer, INPUT_IMPULSE_COUNTER_RAISING_EDGE + nr, S_IMPULSE_COUNTER_RAISING_EDGE, selected);
+
+    addNumberBox(webContentBuffer, INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, S_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT);
+
     uint32_t count = Supla::GUI::impulseCounter[nr.toInt() - 1]->getCounter();
-    webContentBuffer += count;
-    webContentBuffer += F("'></i>");
+    addNumberBox(webContentBuffer, INPUT_IMPULSE_COUNTER_CHANGE_VALUE, S_IMPULSE_COUNTER_CHANGE_VALUE, F(""), false, String(count));
 
-    webContentBuffer += F("</div><button type='submit'>");
-    webContentBuffer += S_SAVE;
-    webContentBuffer += F("</button></form>");
-  }
-  else {
-    webContentBuffer += F("<div class='w'><h3>");
-    webContentBuffer += S_NO_IMPULSE_COUNTER_NR;
-    webContentBuffer += F(" ");
-    webContentBuffer += nr;
-    webContentBuffer += F("</h3>");
+    addFormHeaderEnd(webContentBuffer);
+    addButtonSubmit(webContentBuffer, S_SAVE);
+    addFormEnd(webContentBuffer);
   }
-  webContentBuffer += F("<br>");
-  webContentBuffer += F("<a href='");
-  webContentBuffer += PATH_START;
-  webContentBuffer += PATH_OTHER;
-  webContentBuffer += F("'><button>");
-  webContentBuffer += S_RETURN;
-  webContentBuffer += F("</button></a><br><br>");
+
+  addButton(webContentBuffer, S_RETURN, PATH_OTHER);
   WebServer->sendContent();
 }
 #endif
diff --git a/src/language/de.h b/src/language/de.h
index 7384c7d4..f1031869 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -102,6 +102,4 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Pull-up"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Wertänderung"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Einstellung Impulszähler Nr."
-#define S_NO_IMPULSE_COUNTER_NR            "Fehlender Impulszähler Nr."
-
 #endif  // _LANGUAGE_DE_S_H_
diff --git a/src/language/en.h b/src/language/en.h
index 7cf2c9ad..8dcabaa4 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -102,6 +102,5 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Pull up"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Change value"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Settings IC nr."
-#define S_NO_IMPULSE_COUNTER_NR            "No IC nr."
 
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index 436af679..1e716d81 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -105,6 +105,5 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Pull-up"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Cambia el valor"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Configuración contador de impulsos no."
-#define S_NO_IMPULSE_COUNTER_NR            "Falta de contador de impulsos no."
 
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index f444bd0f..b9184784 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -103,6 +103,5 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Remonter"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Modifier la valeur"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Paramètres Compteur d'impulsions No."
-#define S_NO_IMPULSE_COUNTER_NR            "Aucun Compteur d'impulsions No."
 
 #endif  // _LANGUAGE_FR_S_H_
\ No newline at end of file
diff --git a/src/language/pl.h b/src/language/pl.h
index 71c4639c..f6a6251b 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -104,6 +104,5 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Podciąganie do VCC"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Zmień wartość"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Ustawienia IC nr"
-#define S_NO_IMPULSE_COUNTER_NR            "Brak IC nr"
 
 #endif  // _LANGUAGE_PL_S_H_

From 5c728cd4ded577394f5bfce50bfdd85414929301 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 08:25:27 +0100
Subject: [PATCH 129/165] Update SuplaWebPageOther.cpp

---
 src/SuplaWebPageOther.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index ee7bfd2c..464cbb8a 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -212,6 +212,7 @@ void handleImpulseCounterSaveSet() {
 
   ConfigManager->set(KEY_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT, WebServer->httpServer->arg(INPUT_IMPULSE_COUNTER_DEBOUNCE_TIMEOUT).c_str());
   Supla::GUI::impulseCounter[nr.toInt() - 1]->setCounter((unsigned long long)WebServer->httpServer->arg(INPUT_IMPULSE_COUNTER_CHANGE_VALUE).toInt());
+  Supla::Storage::ScheduleSave(2000);
 
   switch (ConfigManager->save()) {
     case E_CONFIG_OK:

From e8f34749ee3fb5849c5c147f40b352f733c861e7 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 08:31:05 +0100
Subject: [PATCH 130/165] Update GUI-Generic_Config.h

---
 src/GUI-Generic_Config.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index d3210ca7..ce2035d4 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -55,5 +55,11 @@
 #define SUPLA_PUSHOVER
 #define SUPLA_DIRECT_LINKS
 
+#endif  // USE_CUSTOM
+
+#ifdef SUPLA_ROLLERSHUTTER
+#define SUPLA_RELAY
+#define SUPLA_BUTTON
 #endif
+
 #endif  // GUI-Generic_Config_h

From 279e214a1f548164c6432415a627614618b14343 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 08:46:35 +0100
Subject: [PATCH 131/165] =?UTF-8?q?zale=C5=BCno=C5=9Bci?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GUI-Generic_Config.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index ce2035d4..4cf460a6 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -57,9 +57,17 @@
 
 #endif  // USE_CUSTOM
 
-#ifdef SUPLA_ROLLERSHUTTER
+#if defined(SUPLA_ROLLERSHUTTER)
 #define SUPLA_RELAY
 #define SUPLA_BUTTON
 #endif
 
+#if defined(SUPLA_OLED) || defined(SUPLA_RGBW)
+#define SUPLA_BUTTON
+#endif
+
+#if defined(SUPLA_PUSHOVER) || defined(SUPLA_DIRECT_LINKS)
+#define SUPLA_RELAY
+#endif
+
 #endif  // GUI-Generic_Config_h

From 5a7e3a52574917a76ab930488bf194c5336324a5 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 08:51:24 +0100
Subject: [PATCH 132/165] Update GUI-Generic_Config.h

---
 src/GUI-Generic_Config.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 4cf460a6..c96e629d 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -26,6 +26,7 @@
 #define SUPLA_LIMIT_SWITCH
 #define SUPLA_ROLLERSHUTTER
 #define SUPLA_CONFIG
+#define SUPLA_LED
 
 // ##### 1Wire #####
 #define SUPLA_DS18B20
@@ -38,7 +39,7 @@
 #define SUPLA_SHT3x
 #define SUPLA_SI7021
 #define SUPLA_OLED
-// #define SUPLA_MCP23017
+#define SUPLA_MCP23017
 // #define SUPLA_HTU21D    // 0x40 NOT SUPPORTED
 // #define SUPLA_SHT71     // 0x44 AND 0x45 NOT SUPPORTED
 // #define SUPLA_BH1750    // 0x23 AND 0x5C NOT SUPPORTED

From afee51462d77c073305118d3eb1ce47e69b1329d Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 15:07:29 +0100
Subject: [PATCH 133/165] Update GUI-Generic_Config.h

---
 src/GUI-Generic_Config.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index c96e629d..dcfd369d 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -58,17 +58,16 @@
 
 #endif  // USE_CUSTOM
 
-#if defined(SUPLA_ROLLERSHUTTER)
-#define SUPLA_RELAY
+#if defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_OLED) || defined(SUPLA_RGBW)
+#if !defined(SUPLA_BUTTON)
 #define SUPLA_BUTTON
 #endif
-
-#if defined(SUPLA_OLED) || defined(SUPLA_RGBW)
-#define SUPLA_BUTTON
 #endif
 
-#if defined(SUPLA_PUSHOVER) || defined(SUPLA_DIRECT_LINKS)
+#if defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_PUSHOVER) || defined(SUPLA_DIRECT_LINKS)
+#if !defined(SUPLA_RELAY)
 #define SUPLA_RELAY
 #endif
+#endif
 
 #endif  // GUI-Generic_Config_h

From f0134c6259d6961854f1f233ec115194429dab6a Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 15:19:40 +0100
Subject: [PATCH 134/165] SUPLA_ENABLE_SSL

---
 src/SuplaDeviceGUI.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/SuplaDeviceGUI.cpp b/src/SuplaDeviceGUI.cpp
index 859fa4c2..04cf84be 100644
--- a/src/SuplaDeviceGUI.cpp
+++ b/src/SuplaDeviceGUI.cpp
@@ -34,7 +34,12 @@ void begin() {
   Supla::GUIESPWifi *wifi = new Supla::GUIESPWifi(ConfigManager->get(KEY_WIFI_SSID)->getValue(), ConfigManager->get(KEY_WIFI_PASS)->getValue());
 
   wifi->enableBuffer(true);
+
+#ifdef SUPLA_ENABLE_SSL
+  wifi->enableSSL(true);
+#else
   wifi->enableSSL(false);
+#endif
 
   String supla_hostname = ConfigManager->get(KEY_HOST_NAME)->getValue();
   supla_hostname.replace(" ", "_");

From da324068e1b3041c73d41f9cb66432051001ba68 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 15:22:11 +0100
Subject: [PATCH 135/165] Update platformio.ini

---
 platformio.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platformio.ini b/platformio.ini
index 2598f198..2c6073c1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -27,6 +27,7 @@ build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.7"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
+                ;-D SUPLA_ENABLE_SSL 
                 -D SUPLA_OTA
                 -D SUPLA_RELAY
                 -D SUPLA_BUTTON

From c0f42eedf1f2bc7d7777c3e68118f1e26342945b Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sat, 27 Feb 2021 16:33:43 +0100
Subject: [PATCH 136/165] =?UTF-8?q?nowy=20spos=C3=B3b=20=C5=82adowania=20w?=
 =?UTF-8?q?ww=20dla=20pozosta=C5=82ych=20podstron?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini              |  2 +-
 src/Markup.cpp              |  5 +++++
 src/SuplaCommonPROGMEM.h    |  2 +-
 src/SuplaWebPageConfig.cpp  |  3 ++-
 src/SuplaWebPageControl.cpp |  8 ++++++--
 src/SuplaWebPageOther.cpp   |  4 ++--
 src/SuplaWebPageRelay.cpp   |  6 ++++--
 src/SuplaWebPageSensor.cpp  | 41 +++++++++++++++++++++++++++----------
 src/SuplaWebServer.cpp      |  4 +++-
 9 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 2c6073c1..a1cd4944 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.7"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.8"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/Markup.cpp b/src/Markup.cpp
index a1a942ac..3daad3b7 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -70,6 +70,7 @@ void addTextBox(String& html,
   html += F(" ><label>");
   html += name;
   html += F("</label></i> ");
+  WebServer->sendHeader();
 }
 
 void addTextBox(String& html,
@@ -130,6 +131,7 @@ void addNumberBox(String& html, const String& input_id, const String& name, uint
   html += F(" value='");
   html += String(ConfigManager->get(value_key)->getValue());
   html += F("'></i>");
+  WebServer->sendHeader();
 }
 
 void addNumberBox(String& html, const String& input_id, const String& name, const String& placeholder, bool required, const String& value) {
@@ -151,6 +153,7 @@ void addNumberBox(String& html, const String& input_id, const String& name, cons
   }
 
   html += F("></i>");
+  WebServer->sendHeader();
 }
 
 void addLinkBox(String& html, const String& name, const String& url) {
@@ -165,6 +168,7 @@ void addLinkBox(String& html, const String& name, const String& url) {
   html += F("</a>");
   html += F("</label>");
   html += F("</i>");
+  WebServer->sendHeader();
 }
 
 void addListGPIOBox(String& html, const String& input_id, const String& name, uint8_t function, uint8_t nr, bool underline) {
@@ -326,6 +330,7 @@ void addListLinkBox(String& html,
     }
     html += FPSTR(array_P[suported]);
   }
+  WebServer->sendHeader();
   html += F("</select></i>");
 }
 
diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 50a2b1df..9940d311 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -203,7 +203,7 @@ const char NAME_DS18B20[] PROGMEM = "DS18B20";
 const char NAME_DHT11[] PROGMEM = "DHT11";
 const char NAME_DHT22[] PROGMEM = "DHT22";
 const char NAME_SI7021_SONOFF[] PROGMEM = "SI7021 SONOFF";
-const char NAME_HC_SR04[] PROGMEM = "HC-SR04";
+const char NAME_HC_SR04[] PROGMEM = "HC-SR04 [m]";
 const char NAME_BME280[] PROGMEM = "BME280";
 const char NAME_SHT3x[] PROGMEM = "SHT3x";
 const char NAME_SI7021[] PROGMEM = "SI7021";
diff --git a/src/SuplaWebPageConfig.cpp b/src/SuplaWebPageConfig.cpp
index 901ed01c..b0a694db 100644
--- a/src/SuplaWebPageConfig.cpp
+++ b/src/SuplaWebPageConfig.cpp
@@ -65,6 +65,7 @@ void SuplaWebPageConfig::handleConfigSave() {
 void SuplaWebPageConfig::supla_webpage_config(int save) {
   uint8_t selected, suported;
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_CONFIG);
 
@@ -84,5 +85,5 @@ void SuplaWebPageConfig::supla_webpage_config(int save) {
   addFormEnd(webContentBuffer);
 
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index be1774c9..68f39111 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -222,6 +222,8 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   readUrl.reserve(11);
   nr_button.reserve(2);
 
+  WebServer->sendHeaderStart();
+
   if (nr != 0) {
     webContentBuffer += SuplaJavaScript(PATH_BUTTON_SET + String(nr));
     nr_button = nr;
@@ -256,7 +258,7 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_CONTROL);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 #endif
 
@@ -354,6 +356,8 @@ void SuplaWebPageControl::handleButtonSetMCP23017() {
 void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   uint8_t selected;
 
+  WebServer->sendHeaderStart();
+
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_BUTTON_SET);
 
@@ -377,7 +381,7 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_CONTROL);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 
 void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 464cbb8a..62fcbc61 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -108,6 +108,7 @@ void handleOtherSave() {
 void suplaWebPageOther(int save) {
   uint8_t nr, suported, selected;
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_OTHER);
 
@@ -163,7 +164,7 @@ void suplaWebPageOther(int save) {
   addButtonSubmit(webContentBuffer, S_SAVE);
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 #endif
 
@@ -243,7 +244,6 @@ void supla_impulse_counter_set(int save) {
 
   if (nr.toInt() <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt() &&
       ConfigESP->getGpio(nr.toInt(), FUNCTION_IMPULSE_COUNTER) != OFF_GPIO) {
-
     addForm(webContentBuffer, F("post"), PATH_SAVE_IMPULSE_COUNTER_SET + nr);
     addFormHeader(webContentBuffer, S_IMPULSE_COUNTER_SETTINGS_NR + nr);
 
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index a31d974c..ea65e34e 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -224,6 +224,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   nr_relay.reserve(2);
   massage.reserve(MAX_DIRECT_LINKS_SIZE);
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
 
   if (nr != 0) {
@@ -293,7 +294,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_RELAY);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 #endif
 
@@ -310,6 +311,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
   String massage, name, input;
   input.reserve(9);
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_RELAY_SET);
 
@@ -349,7 +351,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
   addFormEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, PATH_RELAY);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 
 void SuplaWebPageRelay::handleRelaySaveSetMCP23017() {
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index b3c3148f..316df408 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -52,12 +52,16 @@ void SuplaWebPageSensor::createWebPageSensor() {
 
 #ifdef SUPLA_DS18B20
 void SuplaWebPageSensor::handleSearchDS() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
   supla_webpage_search(0);
 }
 
 void SuplaWebPageSensor::handleDSSave() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
   for (uint8_t i = 0; i < ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt(); i++) {
     String dsAddr = INPUT_DS18B20_ADDR;
     String dsName = INPUT_DS18B20_NAME;
@@ -219,12 +223,16 @@ void SuplaWebPageSensor::showDS18B20(bool readonly) {
 
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
 void SuplaWebPageSensor::handle1Wire() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
   supla_webpage_1wire(0);
 }
 
 void SuplaWebPageSensor::handle1WireSave() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
 
   uint8_t nr, last_value;
 
@@ -287,6 +295,7 @@ if (!WebServer->isLoggedIn()) { return; }
 void SuplaWebPageSensor::supla_webpage_1wire(int save) {
   uint8_t nr, max;
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_1WIRE);
   webContentBuffer += F("<form method='post' action='");
@@ -339,18 +348,22 @@ void SuplaWebPageSensor::supla_webpage_1wire(int save) {
   webContentBuffer += S_RETURN;
   webContentBuffer += F("</button></a><br><br>");
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 #endif
 
 #if defined(SUPLA_BME280) || defined(SUPLA_SI7021) || defined(SUPLA_SHT3x) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
 void SuplaWebPageSensor::handlei2c() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
   supla_webpage_i2c(0);
 }
 
 void SuplaWebPageSensor::handlei2cSave() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
 
   String input;
   uint8_t key;
@@ -447,6 +460,7 @@ if (!WebServer->isLoggedIn()) { return; }
 void SuplaWebPageSensor::supla_webpage_i2c(int save) {
   uint8_t selected;
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_I2C);
 
@@ -517,18 +531,22 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
   addFormEnd(webContentBuffer);
 
   addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 #endif
 
 #if defined(SUPLA_MAX6675)
 void SuplaWebPageSensor::handleSpi() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
   supla_webpage_spi(0);
 }
 
 void SuplaWebPageSensor::handleSpiSave() {
-if (!WebServer->isLoggedIn()) { return; }
+  if (!WebServer->isLoggedIn()) {
+    return;
+  }
 
   String input;
   uint8_t key;
@@ -570,6 +588,7 @@ if (!WebServer->isLoggedIn()) { return; }
 void SuplaWebPageSensor::supla_webpage_spi(int save) {
   uint8_t nr, suported, selected;
 
+  WebServer->sendHeaderStart();
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_SPI);
   webContentBuffer += F("<form method='post' action='");
@@ -598,6 +617,6 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
   webContentBuffer += F("'><button>");
   webContentBuffer += S_RETURN;
   webContentBuffer += F("</button></a><br><br>");
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 #endif
\ No newline at end of file
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 626fdfed..a192eab9 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -142,6 +142,8 @@ void SuplaWebServer::handleDeviceSettings() {
 }
 
 void SuplaWebServer::supla_webpage_start(int save) {
+  WebServer->sendHeaderStart();
+
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript();
 
@@ -177,7 +179,7 @@ void SuplaWebServer::supla_webpage_start(int save) {
   addButton(webContentBuffer, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
   addButton(webContentBuffer, F("Narzędzia"), PATH_TOOLS);
 
-  WebServer->sendContent();
+  WebServer->sendHeaderEnd();
 }
 
 void SuplaWebServer::supla_webpage_reboot() {

From 51da4f4ea5e49b96218946eb7c77b6d5ca9f8393 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sat, 27 Feb 2021 21:34:21 +0100
Subject: [PATCH 137/165] Update SuplaWebPageControl.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Poprawienie zależności usuwające błąd komplilacji
OPTIONS -DATOMIC_FS_UPDATE -DBEARSSL_SSL_BASIC -DSUPLA_BUTTON -DSUPLA_CONFIG -DSUPLA_OLED -DSUPLA_OTA
/tmp/arduino-sketch-14B1289FE481394AF804F1F69A9FDB84/sketch/SuplaWebPageControl.cpp: In member function 'void SuplaWebPageControl::handleButtonSaveSet()':
/tmp/arduino-sketch-14B1289FE481394AF804F1F69A9FDB84/sketch/SuplaWebPageControl.cpp:190:11: error: 'INPUT_RELAY_LEVEL' was not declared in this scope
   input = INPUT_RELAY_LEVEL;
/tmp/arduino-sketch-14B1289FE481394AF804F1F69A9FDB84/sketch/SuplaWebPageControl.cpp: In member function 'void SuplaWebPageControl::supla_webpage_button_set(int, int)':
/tmp/arduino-sketch-14B1289FE481394AF804F1F69A9FDB84/sketch/SuplaWebPageControl.cpp:245:33: error: 'INPUT_RELAY_LEVEL' was not declared in this scope
   addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
Error during build: exit status 1
---
 src/SuplaWebPageControl.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 68f39111..f9b8cdb8 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -187,6 +187,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
     ConfigManager->setElement(key, INVERSED_BUTTON, 0);
   }
 
+#ifdef SUPLA_RELAY
   input = INPUT_RELAY_LEVEL;
   input += nr_button;
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
@@ -195,6 +196,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   else {
     ConfigManager->setElement(key, PULL_UP_BUTTON, 0);
   }
+#endif
 
   input = INPUT_BUTTON_EVENT;
   input += nr_button;
@@ -241,8 +243,10 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET + nr_button);
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
+#ifdef SUPLA_RELAY
   selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
+#endif
 
   selected = ConfigESP->getInversed(nr_button.toInt(), FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócona logika", selected);

From 845eedc0a1638bcbcef0ffbc355b72f5e9eac973 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 08:42:15 +0100
Subject: [PATCH 138/165] poprawa kompilacji dla samego OLEDa

---
 src/GUI-Generic_Config.h    | 8 ++++----
 src/SuplaWebPageControl.cpp | 8 ++++----
 src/SuplaWebPageControl.h   | 1 +
 src/SuplaWebPageSensor.cpp  | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index dcfd369d..8c98d55f 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -1,10 +1,6 @@
 #ifndef GUI_Generic_Config_h
 #define GUI_Generic_Config_h
 
-#ifndef DEBUG_MODE
-#define supla_lib_config_h_  // silences unnecessary debug messages "should be disabled by default"
-#endif
-
 // #define USE_CUSTOM
 
 // User configuration
@@ -58,6 +54,10 @@
 
 #endif  // USE_CUSTOM
 
+#ifndef DEBUG_MODE
+#define supla_lib_config_h_  // silences unnecessary debug messages "should be disabled by default"
+#endif
+
 #if defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_OLED) || defined(SUPLA_RGBW)
 #if !defined(SUPLA_BUTTON)
 #define SUPLA_BUTTON
diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 68f39111..c12633a7 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -187,7 +187,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
     ConfigManager->setElement(key, INVERSED_BUTTON, 0);
   }
 
-  input = INPUT_RELAY_LEVEL;
+  input = INPUT_BUTTON_LEVEL;
   input += nr_button;
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
     ConfigManager->setElement(key, PULL_UP_BUTTON, 1);
@@ -242,7 +242,7 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
   selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
 
   selected = ConfigESP->getInversed(nr_button.toInt(), FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócona logika", selected);
@@ -365,7 +365,7 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   addFormHeader(webContentBuffer, F("Ustawienia dla przycisków"));
 
   selected = ConfigESP->getPullUp(1, FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL, "Wewnętrzny pull-up", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL, "Wewnętrzny pull-up", selected);
 
   selected = ConfigESP->getInversed(1, FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED, "Odwrócona logika", selected);
@@ -397,7 +397,7 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   input = INPUT_BUTTON_EVENT;
   event = WebServer->httpServer->arg(input).toInt();
 
-  input = INPUT_RELAY_LEVEL;
+  input = INPUT_BUTTON_LEVEL;
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
     pullup = 1;
   }
diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index 4a2cb176..32f24377 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -14,6 +14,7 @@
 #define INPUT_TRIGGER           "trs"
 #define INPUT_BUTTON_SET        "bts"
 #define INPUT_BUTTON_GPIO       "btg"
+#define INPUT_BUTTON_LEVEL      "ibl"
 #define INPUT_BUTTON_INVERSED   "ibi"
 #define INPUT_BUTTON_EVENT      "icl"
 #define INPUT_BUTTON_ACTION     "bta"
diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 316df408..7a2067f3 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -31,7 +31,7 @@ void SuplaWebPageSensor::createWebPageSensor() {
 #endif
 #endif
 
-#if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_MCP23017)
+#if defined(SUPLA_BME280) || defined(SUPLA_SHT3x) || defined(SUPLA_SI7021) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
   path = PATH_START;
   path += PATH_I2C;
   WebServer->httpServer->on(path, std::bind(&SuplaWebPageSensor::handlei2c, this));

From 1167a2cf1ed27a73131700f353e27715b6889fed Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 08:57:54 +0100
Subject: [PATCH 139/165] Update Markup.cpp

---
 src/Markup.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Markup.cpp b/src/Markup.cpp
index 3daad3b7..1d64c9a7 100644
--- a/src/Markup.cpp
+++ b/src/Markup.cpp
@@ -341,6 +341,7 @@ void addButton(String& html, const String& name, const String& url) {
   html += name;
   html += F("</button></a>");
   html += F("<br><br>");
+  WebServer->sendHeader();
 }
 
 void addButtonSubmit(String& html, const String& name) {
@@ -348,6 +349,7 @@ void addButtonSubmit(String& html, const String& name) {
   html += name;
   html += F("</button>");
   html += F("<br><br>");
+  WebServer->sendHeader();
 }
 
 void addListGPIOSelect(String& html, const String& input_id, uint8_t function, uint8_t nr) {

From 407c6a69117b48ac26725b0778b365ceea76ddd3 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 08:58:13 +0100
Subject: [PATCH 140/165] GUI-Generic 1.3.9

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index a1cd4944..dc70d160 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.8"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.9"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC

From bb232defb7c3227dacadb713eacf2333e75950ba Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 11:05:36 +0100
Subject: [PATCH 141/165] poprawa kompilacji SuplaWebPageStatusLed_h

---
 src/SuplaWebPageStatusLed.cpp | 2 +-
 src/SuplaWebPageStatusLed.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
index 92bf7eac..1374195d 100644
--- a/src/SuplaWebPageStatusLed.cpp
+++ b/src/SuplaWebPageStatusLed.cpp
@@ -1,5 +1,5 @@
 #include "SuplaWebPageStatusLed.h"
-#include "SuplaDeviceGUI.h"
+
 #include "SuplaWebServer.h"
 #include "GUIGenericCommon.h"
 #include "Markup.h"
diff --git a/src/SuplaWebPageStatusLed.h b/src/SuplaWebPageStatusLed.h
index c2d34dc4..e2d6d9fc 100644
--- a/src/SuplaWebPageStatusLed.h
+++ b/src/SuplaWebPageStatusLed.h
@@ -1,6 +1,8 @@
 #ifndef SuplaWebPageStatusLed_h
 #define SuplaWebPageStatusLed_h
 
+#include "SuplaDeviceGUI.h"
+
 #ifdef SUPLA_LED
 #define PATH_LED        "led"
 #define PATH_SAVE_LED   "saveled"

From 412846ad59e49ddde117fdbf58cfc68ae9d9e260 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 12:13:17 +0100
Subject: [PATCH 142/165] =?UTF-8?q?Przeniesienie=20sterowanie=20LED=20do?=
 =?UTF-8?q?=20konfiguracji=20przeka=C5=BAnik=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini                |  2 +-
 src/GUI-Generic_Config.h      |  2 +-
 src/SuplaWebPageRelay.cpp     | 30 +++++++++++++++
 src/SuplaWebPageRelay.h       |  7 ++++
 src/SuplaWebPageStatusLed.cpp | 71 -----------------------------------
 src/SuplaWebPageStatusLed.h   | 18 ---------
 src/SuplaWebServer.cpp        |  8 ----
 7 files changed, 39 insertions(+), 99 deletions(-)
 delete mode 100644 src/SuplaWebPageStatusLed.cpp
 delete mode 100644 src/SuplaWebPageStatusLed.h

diff --git a/platformio.ini b/platformio.ini
index dc70d160..b473a843 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.3.9"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.4.0"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/GUI-Generic_Config.h b/src/GUI-Generic_Config.h
index 8c98d55f..8f0992ce 100644
--- a/src/GUI-Generic_Config.h
+++ b/src/GUI-Generic_Config.h
@@ -64,7 +64,7 @@
 #endif
 #endif
 
-#if defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_PUSHOVER) || defined(SUPLA_DIRECT_LINKS)
+#if defined(SUPLA_ROLLERSHUTTER) || defined(SUPLA_PUSHOVER) || defined(SUPLA_DIRECT_LINKS) || defined(SUPLA_LED)
 #if !defined(SUPLA_RELAY)
 #define SUPLA_RELAY
 #endif
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index ea65e34e..6467cbf4 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -187,6 +187,25 @@ void SuplaWebPageRelay::handleRelaySaveSet() {
   input = INPUT_CONDITIONS_MAX;
   ConfigManager->setElement(KEY_CONDITIONS_MAX, (nr_relay.toInt() - 1), WebServer->httpServer->arg(input).c_str());
 
+#if defined(SUPLA_LED)
+  input = INPUT_LED;
+  input += nr_relay;
+  if (!WebServer->saveGPIO(input, FUNCTION_LED, nr_relay.toInt())) {
+    supla_webpage_relay_set(6, nr_relay.toInt());
+    return;
+  }
+
+  if (ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_LED) != OFF_GPIO) {
+    gpio = ConfigESP->getGpio(nr_relay.toInt(), FUNCTION_LED);
+    key = KEY_GPIO + gpio;
+    input = INPUT_LEVEL_LED;
+    input += nr_relay;
+
+    ConfigManager->setElement(key, INVERSED_BUTTON, WebServer->httpServer->arg(input).toInt());
+  }
+
+#endif
+
 #if defined(SUPLA_PUSHOVER)
   if (nr_relay.toInt() <= MAX_PUSHOVER_MESSAGE) {
     input = INPUT_PUSHOVER;
@@ -251,6 +270,17 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   addListBox(webContentBuffer, INPUT_RELAY_MEMORY + nr_relay, S_REACTION_AFTER_RESET, MEMORY_P, 3, selected);
   addFormHeaderEnd(webContentBuffer);
 
+#if defined(SUPLA_LED)
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" LED"));
+
+  addListGPIOBox(webContentBuffer, INPUT_LED + nr_relay, F("LED"), FUNCTION_LED, nr_relay.toInt());
+
+  selected = ConfigESP->getInversed(nr_relay.toInt(), FUNCTION_LED);
+  addListBox(webContentBuffer, INPUT_LEVEL_LED + nr_relay, S_STATE_CONTROL, LEVEL_P, 2, selected);
+
+  addFormHeaderEnd(webContentBuffer);
+#endif
+
 #if defined(SUPLA_PUSHOVER)
   if (nr_relay.toInt() < MAX_PUSHOVER_MESSAGE) {
     addFormHeader(webContentBuffer, F("Pushover"));
diff --git a/src/SuplaWebPageRelay.h b/src/SuplaWebPageRelay.h
index db807fbd..8fc6cdcc 100644
--- a/src/SuplaWebPageRelay.h
+++ b/src/SuplaWebPageRelay.h
@@ -71,6 +71,13 @@ class SuplaWebPageRelay {
   void handleRelaySaveSetMCP23017();
   void handleRelaySetMCP23017();
 #endif
+
+#if defined(SUPLA_LED)
+#define PATH_LED        "led"
+#define PATH_SAVE_LED   "saveled"
+#define INPUT_LED       "led"
+#define INPUT_LEVEL_LED "ill"
+#endif
 };
 
 extern SuplaWebPageRelay* WebPageRelay;
diff --git a/src/SuplaWebPageStatusLed.cpp b/src/SuplaWebPageStatusLed.cpp
deleted file mode 100644
index 1374195d..00000000
--- a/src/SuplaWebPageStatusLed.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "SuplaWebPageStatusLed.h"
-
-#include "SuplaWebServer.h"
-#include "GUIGenericCommon.h"
-#include "Markup.h"
-
-#ifdef SUPLA_LED
-void createWebStatusLed() {
-  WebServer->httpServer->on(getURL(PATH_LED), handleStatusLed);
-  WebServer->httpServer->on(getURL(PATH_SAVE_LED), handleStatusLedSave);
-}
-
-void handleStatusLed() {
-  if (!WebServer->isLoggedIn()) {
-    return;
-  }
-  webStatusLed(0);
-}
-
-void handleStatusLedSave() {
-  uint8_t nr;
-
-  if (!WebServer->isLoggedIn()) {
-    return;
-  }
-
-  if (strcmp(WebServer->httpServer->arg(INPUT_LEVEL_LED).c_str(), "") != 0) {
-    ConfigManager->set(KEY_LEVEL_LED, WebServer->httpServer->arg(INPUT_LEVEL_LED).c_str());
-  }
-
-  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
-    if (!WebServer->saveGPIO(INPUT_LED, FUNCTION_LED, nr)) {
-      webStatusLed(6);
-      return;
-    }
-  }
-
-  switch (ConfigManager->save()) {
-    case E_CONFIG_OK:
-      webStatusLed(1);
-      break;
-    case E_CONFIG_FILE_OPEN:
-      webStatusLed(2);
-      break;
-  }
-}
-
-void webStatusLed(int save) {
-  uint8_t nr, selected;
-
-  WebServer->sendHeaderStart();
-  webContentBuffer += SuplaSaveResult(save);
-  webContentBuffer += SuplaJavaScript(PATH_LED);
-  addForm(webContentBuffer, F("post"), PATH_SAVE_LED);
-
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" LED"));
-  selected = ConfigManager->get(KEY_LEVEL_LED)->getValueInt();
-  addListBox(webContentBuffer, INPUT_LEVEL_LED, S_STATE_CONTROL, LEVEL_P, 2, selected);
-
-  for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RELAY)->getValueInt(); nr++) {
-    addListGPIOBox(webContentBuffer, INPUT_LED, F("LED"), FUNCTION_LED, nr);
-  }
-
-  addFormHeaderEnd(webContentBuffer);
-
-  addButtonSubmit(webContentBuffer, S_SAVE);
-  addFormEnd(webContentBuffer);
-  addButton(webContentBuffer, S_RETURN, PATH_DEVICE_SETTINGS);
-  WebServer->sendHeaderEnd();
-}
-#endif
\ No newline at end of file
diff --git a/src/SuplaWebPageStatusLed.h b/src/SuplaWebPageStatusLed.h
deleted file mode 100644
index e2d6d9fc..00000000
--- a/src/SuplaWebPageStatusLed.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SuplaWebPageStatusLed_h
-#define SuplaWebPageStatusLed_h
-
-#include "SuplaDeviceGUI.h"
-
-#ifdef SUPLA_LED
-#define PATH_LED        "led"
-#define PATH_SAVE_LED   "saveled"
-#define INPUT_LED       "led"
-#define INPUT_LEVEL_LED "ill"
-
-void createWebStatusLed();
-void handleStatusLed();
-void handleStatusLedSave();
-void webStatusLed(int save);
-#endif
-
-#endif  // SuplaWebPageStatusLed_h
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index a192eab9..11e54862 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -20,7 +20,6 @@
 #include "SuplaWebPageControl.h"
 #include "SuplaWebPageRelay.h"
 #include "SuplaWebPageSensor.h"
-#include "SuplaWebPageStatusLed.h"
 #include "SuplaCommonPROGMEM.h"
 #include "SuplaTemplateBoard.h"
 #include "Markup.h"
@@ -78,9 +77,6 @@ void SuplaWebServer::createWebServer() {
   createWebDownload();
   createWebUpload();
   createWebTools();
-#ifdef SUPLA_LED
-  createWebStatusLed();
-#endif
   createWebPageOther();
 }
 
@@ -217,10 +213,6 @@ void SuplaWebServer::deviceSettings(int save) {
   addButton(webContentBuffer, F("KRAŃCÓWKI"), PATH_SWITCH);
 #endif
 
-#ifdef SUPLA_LED
-  addButton(webContentBuffer, F("LED"), PATH_LED);
-#endif
-
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
   addButton(webContentBuffer, S_SENSORS_1WIRE, PATH_1WIRE);
 #endif

From fc7dc7ecf864da7e3cf5a037de266261f7849d8b Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 12:21:57 +0100
Subject: [PATCH 143/165] =?UTF-8?q?Poprawa=20opisu=20do=20LED=20dla=20prze?=
 =?UTF-8?q?ka=C5=BAnika?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformio.ini            | 2 +-
 src/SuplaWebPageRelay.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index b473a843..7ad88c6a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.4.0"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.4.1"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index 6467cbf4..bef5668a 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -271,7 +271,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   addFormHeaderEnd(webContentBuffer);
 
 #if defined(SUPLA_LED)
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" LED"));
+  addFormHeader(webContentBuffer, F("Status załączenia przekaźnika"));
 
   addListGPIOBox(webContentBuffer, INPUT_LED + nr_relay, F("LED"), FUNCTION_LED, nr_relay.toInt());
 

From 809cb08d4d2db585aa23a57fa470df19a9946f7f Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 14:44:16 +0100
Subject: [PATCH 144/165] Update GUIGenericCommon.h

---
 src/GUIGenericCommon.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 09dd8308..17fe8c7b 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -6,7 +6,7 @@
 #else
 #define QUOTE(x)        QUOTE_1(x)
 #define QUOTE_1(x)      #x
-#define INCLUDE_FILE(x) QUOTE(language / x.h)
+#define INCLUDE_FILE(x) QUOTE(language/x.h)
 #include INCLUDE_FILE(UI_LANGUAGE)
 #endif
 

From 60a23eb96efb7a63eddc7cc1246f241a29aed62f Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 14:54:19 +0100
Subject: [PATCH 145/165] Revert "Update SuplaWebPageControl.cpp"

This reverts commit 51da4f4ea5e49b96218946eb7c77b6d5ca9f8393.
---
 src/SuplaWebPageControl.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index f9b8cdb8..68f39111 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -187,7 +187,6 @@ void SuplaWebPageControl::handleButtonSaveSet() {
     ConfigManager->setElement(key, INVERSED_BUTTON, 0);
   }
 
-#ifdef SUPLA_RELAY
   input = INPUT_RELAY_LEVEL;
   input += nr_button;
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
@@ -196,7 +195,6 @@ void SuplaWebPageControl::handleButtonSaveSet() {
   else {
     ConfigManager->setElement(key, PULL_UP_BUTTON, 0);
   }
-#endif
 
   input = INPUT_BUTTON_EVENT;
   input += nr_button;
@@ -243,10 +241,8 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET + nr_button);
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
-#ifdef SUPLA_RELAY
   selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
-#endif
 
   selected = ConfigESP->getInversed(nr_button.toInt(), FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócona logika", selected);

From e51e7a1bee96b5e583569a80a6ad8b2dd1bfa49b Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 14:54:51 +0100
Subject: [PATCH 146/165] Revert "Update SuplaWebPageControl.h"

This reverts commit b265f04d3d6ea47d3fc8cb33daf7985fe7ba9338.
---
 src/SuplaWebPageControl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SuplaWebPageControl.h b/src/SuplaWebPageControl.h
index 1be4a97b..32f24377 100644
--- a/src/SuplaWebPageControl.h
+++ b/src/SuplaWebPageControl.h
@@ -4,7 +4,7 @@
 #include "SuplaWebServer.h"
 #include "SuplaDeviceGUI.h"
 
-#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_OLED) || defined(SUPLA_MCP23017)
+#if defined(SUPLA_BUTTON) || defined(SUPLA_LIMIT_SWITCH) || defined(SUPLA_MCP23017)
 #define PATH_CONTROL            "control"
 #define PATH_SWITCH             "switch"
 #define PATH_SAVE_SWITCH        "saveswitch"

From 2175d6a3d5824c592757f1b1e77a2007e503de50 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 15:02:50 +0100
Subject: [PATCH 147/165] Update SuplaWebPageControl.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Przywrócenie zmian z mastera
---
 src/SuplaWebPageControl.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index 68f39111..c12633a7 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -187,7 +187,7 @@ void SuplaWebPageControl::handleButtonSaveSet() {
     ConfigManager->setElement(key, INVERSED_BUTTON, 0);
   }
 
-  input = INPUT_RELAY_LEVEL;
+  input = INPUT_BUTTON_LEVEL;
   input += nr_button;
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
     ConfigManager->setElement(key, PULL_UP_BUTTON, 1);
@@ -242,7 +242,7 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
   selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
 
   selected = ConfigESP->getInversed(nr_button.toInt(), FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócona logika", selected);
@@ -365,7 +365,7 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   addFormHeader(webContentBuffer, F("Ustawienia dla przycisków"));
 
   selected = ConfigESP->getPullUp(1, FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_RELAY_LEVEL, "Wewnętrzny pull-up", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL, "Wewnętrzny pull-up", selected);
 
   selected = ConfigESP->getInversed(1, FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED, "Odwrócona logika", selected);
@@ -397,7 +397,7 @@ void SuplaWebPageControl::handleButtonSaveSetMCP23017() {
   input = INPUT_BUTTON_EVENT;
   event = WebServer->httpServer->arg(input).toInt();
 
-  input = INPUT_RELAY_LEVEL;
+  input = INPUT_BUTTON_LEVEL;
   if (strcmp(WebServer->httpServer->arg(input).c_str(), "") != 0) {
     pullup = 1;
   }

From 4ac64fcc7da1fb40b569e968b5e7d5903b9fbafe Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 17:37:32 +0100
Subject: [PATCH 148/165] =?UTF-8?q?poprawa=20kompilacji=20t=C5=82umacze?=
 =?UTF-8?q?=C5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GUIGenericCommon.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 09dd8308..17fe8c7b 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -6,7 +6,7 @@
 #else
 #define QUOTE(x)        QUOTE_1(x)
 #define QUOTE_1(x)      #x
-#define INCLUDE_FILE(x) QUOTE(language / x.h)
+#define INCLUDE_FILE(x) QUOTE(language/x.h)
 #include INCLUDE_FILE(UI_LANGUAGE)
 #endif
 

From f89cb049b9dc2ab81455c2498550d5775308e78e Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 17:49:56 +0100
Subject: [PATCH 149/165] Revert "Update GUIGenericCommon.h"

This reverts commit 809cb08d4d2db585aa23a57fa470df19a9946f7f.
---
 src/GUIGenericCommon.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 17fe8c7b..09dd8308 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -6,7 +6,7 @@
 #else
 #define QUOTE(x)        QUOTE_1(x)
 #define QUOTE_1(x)      #x
-#define INCLUDE_FILE(x) QUOTE(language/x.h)
+#define INCLUDE_FILE(x) QUOTE(language / x.h)
 #include INCLUDE_FILE(UI_LANGUAGE)
 #endif
 

From 8b8cf504458a65f33edfeee37f8f3e41ccc77366 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 18:36:17 +0100
Subject: [PATCH 150/165] =?UTF-8?q?Brak=20S=5FSETTING=5FFOR=20w=20plikach?=
 =?UTF-8?q?=20t=C5=82umacze=C5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/language/de.h | 1 +
 src/language/en.h | 1 +
 src/language/es.h | 1 +
 src/language/fr.h | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/language/de.h b/src/language/de.h
index f1031869..da931687 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -1,6 +1,7 @@
 #ifndef _LANGUAGE_DE_S_H_
 #define _LANGUAGE_DE_S_H_
 
+#define S_SETTING_FOR                                          "Einstellungen für"
 #define S_SETTING_WIFI_SSID                                    "WIFI Einstellung"
 #define S_WIFI_SSID                                            "WIFI Name"
 #define S_WIFI_PASS                                            "Passwort"
diff --git a/src/language/en.h b/src/language/en.h
index 8dcabaa4..44973a08 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -1,6 +1,7 @@
 #ifndef _LANGUAGE_EN_S_H_
 #define _LANGUAGE_EN_S_H_
 
+#define S_SETTING_FOR                                          "Setting for"
 #define S_SETTING_WIFI_SSID                                    "Setting WIFI"
 #define S_WIFI_SSID                                            "Name WIFI"
 #define S_WIFI_PASS                                            "Password"
diff --git a/src/language/es.h b/src/language/es.h
index 1e716d81..f76ab3d9 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -4,6 +4,7 @@
 // Translated by EñE Partycja Gajek-Nowrot
 // Checked by elmaya
 
+#define S_SETTING_FOR                                          "Configuraciones para"
 #define S_SETTING_WIFI_SSID                                    "Configuración de WIFI"
 #define S_WIFI_SSID                                            "Nombre WIFI"
 #define S_WIFI_PASS                                            "Contraseña"
diff --git a/src/language/fr.h b/src/language/fr.h
index b9184784..b8a04382 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -2,6 +2,7 @@
 #define _LANGUAGE_FR_S_H_
 
 // translated by Fryga
+#define S_SETTING_FOR                                          "Paramètres pour "
 #define S_SETTING_WIFI_SSID                                    "Mettre à jour du WIFI"
 #define S_WIFI_SSID                                            "Nom du WIFI"
 #define S_WIFI_PASS                                            "Mot de passe"
@@ -104,4 +105,4 @@
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Modifier la valeur"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Paramètres Compteur d'impulsions No."
 
-#endif  // _LANGUAGE_FR_S_H_
\ No newline at end of file
+#endif  // _LANGUAGE_FR_S_H_

From 67a5e7fb41366ae09adba909540ca7991f0c8f57 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 20:01:47 +0100
Subject: [PATCH 151/165] =?UTF-8?q?Uzupe=C5=82nianie=20t=C5=82umacze=C5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageControl.cpp |  4 ++--
 src/SuplaWebPageTools.cpp   | 10 +++++-----
 src/SuplaWebPageUpload.cpp  |  4 ++--
 src/SuplaWebServer.cpp      |  2 +-
 src/language/de.h           |  4 ++++
 src/language/en.h           |  4 ++++
 src/language/es.h           |  4 ++++
 src/language/fr.h           |  4 ++++
 src/language/pl.h           |  4 ++++
 9 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index c12633a7..b5e7c054 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -117,7 +117,7 @@ void SuplaWebPageControl::supla_webpage_control(int save) {
   webContentBuffer += SuplaJavaScript(PATH_CONTROL);
   addForm(webContentBuffer, F("post"), PATH_SAVE_CONTROL);
 
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_BUTTONS));
+  addFormHeader(webContentBuffer, S_GPIO_SETTINGS_FOR_BUTTONS);
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     countFreeGpio = 32;
@@ -316,7 +316,7 @@ void SuplaWebPageControl::suplaWebpageLimitSwitch(int save) {
   webContentBuffer += SuplaJavaScript(PATH_SWITCH);
   addForm(webContentBuffer, F("post"), PATH_SAVE_SWITCH);
 
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR_LIMIT_SWITCH));
+  addFormHeader(webContentBuffer, S_GPIO_SETTINGS_FOR_LIMIT_SWITCH);
 
   if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt() != FUNCTION_OFF) {
     countFreeGpio = 32;
diff --git a/src/SuplaWebPageTools.cpp b/src/SuplaWebPageTools.cpp
index f77d8b07..c8d1f2a4 100644
--- a/src/SuplaWebPageTools.cpp
+++ b/src/SuplaWebPageTools.cpp
@@ -20,19 +20,19 @@ void handleTools() {
     return;
   }
 
-  addFormHeader(webContentBuffer, F("Narzędzia"));
+  addFormHeader(webContentBuffer, S_TOOLS);
   //#ifdef SUPLA_BUTTON
-  addButton(webContentBuffer, F("Zapisz konfigurację"), PATH_DOWNLOAD);
+  addButton(webContentBuffer, S_SAVE_CONFIGURATION, PATH_DOWNLOAD);
   //#endif
   //#ifdef SUPLA_BUTTON
-  addButton(webContentBuffer, F("Wczytaj konfigurację"), PATH_UPLOAD);
+  addButton(webContentBuffer, S_LOAD_CONFIGURATION, PATH_UPLOAD);
   //#endif
 #ifdef SUPLA_OTA
   addButton(webContentBuffer, S_UPDATE, PATH_UPDATE_HENDLE);
 #endif
-  addButton(webContentBuffer, F("Przywróć ustawienia fabryczne"), PATH_FACTORY_RESET);
+  addButton(webContentBuffer, S_RESTORE_FACTORY_SETTING, PATH_FACTORY_RESET);
   addFormHeaderEnd(webContentBuffer);
   addButton(webContentBuffer, S_RETURN, "");
 
   WebServer->sendContent();
-}
\ No newline at end of file
+}
diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index a533bd74..32c05f66 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -38,7 +38,7 @@ void handleUpload(int save) {
   webContentBuffer += SuplaJavaScript(PATH_UPLOAD);
   webContentBuffer += F("<div class='w'>");
   webContentBuffer += F("<h3>");
-  webContentBuffer += F("Wgraj konfiguracje");
+  webContentBuffer += S_LOAD_CONFIGURATION;
   webContentBuffer += F("</h3>");
   webContentBuffer += F("<br>");
   webContentBuffer += FPSTR(uploadIndex);
@@ -82,4 +82,4 @@ void handleFileUpload() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 11e54862..0da024ca 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -173,7 +173,7 @@ void SuplaWebServer::supla_webpage_start(int save) {
   addFormEnd(webContentBuffer);
 
   addButton(webContentBuffer, S_DEVICE_SETTINGS, PATH_DEVICE_SETTINGS);
-  addButton(webContentBuffer, F("Narzędzia"), PATH_TOOLS);
+  addButton(webContentBuffer, S_TOOLS, PATH_TOOLS);
 
   WebServer->sendHeaderEnd();
 }
diff --git a/src/language/de.h b/src/language/de.h
index da931687..452b3206 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -15,6 +15,10 @@
 #define S_ROLLERSHUTTERS                                       "Schalousien"
 #define S_SAVE                                                 "Speichern"
 #define S_DEVICE_SETTINGS                                      "Gerät Einstellung"
+#define S_TOOLS                                                "Werkzeuge"
+#define S_SAVE_CONFIGURATION                                   "Konfiguration speichern"
+#define S_LOAD_CONFIGURATION                                   "Konfiguration laden"
+#define S_RESTORE_FACTORY_SETTING                              "Stellen Sie die Werkseinstellungen wieder her"
 #define S_UPDATE                                               "Aktualisierung"
 #define S_RESTART                                              "Neustart"
 #define S_RETURN                                               "Zurück"
diff --git a/src/language/en.h b/src/language/en.h
index 44973a08..a1edd0b7 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -15,6 +15,10 @@
 #define S_ROLLERSHUTTERS                                       "Roller shuter"
 #define S_SAVE                                                 "Save"
 #define S_DEVICE_SETTINGS                                      "Device settings"
+#define S_TOOLS                                                "Tools"
+#define S_SAVE_CONFIGURATION                                   "Save configuration"
+#define S_LOAD_CONFIGURATION                                   "Load configuration"
+#define S_RESTORE_FACTORY_SETTING                              "Restore factory settings"
 #define S_UPDATE                                               "Update"
 #define S_RESTART                                              "Restart"
 #define S_RETURN                                               "Return"
diff --git a/src/language/es.h b/src/language/es.h
index f76ab3d9..bad18b1d 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -18,6 +18,10 @@
 #define S_ROLLERSHUTTERS                                       "Persianas"
 #define S_SAVE                                                 "Guardar"
 #define S_DEVICE_SETTINGS                                      "Configuración de dispositivo"
+#define S_TOOLS                                                "Instrumentos"
+#define S_SAVE_CONFIGURATION                                   "Guardar configuración"
+#define S_LOAD_CONFIGURATION                                   "Cargar configuración"
+#define S_RESTORE_FACTORY_SETTING                              "Restaurar la configuración de fábrica"
 #define S_UPDATE                                               "Actualización"
 #define S_RESTART                                              "Reiniciar"
 #define S_RETURN                                               "Volver"
diff --git a/src/language/fr.h b/src/language/fr.h
index b8a04382..08eff4d4 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -16,6 +16,10 @@
 #define S_ROLLERSHUTTERS                                       "Volet roulant"
 #define S_SAVE                                                 "Enregistrer"
 #define S_DEVICE_SETTINGS                                      "Paramètres du module"
+#define S_TOOLS                                                "Outils"
+#define S_SAVE_CONFIGURATION                                   "Enregistrer la configuration"
+#define S_LOAD_CONFIGURATION                                   "Charger la configuration"
+#define S_RESTORE_FACTORY_SETTING                              "Rétablir les paramètres d'usine"
 #define S_UPDATE                                               "Mettre à jour"
 #define S_RESTART                                              "Réinitialisation"
 #define S_RETURN                                               "Retour"
diff --git a/src/language/pl.h b/src/language/pl.h
index f6a6251b..db2ba473 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -16,6 +16,10 @@
 #define S_ROLLERSHUTTERS                                       "Rolety"
 #define S_SAVE                                                 "Zapisz"
 #define S_DEVICE_SETTINGS                                      "Ustawienia urządzenia"
+#define S_TOOLS                                                "Narzędzia"
+#define S_SAVE_CONFIGURATION                                   "Zapisz konfigurację"
+#define S_LOAD_CONFIGURATION                                   "Wczytaj konfigurację"
+#define S_RESTORE_FACTORY_SETTING                              "Przywróć ustawienia fabryczne"
 #define S_UPDATE                                               "Aktualizacja"
 #define S_RESTART                                              "Restart"
 #define S_RETURN                                               "Powrót"

From 0990663e0abae32f4cb8b08f70c00c517006df55 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 20:31:28 +0100
Subject: [PATCH 152/165] =?UTF-8?q?t=C5=82umaczenie=20S=5FGENERATE=5FGUID?=
 =?UTF-8?q?=5FAND=5FKEY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageUpload.cpp | 8 +++++---
 src/language/de.h          | 3 +++
 src/language/en.h          | 3 +++
 src/language/es.h          | 4 ++++
 src/language/fr.h          | 3 +++
 src/language/pl.h          | 3 +++
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index a533bd74..2cb570a5 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -5,7 +5,7 @@
 static const char uploadIndex[] PROGMEM =
     R"(<form class="formcenter" method="POST" action="/upload" enctype="multipart/form-data">
          <input type="file" accept=".dat" name="config"></br>
-         <input type="checkbox" name='generateGUIDandAUTHKEY' value='1'>Generuj GUID & AUTHKEY</br></br>
+         <input type="checkbox" name='generateGUIDandAUTHKEY' value='1'>{g}</br></br>
          <input type="submit" value="Upload">
      </form>)";
 
@@ -34,6 +34,9 @@ void handleUpload(int save) {
     return;
   }
 
+  String upload = FPSTR(uploadIndex);
+  upload.replace("{g}", S_GENERATE_GUID_AND_KEY);
+
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_UPLOAD);
   webContentBuffer += F("<div class='w'>");
@@ -41,7 +44,7 @@ void handleUpload(int save) {
   webContentBuffer += F("Wgraj konfiguracje");
   webContentBuffer += F("</h3>");
   webContentBuffer += F("<br>");
-  webContentBuffer += FPSTR(uploadIndex);
+  webContentBuffer += upload;
   webContentBuffer += F("</div>");
   webContentBuffer += F("<a href='");
   webContentBuffer += getURL(PATH_TOOLS);
@@ -50,7 +53,6 @@ void handleUpload(int save) {
   webContentBuffer += F("</button></a><br><br>");
 
   WebServer->sendContent();
-  // WebServer->httpServer->send(200, PSTR("text/html"), FPSTR(uploadIndex));
 }
 
 void handleFileUpload() {
diff --git a/src/language/de.h b/src/language/de.h
index da931687..58d489b1 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -104,3 +104,6 @@
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Wertänderung"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Einstellung Impulszähler Nr."
 #endif  // _LANGUAGE_DE_S_H_
+
+//#### SuplaWebPageUpload.cpp ####
+#define S_GENERATE_GUID_AND_KEY "Generieren GUID & AUTHKEY"
\ No newline at end of file
diff --git a/src/language/en.h b/src/language/en.h
index 44973a08..ed0d53b1 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -104,4 +104,7 @@
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Change value"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Settings IC nr."
 
+//#### SuplaWebPageUpload.cpp ####
+#define S_GENERATE_GUID_AND_KEY "Generate GUID & AUTHKEY"
+
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index f76ab3d9..eead5ad8 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -107,4 +107,8 @@
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Cambia el valor"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Configuración contador de impulsos no."
 
+//#### SuplaWebPageUpload.cpp ####
+#define S_GENERATE_GUID_AND_KEY "Generar GUID & AUTHKEY"
+
+
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index b8a04382..c055dcbd 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -105,4 +105,7 @@
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Modifier la valeur"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Paramètres Compteur d'impulsions No."
 
+//#### SuplaWebPageUpload.cpp ####
+#define S_GENERATE_GUID_AND_KEY "Produire GUID & AUTHKEY"
+
 #endif  // _LANGUAGE_FR_S_H_
diff --git a/src/language/pl.h b/src/language/pl.h
index f6a6251b..ce5e760f 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -105,4 +105,7 @@
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Zmień wartość"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Ustawienia IC nr"
 
+//#### SuplaWebPageUpload.cpp ####
+#define S_GENERATE_GUID_AND_KEY "Generuj GUID & AUTHKEY"
+
 #endif  // _LANGUAGE_PL_S_H_

From 702308101d150c517be0f3e73825cb94088b7cd6 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 20:53:04 +0100
Subject: [PATCH 153/165] =?UTF-8?q?t=C5=82umaczenie=20S=5FUPLOAD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageUpload.cpp | 3 ++-
 src/language/de.h          | 6 ++++--
 src/language/en.h          | 1 +
 src/language/es.h          | 2 +-
 src/language/fr.h          | 1 +
 src/language/pl.h          | 1 +
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/SuplaWebPageUpload.cpp b/src/SuplaWebPageUpload.cpp
index 3ca89db8..70063f3e 100644
--- a/src/SuplaWebPageUpload.cpp
+++ b/src/SuplaWebPageUpload.cpp
@@ -6,7 +6,7 @@ static const char uploadIndex[] PROGMEM =
     R"(<form class="formcenter" method="POST" action="/upload" enctype="multipart/form-data">
          <input type="file" accept=".dat" name="config"></br>
          <input type="checkbox" name='generateGUIDandAUTHKEY' value='1'>{g}</br></br>
-         <input type="submit" value="Upload">
+         <input type="submit" value="{u}">
      </form>)";
 
 File dataFile;
@@ -36,6 +36,7 @@ void handleUpload(int save) {
 
   String upload = FPSTR(uploadIndex);
   upload.replace("{g}", S_GENERATE_GUID_AND_KEY);
+  upload.replace("{u}", S_UPLOAD);
 
   webContentBuffer += SuplaSaveResult(save);
   webContentBuffer += SuplaJavaScript(PATH_UPLOAD);
diff --git a/src/language/de.h b/src/language/de.h
index 7243682d..e86569cb 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -107,7 +107,9 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Pull-up"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Wertänderung"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Einstellung Impulszähler Nr."
-#endif  // _LANGUAGE_DE_S_H_
 
 //#### SuplaWebPageUpload.cpp ####
-#define S_GENERATE_GUID_AND_KEY "Generieren GUID & AUTHKEY"
\ No newline at end of file
+#define S_GENERATE_GUID_AND_KEY "Generieren GUID & AUTHKEY"
+#define S_UPLOAD "Hochladen"
+
+#endif  // _LANGUAGE_DE_S_H_
diff --git a/src/language/en.h b/src/language/en.h
index a26bc71a..aeab2526 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -110,5 +110,6 @@
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Generate GUID & AUTHKEY"
+#define S_UPLOAD "Upload"
 
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index 4a8d21ea..f6b3e7c5 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -113,6 +113,6 @@
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Generar GUID & AUTHKEY"
-
+#define S_UPLOAD "Subir"
 
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index 8bd92265..1bc6d373 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -111,5 +111,6 @@
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Produire GUID & AUTHKEY"
+#define S_UPLOAD "Télécharger"
 
 #endif  // _LANGUAGE_FR_S_H_
diff --git a/src/language/pl.h b/src/language/pl.h
index 31a33982..399b09b5 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -111,5 +111,6 @@
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Generuj GUID & AUTHKEY"
+#define S_UPLOAD "Prześlij"
 
 #endif  // _LANGUAGE_PL_S_H_

From 1f1d1f6bdd7d760589117e4a0e91d5b2574476b4 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Sun, 28 Feb 2021 20:54:55 +0100
Subject: [PATCH 154/165] poprawa dla SUPLA_RGBW oraz SUPLA_PUSHOVER

---
 platformio.ini            | 2 +-
 src/SuplaWebPageOther.cpp | 4 ++--
 src/SuplaWebPageOther.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 7ad88c6a..1d99cd97 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.4.1"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.4.2"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 62fcbc61..a56e2481 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -1,7 +1,7 @@
 #include "SuplaWebPageOther.h"
 
 void createWebPageOther() {
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012) || defined(SUPLA_RGBW) || defined(SUPLA_PUSHOVER)
   WebServer->httpServer->on(getURL(PATH_OTHER), handleOther);
   WebServer->httpServer->on(getURL(PATH_SAVE_OTHER), handleOtherSave);
 
@@ -21,7 +21,7 @@ void createWebPageOther() {
 #endif
 }
 
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012) || defined(SUPLA_RGBW) || defined(SUPLA_PUSHOVER)
 void handleOther() {
   if (!WebServer->isLoggedIn()) {
     return;
diff --git a/src/SuplaWebPageOther.h b/src/SuplaWebPageOther.h
index 8ac21b7c..79d0a01d 100644
--- a/src/SuplaWebPageOther.h
+++ b/src/SuplaWebPageOther.h
@@ -9,7 +9,7 @@
 
 void createWebPageOther();
 
-#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012)
+#if defined(SUPLA_HC_SR04) || defined(SUPLA_IMPULSE_COUNTER) || defined(SUPLA_HLW8012) || defined(SUPLA_RGBW) || defined(SUPLA_PUSHOVER)
 void suplaWebPageOther(int save);
 void handleOther();
 void handleOtherSave();

From 3876094aa07cd43439eab380c8d59cc7df8899e5 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 21:03:33 +0100
Subject: [PATCH 155/165] =?UTF-8?q?t=C5=82umaczenie=20dla=20S=5FSETTINGS?=
 =?UTF-8?q?=5FFOR=5FBUTTONS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageControl.cpp | 2 +-
 src/language/de.h           | 3 +++
 src/language/en.h           | 3 +++
 src/language/es.h           | 3 +++
 src/language/fr.h           | 3 +++
 src/language/pl.h           | 3 +++
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index b5e7c054..ed27da4e 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -362,7 +362,7 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   webContentBuffer += SuplaJavaScript(PATH_BUTTON_SET);
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_BUTTON_SET);
-  addFormHeader(webContentBuffer, F("Ustawienia dla przycisków"));
+  addFormHeader(webContentBuffer, S_SETTINGS_FOR_BUTTONS);
 
   selected = ConfigESP->getPullUp(1, FUNCTION_BUTTON);
   addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL, "Wewnętrzny pull-up", selected);
diff --git a/src/language/de.h b/src/language/de.h
index e86569cb..a5839163 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -112,4 +112,7 @@
 #define S_GENERATE_GUID_AND_KEY "Generieren GUID & AUTHKEY"
 #define S_UPLOAD "Hochladen"
 
+//#### SuplaWebPageControl.cpp ####
+#define S_SETTINGS_FOR_BUTTONS "Einstellungen für Schaltflächen"
+
 #endif  // _LANGUAGE_DE_S_H_
diff --git a/src/language/en.h b/src/language/en.h
index aeab2526..7c160328 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -112,4 +112,7 @@
 #define S_GENERATE_GUID_AND_KEY "Generate GUID & AUTHKEY"
 #define S_UPLOAD "Upload"
 
+//#### SuplaWebPageControl.cpp ####
+#define S_SETTINGS_FOR_BUTTONS "Settings for buttons"
+
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index f6b3e7c5..f2972b5c 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -115,4 +115,7 @@
 #define S_GENERATE_GUID_AND_KEY "Generar GUID & AUTHKEY"
 #define S_UPLOAD "Subir"
 
+//#### SuplaWebPageControl.cpp ####
+#define S_SETTINGS_FOR_BUTTONS "Configuración de botones"
+
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index 1bc6d373..f5a79741 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -113,4 +113,7 @@
 #define S_GENERATE_GUID_AND_KEY "Produire GUID & AUTHKEY"
 #define S_UPLOAD "Télécharger"
 
+//#### SuplaWebPageControl.cpp ####
+#define S_SETTINGS_FOR_BUTTONS "Paramètres des boutons"
+
 #endif  // _LANGUAGE_FR_S_H_
diff --git a/src/language/pl.h b/src/language/pl.h
index 399b09b5..0608e6a8 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -113,4 +113,7 @@
 #define S_GENERATE_GUID_AND_KEY "Generuj GUID & AUTHKEY"
 #define S_UPLOAD "Prześlij"
 
+//#### SuplaWebPageControl.cpp ####
+#define S_SETTINGS_FOR_BUTTONS "Ustawienia dla przycisków"
+
 #endif  // _LANGUAGE_PL_S_H_

From 080bd6aed93c8b9f125002fc833f521197064776 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 21:13:50 +0100
Subject: [PATCH 156/165] =?UTF-8?q?t=C5=82umaczenie=20S=5FREVERSE=5FLOGIC?=
 =?UTF-8?q?=20i=20S=5FINTERNAL=5FPULL=5FUP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageControl.cpp | 8 ++++----
 src/language/de.h           | 3 +++
 src/language/en.h           | 2 ++
 src/language/es.h           | 2 ++
 src/language/fr.h           | 3 +++
 src/language/pl.h           | 2 ++
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/SuplaWebPageControl.cpp b/src/SuplaWebPageControl.cpp
index ed27da4e..d7153686 100644
--- a/src/SuplaWebPageControl.cpp
+++ b/src/SuplaWebPageControl.cpp
@@ -242,10 +242,10 @@ void SuplaWebPageControl::supla_webpage_button_set(int save, int nr) {
   addFormHeader(webContentBuffer, S_BUTTON_NR_SETTINGS + nr_button);
 
   selected = ConfigESP->getPullUp(nr_button.toInt(), FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL + nr_button, "Wewnętrzny pull-up", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL + nr_button, S_INTERNAL_PULL_UP, selected);
 
   selected = ConfigESP->getInversed(nr_button.toInt(), FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, "Odwrócona logika", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED + nr_button, S_REVERSE_LOGIC, selected);
 
   selected = ConfigESP->getEvent(nr_button.toInt(), FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT + nr_button, S_REACTION_TO, TRIGGER_P, 3, selected);
@@ -365,10 +365,10 @@ void SuplaWebPageControl::supla_webpage_button_set_MCP23017(int save) {
   addFormHeader(webContentBuffer, S_SETTINGS_FOR_BUTTONS);
 
   selected = ConfigESP->getPullUp(1, FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL, "Wewnętrzny pull-up", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_LEVEL, S_INTERNAL_PULL_UP, selected);
 
   selected = ConfigESP->getInversed(1, FUNCTION_BUTTON);
-  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED, "Odwrócona logika", selected);
+  addCheckBox(webContentBuffer, INPUT_BUTTON_INVERSED, S_REVERSE_LOGIC, selected);
 
   selected = ConfigESP->getEvent(1, FUNCTION_BUTTON);
   addListBox(webContentBuffer, INPUT_BUTTON_EVENT, S_REACTION_TO, TRIGGER_P, 3, selected);
diff --git a/src/language/de.h b/src/language/de.h
index a5839163..ac0378f3 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -114,5 +114,8 @@
 
 //#### SuplaWebPageControl.cpp ####
 #define S_SETTINGS_FOR_BUTTONS "Einstellungen für Schaltflächen"
+#define S_REVERSE_LOGIC "Umgekehrte Logik"
+#define S_INTERNAL_PULL_UP "Interner Klimmzug"
+
 
 #endif  // _LANGUAGE_DE_S_H_
diff --git a/src/language/en.h b/src/language/en.h
index 7c160328..ad64784b 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -114,5 +114,7 @@
 
 //#### SuplaWebPageControl.cpp ####
 #define S_SETTINGS_FOR_BUTTONS "Settings for buttons"
+#define S_REVERSE_LOGIC "Reverse logic"
+#define S_INTERNAL_PULL_UP "Internal pull-up"
 
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index f2972b5c..1bd5881a 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -117,5 +117,7 @@
 
 //#### SuplaWebPageControl.cpp ####
 #define S_SETTINGS_FOR_BUTTONS "Configuración de botones"
+#define S_REVERSE_LOGIC "Lógica inversa"
+#define S_INTERNAL_PULL_UP "Pull-up interno"
 
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index f5a79741..5883dab4 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -115,5 +115,8 @@
 
 //#### SuplaWebPageControl.cpp ####
 #define S_SETTINGS_FOR_BUTTONS "Paramètres des boutons"
+#define S_REVERSE_LOGIC "Logique inversée"
+#define S_INTERNAL_PULL_UP "Pull-up interne"
+
 
 #endif  // _LANGUAGE_FR_S_H_
diff --git a/src/language/pl.h b/src/language/pl.h
index 0608e6a8..a197415b 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -115,5 +115,7 @@
 
 //#### SuplaWebPageControl.cpp ####
 #define S_SETTINGS_FOR_BUTTONS "Ustawienia dla przycisków"
+#define S_REVERSE_LOGIC "Odwrócona logika"
+#define S_INTERNAL_PULL_UP "Wewnętrzny pull-up"
 
 #endif  // _LANGUAGE_PL_S_H_

From 87ec872eecac1044739680ee3d7611f0b8f34bd7 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Sun, 28 Feb 2021 21:41:42 +0100
Subject: [PATCH 157/165] =?UTF-8?q?t=C5=82umaczenia=20w=20SuplaWebPageOthe?=
 =?UTF-8?q?r.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

S_CALIBRATION, S_CALIBRATION_SETTINGS, S_BULB_POWER_W, S_VOLTAGE_V, S_DEPTH_CM, S_SENSOR_READING_DISTANCE
---
 src/SuplaWebPageOther.cpp | 14 +++++++-------
 src/language/de.h         |  7 +++++++
 src/language/en.h         |  8 ++++++++
 src/language/es.h         |  8 ++++++++
 src/language/fr.h         |  7 +++++++
 src/language/pl.h         |  8 ++++++++
 6 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index a56e2481..9ba0100a 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -117,7 +117,7 @@ void suplaWebPageOther(int save) {
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
   addListGPIOBox(webContentBuffer, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
   addListGPIOBox(webContentBuffer, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
-  addNumberBox(webContentBuffer, INPUT_HC_SR04_MAX_SENSOR_READ, F("Głębokość[cm]"), F("maksymalna odległość odczytu czujnika"), false,
+  addNumberBox(webContentBuffer, INPUT_HC_SR04_MAX_SENSOR_READ, S_DEPTH_CM, S_SENSOR_READING_DISTANCE, false,
                ConfigManager->get(KEY_HC_SR04_MAX_SENSOR_READ)->getValue());
   addFormHeaderEnd(webContentBuffer);
 #endif
@@ -137,7 +137,7 @@ void suplaWebPageOther(int save) {
   addListGPIOBox(webContentBuffer, INPUT_CF1, F("CF1"), FUNCTION_CF1);
   addListGPIOBox(webContentBuffer, INPUT_SEL, F("SELi"), FUNCTION_SEL);
   if (ConfigESP->getGpio(FUNCTION_CF) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CF1) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SEL) != OFF_GPIO) {
-    addLinkBox(webContentBuffer, F("Kalibracja"), PATH_HLW8012_CALIBRATE);
+    addLinkBox(webContentBuffer, S_CALIBRATION, PATH_HLW8012_CALIBRATE);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
@@ -321,15 +321,15 @@ void suplaWebpageHLW8012Calibrate(uint8_t save) {
   addFormHeaderEnd(webContentBuffer);
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_HLW8012_CALIBRATE);
-  addFormHeader(webContentBuffer, F("Ustawienia kalibracji"));
-  addNumberBox(webContentBuffer, INPUT_CALIB_POWER, F("Moc żarówki [W]"), F("25"), true);
-  addNumberBox(webContentBuffer, INPUT_CALIB_VOLTAGE, F("Napięcie [V]"), F("230"), true);
+  addFormHeader(webContentBuffer, S_CALIBRATION_SETTINGS);
+  addNumberBox(webContentBuffer, INPUT_CALIB_POWER, S_BULB_POWER_W, F("25"), true);
+  addNumberBox(webContentBuffer, INPUT_CALIB_VOLTAGE, S_VOLTAGE_V, F("230"), true);
   addFormHeaderEnd(webContentBuffer);
 
-  addButtonSubmit(webContentBuffer, F("Kalibracja"));
+  addButtonSubmit(webContentBuffer, S_CALIBRATION);
   addFormEnd(webContentBuffer);
 
   addButton(webContentBuffer, S_RETURN, PATH_OTHER);
   WebServer->sendContent();
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/language/de.h b/src/language/de.h
index ac0378f3..403e93d3 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -117,5 +117,12 @@
 #define S_REVERSE_LOGIC "Umgekehrte Logik"
 #define S_INTERNAL_PULL_UP "Interner Klimmzug"
 
+//#### SuplaWebPageOther.cpp ####
+#define S_CALIBRATION "Kalibrierung"
+#define S_CALIBRATION_SETTINGS "Kalibrierungseinstellungen"
+#define S_BULB_POWER_W "Lampenleistung [W]"
+#define S_VOLTAGE_V "Spannung [V]"
+#define S_DEPTH_CM "Tiefe [cm]"
+#define S_SENSOR_READING_DISTANCE "Sensorleseabstand"
 
 #endif  // _LANGUAGE_DE_S_H_
diff --git a/src/language/en.h b/src/language/en.h
index ad64784b..f13ff57c 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -117,4 +117,12 @@
 #define S_REVERSE_LOGIC "Reverse logic"
 #define S_INTERNAL_PULL_UP "Internal pull-up"
 
+//#### SuplaWebPageOther.cpp ####
+#define S_CALIBRATION "Calibration"
+#define S_CALIBRATION_SETTINGS "Calibration settings"
+#define S_BULB_POWER_W "Bulb power [W]"
+#define S_VOLTAGE_V "Voltage [V]"
+#define S_DEPTH_CM "Depth [cm]"
+#define S_SENSOR_READING_DISTANCE "sensor reading distance"
+
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index 1bd5881a..363e4b9f 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -120,4 +120,12 @@
 #define S_REVERSE_LOGIC "Lógica inversa"
 #define S_INTERNAL_PULL_UP "Pull-up interno"
 
+//#### SuplaWebPageOther.cpp ####
+#define S_CALIBRATION "Calibración"
+#define S_CALIBRATION_SETTINGS "Configuraciones de calibracion"
+#define S_BULB_POWER_W "Potencia de la bombilla [W]"
+#define S_VOLTAGE_V "Voltaje [V]"
+#define S_DEPTH_CM "Profundidad [cm]"
+#define S_SENSOR_READING_DISTANCE "distancia de lectura del sensor"
+
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index 5883dab4..fbec80fb 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -118,5 +118,12 @@
 #define S_REVERSE_LOGIC "Logique inversée"
 #define S_INTERNAL_PULL_UP "Pull-up interne"
 
+//#### SuplaWebPageOther.cpp ####
+#define S_CALIBRATION "Étalonnage"
+#define S_CALIBRATION_SETTINGS "Paramètres d'étalonnage"
+#define S_BULB_POWER_W "Puissance de l'ampoule [W]"
+#define S_VOLTAGE_V "Tension [V]"
+#define S_DEPTH_CM "Profondeur [cm]"
+#define S_SENSOR_READING_DISTANCE "distance de lecture du capteur"
 
 #endif  // _LANGUAGE_FR_S_H_
diff --git a/src/language/pl.h b/src/language/pl.h
index a197415b..cad06a72 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -118,4 +118,12 @@
 #define S_REVERSE_LOGIC "Odwrócona logika"
 #define S_INTERNAL_PULL_UP "Wewnętrzny pull-up"
 
+//#### SuplaWebPageOther.cpp ####
+#define S_CALIBRATION "Kalibracja"
+#define S_CALIBRATION_SETTINGS "Ustawienia kalibracji"
+#define S_BULB_POWER_W "Moc żarówki [W]"
+#define S_VOLTAGE_V "Napięcie [V]"
+#define S_DEPTH_CM "Głębokość [cm]"
+#define S_SENSOR_READING_DISTANCE "maksymalna odległość odczytu czujnika"
+
 #endif  // _LANGUAGE_PL_S_H_

From e8a6222bcbda408278fb370989fcedb77665a3e5 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Mon, 1 Mar 2021 16:04:33 +0100
Subject: [PATCH 158/165] =?UTF-8?q?t=C5=82umaczenie=20SuplaWebPageOther.cp?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GUIGenericCommon.h    |  1 +
 src/SuplaWebPageOther.cpp | 10 +++++-----
 src/language/common.h     | 13 +++++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 src/language/common.h

diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 17fe8c7b..16eb3593 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -1,6 +1,7 @@
 #ifndef GUI_GENERIC_COMMON_H
 #define GUI_GENERIC_COMMON_H
 
+#include "language/common.h"
 #ifndef UI_LANGUAGE
 #include "language/pl.h"
 #else
diff --git a/src/SuplaWebPageOther.cpp b/src/SuplaWebPageOther.cpp
index 9ba0100a..052c8ef6 100644
--- a/src/SuplaWebPageOther.cpp
+++ b/src/SuplaWebPageOther.cpp
@@ -114,7 +114,7 @@ void suplaWebPageOther(int save) {
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_OTHER);
 #ifdef SUPLA_HC_SR04
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HC-SR04"));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_HC_SR04);
   addListGPIOBox(webContentBuffer, INPUT_TRIG_GPIO, F("TRIG"), FUNCTION_TRIG);
   addListGPIOBox(webContentBuffer, INPUT_ECHO_GPIO, F("ECHO"), FUNCTION_ECHO);
   addNumberBox(webContentBuffer, INPUT_HC_SR04_MAX_SENSOR_READ, S_DEPTH_CM, S_SENSOR_READING_DISTANCE, false,
@@ -123,7 +123,7 @@ void suplaWebPageOther(int save) {
 #endif
 
 #ifdef SUPLA_IMPULSE_COUNTER
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" ") + S_IMPULSE_COUNTER);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_IMPULSE_COUNTER);
   addNumberBox(webContentBuffer, INPUT_MAX_IMPULSE_COUNTER, S_QUANTITY, KEY_MAX_IMPULSE_COUNTER, ConfigESP->countFreeGpio(FUNCTION_IMPULSE_COUNTER));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_IMPULSE_COUNTER)->getValueInt(); nr++) {
     addListGPIOLinkBox(webContentBuffer, INPUT_IMPULSE_COUNTER_GPIO, F("IC GPIO"), FUNCTION_IMPULSE_COUNTER, PATH_IMPULSE_COUNTER_SET, nr);
@@ -132,7 +132,7 @@ void suplaWebPageOther(int save) {
 #endif
 
 #ifdef SUPLA_HLW8012
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" HLW8012"));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_HLW8012);
   addListGPIOBox(webContentBuffer, INPUT_CF, F("CF"), FUNCTION_CF);
   addListGPIOBox(webContentBuffer, INPUT_CF1, F("CF1"), FUNCTION_CF1);
   addListGPIOBox(webContentBuffer, INPUT_SEL, F("SELi"), FUNCTION_SEL);
@@ -143,7 +143,7 @@ void suplaWebPageOther(int save) {
 #endif
 
 #ifdef SUPLA_RGBW
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" RGBW/RGB/DIMMER"));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_RGBW_RGB_DIMMER);
   addNumberBox(webContentBuffer, INPUT_RGBW_MAX, S_QUANTITY, KEY_MAX_RGBW, ConfigESP->countFreeGpio());
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_RGBW)->getValueInt(); nr++) {
     addListGPIOBox(webContentBuffer, INPUT_RGBW_RED, F("RED"), FUNCTION_RGBW_RED, nr, false);
@@ -155,7 +155,7 @@ void suplaWebPageOther(int save) {
 #endif
 
 #if defined(SUPLA_PUSHOVER)
-  addFormHeader(webContentBuffer, String(S_SETTING_FOR) + F(" PUSHOVER"));
+  addFormHeader(webContentBuffer, String(S_SETTING_FOR) + S_SPACE + S_PUSHOVER);
   addTextBox(webContentBuffer, INPUT_PUSHOVER_TOKEN, F("Token"), KEY_PUSHOVER_TOKEN, 0, MAX_TOKEN_SIZE, false);
   addTextBox(webContentBuffer, INPUT_PUSHOVER_USER, F("Users"), KEY_PUSHOVER_USER, 0, MAX_USER_SIZE, false);
   addFormHeaderEnd(webContentBuffer);
diff --git a/src/language/common.h b/src/language/common.h
new file mode 100644
index 00000000..51f5797d
--- /dev/null
+++ b/src/language/common.h
@@ -0,0 +1,13 @@
+
+#ifndef LANGUAGE_COMMON_H_
+#define LANGUAGE_COMMON_H_
+
+#define S_SPACE " "
+
+//### Device codes not translated ###
+#define S_HC_SR04 "HC-SR04"
+#define S_HLW8012 "HLW8012"
+#define S_RGBW_RGB_DIMMER "RGBW/RGB/DIMMER"
+#define S_PUSHOVER "PUSHOVER"
+
+#endif /* LANGUAGE_COMMON_H_ */

From 837560e0fd98225aaf54a6e4f718dcdaef64bf49 Mon Sep 17 00:00:00 2001
From: krycha88 <krystian.franieczek@gmail.com>
Date: Mon, 1 Mar 2021 16:24:47 +0100
Subject: [PATCH 159/165] =?UTF-8?q?op=C3=B3=C5=BAnienie=20wysy=C5=82ania?=
 =?UTF-8?q?=20powiadomienia=20pushover?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/SuplaDevice/src/supla/control/pushover.cpp | 8 ++++----
 lib/SuplaDevice/src/supla/control/pushover.h   | 2 +-
 platformio.ini                                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/SuplaDevice/src/supla/control/pushover.cpp b/lib/SuplaDevice/src/supla/control/pushover.cpp
index 7d72b5a1..b996da54 100644
--- a/lib/SuplaDevice/src/supla/control/pushover.cpp
+++ b/lib/SuplaDevice/src/supla/control/pushover.cpp
@@ -22,7 +22,7 @@ namespace Supla {
 namespace Control {
 
 Pushover::Pushover(const char *token, const char *user, bool isSecured)
-    : lastStateSend(false) {
+    : lastMsgReceivedMs(0) {
   setToken(token);
   setUser(user);
   _isSecured = isSecured;
@@ -142,8 +142,8 @@ void Pushover::send() {
 }
 
 void Pushover::iterateAlways() {
-  if (lastStateSend) {
-    lastStateSend = false;
+  if (lastMsgReceivedMs != 0 && millis() - lastMsgReceivedMs > 1000) {
+    lastMsgReceivedMs = 0;
     send();
   }
 }
@@ -151,7 +151,7 @@ void Pushover::iterateAlways() {
 void Pushover::handleAction(int event, int action) {
   (void)(event);
   if (action == SEND_NOTIF_1) {
-    lastStateSend = true;
+    lastMsgReceivedMs = millis();
   }
 }
 
diff --git a/lib/SuplaDevice/src/supla/control/pushover.h b/lib/SuplaDevice/src/supla/control/pushover.h
index ebd01b01..bf026e83 100644
--- a/lib/SuplaDevice/src/supla/control/pushover.h
+++ b/lib/SuplaDevice/src/supla/control/pushover.h
@@ -62,7 +62,7 @@ class Pushover : public Element, public ActionHandler {
   WiFiClient *client = NULL;
   const char *host = "api.pushover.net";
   const char *path = "/1/messages.json";
-  bool lastStateSend;
+  unsigned long lastMsgReceivedMs;
 
   bool _isSecured;
   char _token[MAX_TOKEN_SIZE];
diff --git a/platformio.ini b/platformio.ini
index 1d99cd97..cae98d16 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ default_envs =
 
 
 [common]
-build_flags =   -D BUILD_VERSION='"GUI-Generic 1.4.2"'
+build_flags =   -D BUILD_VERSION='"GUI-Generic 1.4.3"'
                 -w
                 -D ATOMIC_FS_UPDATE
                 -D BEARSSL_SSL_BASIC

From 2c9b6ad7a89df6285c6ba4dc8a2a54f7382761b5 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Mon, 1 Mar 2021 18:03:44 +0100
Subject: [PATCH 160/165] =?UTF-8?q?t=C5=82umaczenie=20SuplaWebPageSensor.c?=
 =?UTF-8?q?pp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageSensor.cpp | 59 ++++++++++++++++++++------------------
 src/language/common.h      | 20 +++++++++++++
 src/language/de.h          |  5 ++++
 src/language/en.h          | 11 +++++--
 src/language/es.h          |  5 ++++
 src/language/fr.h          |  5 ++++
 src/language/pl.h          |  5 ++++
 7 files changed, 79 insertions(+), 31 deletions(-)

diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 7a2067f3..075e3339 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -119,7 +119,9 @@ void SuplaWebPageSensor::supla_webpage_search(int save) {
   webContentBuffer += F("<div class='w'>");
   webContentBuffer += F("<h3>");
   webContentBuffer += S_FOUND;
-  webContentBuffer += F(" DS18b20</h3>");
+  webContentBuffer += S_SPACE;
+  webContentBuffer += S_DS18B20;
+  webContentBuffer += F("</h3>");
   sensors.setOneWire(&ow);
   sensors.begin();
   if (sensors.isParasitePowerMode()) {
@@ -162,7 +164,8 @@ void SuplaWebPageSensor::supla_webpage_search(int save) {
   webContentBuffer += F("</center>");
   webContentBuffer += F("<button type='submit'>");
   webContentBuffer += S_SAVE_FOUND;
-  webContentBuffer += F("DS18b20</button></form>");
+  webContentBuffer += S_DS18B20;
+  webContentBuffer += F("</button></form>");
   webContentBuffer += F("<br><br>");
   webContentBuffer += F("<a href='");
   webContentBuffer += PATH_START;
@@ -302,37 +305,37 @@ void SuplaWebPageSensor::supla_webpage_1wire(int save) {
   webContentBuffer += PATH_SAVE_1WIRE;
   webContentBuffer += F("'>");
 #ifdef SUPLA_DHT11
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" DHT11"));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_DHT11);
   addNumberBox(webContentBuffer, INPUT_MAX_DHT11, S_QUANTITY, KEY_MAX_DHT11, ConfigESP->countFreeGpio(FUNCTION_DHT11));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT11)->getValueInt(); nr++) {
-    addListGPIOBox(webContentBuffer, INPUT_DHT11_GPIO, F("DHT11"), FUNCTION_DHT11, nr);
+    addListGPIOBox(webContentBuffer, INPUT_DHT11_GPIO, S_DHT11, FUNCTION_DHT11, nr);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_DHT22
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" DHT22"));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_DHT22);
   addNumberBox(webContentBuffer, INPUT_MAX_DHT22, S_QUANTITY, KEY_MAX_DHT22, ConfigESP->countFreeGpio(FUNCTION_DHT22));
   for (nr = 1; nr <= ConfigManager->get(KEY_MAX_DHT22)->getValueInt(); nr++) {
-    addListGPIOBox(webContentBuffer, INPUT_DHT22_GPIO, F("DHT22"), FUNCTION_DHT22, nr);
+    addListGPIOBox(webContentBuffer, INPUT_DHT22_GPIO, S_DHT22, FUNCTION_DHT22, nr);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_SI7021_SONOFF
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" Si7021 Sonoff"));
-  addListGPIOBox(webContentBuffer, INPUT_SI7021_SONOFF, F("Si7021 Sonoff"), FUNCTION_SI7021_SONOFF);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_SI7021_SONOFF);
+  addListGPIOBox(webContentBuffer, INPUT_SI7021_SONOFF, S_SI7021_SONOFF, FUNCTION_SI7021_SONOFF);
   addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_DS18B20
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" Multi DS18B20"));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_MULTI_DS18B20);
   addNumberBox(webContentBuffer, INPUT_MAX_DS18B20, S_QUANTITY, KEY_MULTI_MAX_DS18B20, MAX_DS18B20);
   if (ConfigManager->get(KEY_MULTI_MAX_DS18B20)->getValueInt() > 1) {
-    addListGPIOLinkBox(webContentBuffer, INPUT_MULTI_DS_GPIO, F("MULTI DS18B20"), FUNCTION_DS18B20, PATH_MULTI_DS);
+    addListGPIOLinkBox(webContentBuffer, INPUT_MULTI_DS_GPIO, S_MULTI_DS18B20, FUNCTION_DS18B20, PATH_MULTI_DS);
   }
   else {
-    addListGPIOBox(webContentBuffer, INPUT_MULTI_DS_GPIO, F("MULTI DS18B20"), FUNCTION_DS18B20);
+    addListGPIOBox(webContentBuffer, INPUT_MULTI_DS_GPIO, S_MULTI_DS18B20, FUNCTION_DS18B20);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
@@ -465,16 +468,16 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
   webContentBuffer += SuplaJavaScript(PATH_I2C);
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_I2C);
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" i2c"));
-  addListGPIOBox(webContentBuffer, INPUT_SDA_GPIO, F("SDA"), FUNCTION_SDA);
-  addListGPIOBox(webContentBuffer, INPUT_SCL_GPIO, F("SCL"), FUNCTION_SCL);
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_I2C);
+  addListGPIOBox(webContentBuffer, INPUT_SDA_GPIO, S_SDA, FUNCTION_SDA);
+  addListGPIOBox(webContentBuffer, INPUT_SCL_GPIO, S_SCL, FUNCTION_SCL);
   addFormHeaderEnd(webContentBuffer);
 
   if (ConfigESP->getGpio(FUNCTION_SDA) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_SCL) != OFF_GPIO) {
 #ifdef SUPLA_BME280
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_BME280).toInt();
     addFormHeader(webContentBuffer);
-    addListBox(webContentBuffer, INPUT_BME280, F("BME280 adres"), BME280_P, 4, selected);
+    addListBox(webContentBuffer, INPUT_BME280, S_ADDRESS_BMPE280, BME280_P, 4, selected);
     addNumberBox(webContentBuffer, INPUT_ALTITUDE_BME280, S_ALTITUDE_ABOVE_SEA_LEVEL, KEY_ALTITUDE_BME280, 1500);
     addFormHeaderEnd(webContentBuffer);
 #endif
@@ -482,14 +485,14 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #ifdef SUPLA_SHT3x
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_SHT3x).toInt();
     addFormHeader(webContentBuffer);
-    addListBox(webContentBuffer, INPUT_SHT3x, F("SHT3x"), SHT3x_P, 4, selected);
+    addListBox(webContentBuffer, INPUT_SHT3x, S_SHT3X, SHT3x_P, 4, selected);
     addFormHeaderEnd(webContentBuffer);
 #endif
 
 #ifdef SUPLA_SI7021
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_SI7021).toInt();
     addFormHeader(webContentBuffer);
-    addListBox(webContentBuffer, INPUT_SI7021, F("SI7021"), STATE_P, 2, selected);
+    addListBox(webContentBuffer, INPUT_SI7021, S_SI702, STATE_P, 2, selected);
     addFormHeaderEnd(webContentBuffer);
 #endif
 
@@ -497,21 +500,21 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
     addFormHeader(webContentBuffer);
 
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_OLED).toInt();
-    addListBox(webContentBuffer, INPUT_OLED, F("OLED"), OLED_P, 4, selected);
+    addListBox(webContentBuffer, INPUT_OLED, S_OLED, OLED_P, 4, selected);
 
     if (ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_OLED).toInt()) {
       String name, sensorName, input;
 
-      addListGPIOBox(webContentBuffer, INPUT_BUTTON_GPIO, F("PRZYCISK OLED"), FUNCTION_CFG_BUTTON);
+      addListGPIOBox(webContentBuffer, INPUT_BUTTON_GPIO, S_OLED_BUTTON, FUNCTION_CFG_BUTTON);
       selected = ConfigManager->get(KEY_OLED_ANIMATION)->getValueInt();
-      addListBox(webContentBuffer, INPUT_OLED_ANIMATION, F("STEROWANIE"), OLED_CONTROLL_P, 3, selected);
-      addNumberBox(webContentBuffer, INPUT_OLED_BRIGHTNESS, F("PODŚWIETLENIE[s]"), KEY_OLED_BACK_LIGHT_TIME, 99);
+      addListBox(webContentBuffer, INPUT_OLED_ANIMATION, S_CONTROL, OLED_CONTROLL_P, 3, selected);
+      addNumberBox(webContentBuffer, INPUT_OLED_BRIGHTNESS, S_BACKLIGHT_S, KEY_OLED_BACK_LIGHT_TIME, 99);
 
       for (uint8_t i = 0; i < getCountSensorChannels(); i++) {
         sensorName = String(ConfigManager->get(KEY_NAME_SENSOR)->getElement(i));
         input = INPUT_OLED_NAME;
         input += i;
-        name = F("EKRAN ");
+        name = S_SCREEN;
         name += i + 1;
         addTextBox(webContentBuffer, input, name, sensorName, 0, MAX_DS18B20_NAME, false);
       }
@@ -522,7 +525,7 @@ void SuplaWebPageSensor::supla_webpage_i2c(int save) {
 #ifdef SUPLA_MCP23017
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MCP23017).toInt();
     addFormHeader(webContentBuffer);
-    addListBox(webContentBuffer, INPUT_MCP23017, F("MCP23017"), STATE_P, 2, selected);
+    addListBox(webContentBuffer, INPUT_MCP23017, S_MCP23017, STATE_P, 2, selected);
     addFormHeaderEnd(webContentBuffer);
 #endif
   }
@@ -597,13 +600,13 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
 
 #if defined(SUPLA_MAX6675)
   addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" SPI"));
-  addListGPIOBox(webContentBuffer, INPUT_CLK_GPIO, F("CLK"), FUNCTION_CLK);
-  addListGPIOBox(webContentBuffer, INPUT_CS_GPIO, F("CS"), FUNCTION_CS);
-  addListGPIOBox(webContentBuffer, INPUT_D0_GPIO, F("D0"), FUNCTION_D0);
+  addListGPIOBox(webContentBuffer, INPUT_CLK_GPIO, S_CLK, FUNCTION_CLK);
+  addListGPIOBox(webContentBuffer, INPUT_CS_GPIO, S_CS, FUNCTION_CS);
+  addListGPIOBox(webContentBuffer, INPUT_D0_GPIO, S_D0, FUNCTION_D0);
 
   if (ConfigESP->getGpio(FUNCTION_CLK) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_CS) != OFF_GPIO && ConfigESP->getGpio(FUNCTION_D0) != OFF_GPIO) {
     selected = ConfigManager->get(KEY_ACTIVE_SENSOR)->getElement(SENSOR_I2C_MAX6675).toInt();
-    addListBox(webContentBuffer, INPUT_MAX6675, F("MAX6675/MAX31855"), STATE_P, 2, selected);
+    addListBox(webContentBuffer, INPUT_MAX6675, S_MAX6675_MAX31855, STATE_P, 2, selected);
   }
   addFormHeaderEnd(webContentBuffer);
 #endif
@@ -619,4 +622,4 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
   webContentBuffer += F("</button></a><br><br>");
   WebServer->sendHeaderEnd();
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/language/common.h b/src/language/common.h
index 51f5797d..68b62c33 100644
--- a/src/language/common.h
+++ b/src/language/common.h
@@ -4,10 +4,30 @@
 
 #define S_SPACE " "
 
+//### Category codes not translated ###
+#define S_I2C "i2c"
+
 //### Device codes not translated ###
 #define S_HC_SR04 "HC-SR04"
 #define S_HLW8012 "HLW8012"
 #define S_RGBW_RGB_DIMMER "RGBW/RGB/DIMMER"
 #define S_PUSHOVER "PUSHOVER"
+#define S_OLED "OLED"
+#define S_DS18B20 "DS18B20"
+#define S_MULTI_DS18B20 "Multi DS18B20"
+#define S_DHT11 "DHT11"
+#define S_DHT22 "DHT22"
+#define S_SHT3X "SHT3x"
+#define S_SI702 "Si7021"
+#define S_SI7021_SONOFF "Si7021 Sonoff"
+#define S_MCP23017 "MCP23017"
+#define S_MAX6675_MAX31855 "MAX6675/MAX31855"
+
+//### PIN codes not translated ###
+#define S_D0 "D0"
+#define S_SDA "SDA"
+#define S_SCL "SCL"
+#define S_CLK "CLK"
+#define S_CS "CS"
 
 #endif /* LANGUAGE_COMMON_H_ */
diff --git a/src/language/de.h b/src/language/de.h
index 403e93d3..5a7fa02b 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -107,6 +107,11 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Pull-up"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Wertänderung"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Einstellung Impulszähler Nr."
+#define S_CONTROL                          "Steuerung"
+#define S_OLED_BUTTON                      "OLED-Taste"
+#define S_SCREEN                           "Bildschirm"
+#define S_BACKLIGHT_S                      "Hintergrundbeleuchtung [s]"
+#define S_ADDRESS_BMPE280                  "Adresse BME280"
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Generieren GUID & AUTHKEY"
diff --git a/src/language/en.h b/src/language/en.h
index f13ff57c..6ab71a4a 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -29,7 +29,7 @@
 #define S_SENSORS_1WIRE                                        "SENSORS 1Wire"
 #define S_SENSORS_I2C                                          "SENSORS i2c"
 #define S_SENSORS_SPI                                          "SENSORS SPI"
-#define S_SENSORS_OTHER                                        "SENSORY OTHER"
+#define S_SENSORS_OTHER                                        "SENSORS OTHER"
 #define S_LED_BUTTON_CFG                                       "LED, BUTTON CONFIG"
 #define S_CFG_MODE                                             "CFG mode"
 #define S_QUANTITY                                             "QUANTITY"
@@ -47,7 +47,7 @@
 #define S_ACTION                                               "Action"
 #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_GPIO_SETTINGS_FOR                                    "GPIO settings for"
 #define S_FOUND                                                "Found"
 #define S_NO_SENSORS_CONNECTED                                 "No sensor conected"
 #define S_SAVE_FOUND                                           "Save found"
@@ -59,7 +59,7 @@
 #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_WRITE_ERROR_UNABLE_TO_READ_FILE_FS_PARTITION_MISSING "Write error - unable 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"
 
@@ -107,6 +107,11 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Pull up"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Change value"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Settings IC nr."
+#define S_CONTROL                          "Control"
+#define S_OLED_BUTTON                      "OLED button"
+#define S_SCREEN                           "Screen"
+#define S_BACKLIGHT_S                      "Backlight [s]"
+#define S_ADDRESS_BMPE280                  "Address BME280"
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Generate GUID & AUTHKEY"
diff --git a/src/language/es.h b/src/language/es.h
index 363e4b9f..758afc1c 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -110,6 +110,11 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Pull-up"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Cambia el valor"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Configuración contador de impulsos no."
+#define S_CONTROL                          "Control"
+#define S_OLED_BUTTON                      "Botón OLED"
+#define S_SCREEN                           "Pantalla"
+#define S_BACKLIGHT_S                      "Luz de fondo [s]"
+#define S_ADDRESS_BMPE280                  "Dirección BME280"
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Generar GUID & AUTHKEY"
diff --git a/src/language/fr.h b/src/language/fr.h
index fbec80fb..ab63e916 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -108,6 +108,11 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Remonter"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Modifier la valeur"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Paramètres Compteur d'impulsions No."
+#define S_CONTROL                          "Contrôler"
+#define S_OLED_BUTTON                      "Bouton OLED"
+#define S_SCREEN                           "Écran"
+#define S_BACKLIGHT_S                      "Rétroéclairage [s]"
+#define S_ADDRESS_BMPE280                  "Adresse BME280"
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Produire GUID & AUTHKEY"
diff --git a/src/language/pl.h b/src/language/pl.h
index cad06a72..fb969ac1 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -108,6 +108,11 @@
 #define S_IMPULSE_COUNTER_PULL_UP          "Podciąganie do VCC"
 #define S_IMPULSE_COUNTER_CHANGE_VALUE     "Zmień wartość"
 #define S_IMPULSE_COUNTER_SETTINGS_NR      "Ustawienia IC nr"
+#define S_CONTROL                          "Sterowanie"
+#define S_OLED_BUTTON                      "Przycisk OLED"
+#define S_SCREEN                           "Ekran"
+#define S_BACKLIGHT_S                      "Podświetlenie [s]"
+#define S_ADDRESS_BMPE280                  "Adres BME280"
 
 //#### SuplaWebPageUpload.cpp ####
 #define S_GENERATE_GUID_AND_KEY "Generuj GUID & AUTHKEY"

From a851e6b0b03d2eb410c90f9b16f1b8a10947f767 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Mon, 1 Mar 2021 20:11:47 +0100
Subject: [PATCH 161/165] =?UTF-8?q?t=C5=82umaczenie=20SuplaWebPageSensor.c?=
 =?UTF-8?q?pp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageSensor.cpp | 2 +-
 src/language/common.h      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SuplaWebPageSensor.cpp b/src/SuplaWebPageSensor.cpp
index 075e3339..505a5f53 100644
--- a/src/SuplaWebPageSensor.cpp
+++ b/src/SuplaWebPageSensor.cpp
@@ -599,7 +599,7 @@ void SuplaWebPageSensor::supla_webpage_spi(int save) {
   webContentBuffer += F("'>");
 
 #if defined(SUPLA_MAX6675)
-  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + F(" SPI"));
+  addFormHeader(webContentBuffer, String(S_GPIO_SETTINGS_FOR) + S_SPACE + S_SPI);
   addListGPIOBox(webContentBuffer, INPUT_CLK_GPIO, S_CLK, FUNCTION_CLK);
   addListGPIOBox(webContentBuffer, INPUT_CS_GPIO, S_CS, FUNCTION_CS);
   addListGPIOBox(webContentBuffer, INPUT_D0_GPIO, S_D0, FUNCTION_D0);
diff --git a/src/language/common.h b/src/language/common.h
index 68b62c33..5ba31a8d 100644
--- a/src/language/common.h
+++ b/src/language/common.h
@@ -6,6 +6,7 @@
 
 //### Category codes not translated ###
 #define S_I2C "i2c"
+#define S_SPI "SPI"
 
 //### Device codes not translated ###
 #define S_HC_SR04 "HC-SR04"

From 697999ce5c34f6c1dc76330f7637cfd29f565094 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Mon, 1 Mar 2021 21:03:51 +0100
Subject: [PATCH 162/165] =?UTF-8?q?t=C5=82umaczenie=20SuplaWebPageRelay.cp?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebPageRelay.cpp | 36 +++++++++++++++++++-----------------
 src/language/common.h     |  3 ++-
 src/language/de.h         | 12 ++++++++++++
 src/language/en.h         | 12 ++++++++++++
 src/language/es.h         | 12 ++++++++++++
 src/language/fr.h         | 12 ++++++++++++
 src/language/pl.h         | 12 ++++++++++++
 7 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/src/SuplaWebPageRelay.cpp b/src/SuplaWebPageRelay.cpp
index bef5668a..d85843fc 100644
--- a/src/SuplaWebPageRelay.cpp
+++ b/src/SuplaWebPageRelay.cpp
@@ -271,9 +271,9 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
   addFormHeaderEnd(webContentBuffer);
 
 #if defined(SUPLA_LED)
-  addFormHeader(webContentBuffer, F("Status załączenia przekaźnika"));
+  addFormHeader(webContentBuffer, S_RELAY_ACTIVATION_STATUS);
 
-  addListGPIOBox(webContentBuffer, INPUT_LED + nr_relay, F("LED"), FUNCTION_LED, nr_relay.toInt());
+  addListGPIOBox(webContentBuffer, INPUT_LED + nr_relay, S_LED, FUNCTION_LED, nr_relay.toInt());
 
   selected = ConfigESP->getInversed(nr_relay.toInt(), FUNCTION_LED);
   addListBox(webContentBuffer, INPUT_LEVEL_LED + nr_relay, S_STATE_CONTROL, LEVEL_P, 2, selected);
@@ -283,41 +283,41 @@ void SuplaWebPageRelay::supla_webpage_relay_set(int save, int nr) {
 
 #if defined(SUPLA_PUSHOVER)
   if (nr_relay.toInt() < MAX_PUSHOVER_MESSAGE) {
-    addFormHeader(webContentBuffer, F("Pushover"));
+    addFormHeader(webContentBuffer, S_PUSHOVER);
 
     selected = ConfigManager->get(KEY_PUSHOVER)->getElement(nr_relay.toInt() - 1).toInt();
-    addListBox(webContentBuffer, INPUT_PUSHOVER, F("Stan"), STATE_P, 2, selected);
+    addListBox(webContentBuffer, INPUT_PUSHOVER, S_STATE, STATE_P, 2, selected);
 
     massage = ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(nr_relay.toInt() - 1).c_str();
-    addTextBox(webContentBuffer, INPUT_PUSHOVER_MESSAGE, F("Wiadomość"), massage, 0, 16, false);
+    addTextBox(webContentBuffer, INPUT_PUSHOVER_MESSAGE, S_MESSAGE, massage, 0, 16, false);
     addFormHeaderEnd(webContentBuffer);
   }
 #endif
 
 #if defined(SUPLA_DIRECT_LINKS)
   if (nr_relay.toInt() <= MAX_DIRECT_LINK) {
-    addFormHeader(webContentBuffer, F("Linki bezpośrednie"));
+    addFormHeader(webContentBuffer, S_DIRECT_LINKS);
     massage = ConfigManager->get(KEY_DIRECT_LINKS_ON)->getElement(nr_relay.toInt() - 1).c_str();
-    addTextBox(webContentBuffer, INPUT_DIRECT_LINK_ON, F("ON"), massage, F("xx/xxxxxxxxx/turn-on"), 0, MAX_DIRECT_LINKS_SIZE, false);
+    addTextBox(webContentBuffer, INPUT_DIRECT_LINK_ON, S_ON, massage, F("xx/xxxxxxxxx/turn-on"), 0, MAX_DIRECT_LINKS_SIZE, false);
 
     massage = ConfigManager->get(KEY_DIRECT_LINKS_OFF)->getElement(nr_relay.toInt() - 1).c_str();
-    addTextBox(webContentBuffer, INPUT_DIRECT_LINK_OFF, F("OFF"), massage, F("xx/xxxxxxxxx/turn-off"), 0, MAX_DIRECT_LINKS_SIZE, false);
+    addTextBox(webContentBuffer, INPUT_DIRECT_LINK_OFF, S_OFF, massage, F("xx/xxxxxxxxx/turn-off"), 0, MAX_DIRECT_LINKS_SIZE, false);
 
     addFormHeaderEnd(webContentBuffer);
   }
 #endif
 
-  addFormHeader(webContentBuffer, F("Warunkowanie"));
+  addFormHeader(webContentBuffer, S_CONDITIONING);
   selected = ConfigManager->get(KEY_CONDITIONS_SENSOR_TYPE)->getElement(nr_relay.toInt() - 1).toInt();
-  addListBox(webContentBuffer, INPUT_CONDITIONS_SENSOR_TYPE, F("Sensor"), SENSOR_LIST_P, COUNT_SENSOR_LIST, selected);
+  addListBox(webContentBuffer, INPUT_CONDITIONS_SENSOR_TYPE, S_SENSOR, SENSOR_LIST_P, COUNT_SENSOR_LIST, selected);
 
   selected = ConfigManager->get(KEY_CONDITIONS_TYPE)->getElement(nr_relay.toInt() - 1).toInt();
-  addListBox(webContentBuffer, INPUT_CONDITIONS_TYPE, F("Warunek"), CONDITIONS_TYPE_P, 4, selected);
+  addListBox(webContentBuffer, INPUT_CONDITIONS_TYPE, S_CONDITION, CONDITIONS_TYPE_P, 4, selected);
 
   String value = ConfigManager->get(KEY_CONDITIONS_MIN)->getElement(nr_relay.toInt() - 1);
-  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MIN, F("ON"), F("wartość włączenia"), false, value);
+  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MIN, S_ON, S_SWITCH_ON_VALUE, false, value);
   value = ConfigManager->get(KEY_CONDITIONS_MAX)->getElement(nr_relay.toInt() - 1);
-  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MAX, F("OFF"), F("wartość wyłączenia"), false, value);
+  addNumberBox(webContentBuffer, INPUT_CONDITIONS_MAX, S_OFF, S_SWITCH_OFF_VALUE, false, value);
   addFormHeaderEnd(webContentBuffer);
 
   addButtonSubmit(webContentBuffer, S_SAVE);
@@ -346,7 +346,7 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
   webContentBuffer += SuplaJavaScript(PATH_RELAY_SET);
 
   addForm(webContentBuffer, F("post"), PATH_SAVE_RELAY_SET);
-  addFormHeader(webContentBuffer, F("Ustawienia dla przekaźników"));
+  addFormHeader(webContentBuffer, S_SETTINGS_FOR_RELAYS);
 
   selected = ConfigESP->getLevel(1, FUNCTION_RELAY);
   input = INPUT_RELAY_LEVEL;
@@ -358,17 +358,19 @@ void SuplaWebPageRelay::supla_webpage_relay_set_MCP23017(int save) {
   addFormHeaderEnd(webContentBuffer);
 
 #if defined(SUPLA_PUSHOVER)
-  addFormHeader(webContentBuffer, F("Pushover"));
+  addFormHeader(webContentBuffer, S_PUSHOVER);
   for (uint8_t i = 0; i < MAX_PUSHOVER_MESSAGE; i++) {
     selected = ConfigManager->get(KEY_PUSHOVER)->getElement(i).toInt();
-    name = F("Stan ");
+    name = S_STATE;
+    name =+ S_SPACE;
     name += i + 1;
     input = INPUT_PUSHOVER;
     input += i;
     addListBox(webContentBuffer, input, name, STATE_P, 2, selected);
 
     massage = ConfigManager->get(KEY_PUSHOVER_MASSAGE)->getElement(i).c_str();
-    name = F("Wiadomość ");
+    name = S_MESSAGE;
+    name += S_SPACE;
     name += i + 1;
     input = INPUT_PUSHOVER_MESSAGE;
     input += i;
diff --git a/src/language/common.h b/src/language/common.h
index 5ba31a8d..c7de1bc5 100644
--- a/src/language/common.h
+++ b/src/language/common.h
@@ -9,6 +9,7 @@
 #define S_SPI "SPI"
 
 //### Device codes not translated ###
+#define S_LED "LED"
 #define S_HC_SR04 "HC-SR04"
 #define S_HLW8012 "HLW8012"
 #define S_RGBW_RGB_DIMMER "RGBW/RGB/DIMMER"
@@ -23,7 +24,7 @@
 #define S_SI7021_SONOFF "Si7021 Sonoff"
 #define S_MCP23017 "MCP23017"
 #define S_MAX6675_MAX31855 "MAX6675/MAX31855"
-
+#define S_PUSHOVER "Pushover"
 //### PIN codes not translated ###
 #define S_D0 "D0"
 #define S_SDA "SDA"
diff --git a/src/language/de.h b/src/language/de.h
index 5a7fa02b..62b86748 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -130,4 +130,16 @@
 #define S_DEPTH_CM "Tiefe [cm]"
 #define S_SENSOR_READING_DISTANCE "Sensorleseabstand"
 
+//#### SuplaWebPageRelay.cpp ####
+#define S_RELAY_ACTIVATION_STATUS "Relaisaktivierungsstatus"
+#define S_STATE "Zustand"
+#define S_MESSAGE "Botschaft"
+#define S_DIRECT_LINKS "Direkte Links"
+#define S_CONDITIONING "Konditionierung"
+#define S_SENSOR "Sensor"
+#define S_CONDITION "Bedingung"
+#define S_SWITCH_ON_VALUE "Einschaltwert"
+#define S_SWITCH_OFF_VALUE "Ausschaltwert"
+#define S_SETTINGS_FOR_RELAYS "Einstellungen für Relais"
+
 #endif  // _LANGUAGE_DE_S_H_
diff --git a/src/language/en.h b/src/language/en.h
index 6ab71a4a..176c12fb 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -130,4 +130,16 @@
 #define S_DEPTH_CM "Depth [cm]"
 #define S_SENSOR_READING_DISTANCE "sensor reading distance"
 
+//#### SuplaWebPageRelay.cpp ####
+#define S_RELAY_ACTIVATION_STATUS "Relay activation status"
+#define S_STATE "State"
+#define S_MESSAGE "Message"
+#define S_DIRECT_LINKS "Direct links"
+#define S_CONDITIONING "Conditioning"
+#define S_SENSOR "Sensor"
+#define S_CONDITION "Condition"
+#define S_SWITCH_ON_VALUE "switch-on value"
+#define S_SWITCH_OFF_VALUE "switch-off value"
+#define S_SETTINGS_FOR_RELAYS "Settings for relays"
+
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index 758afc1c..5f2fbfea 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -133,4 +133,16 @@
 #define S_DEPTH_CM "Profundidad [cm]"
 #define S_SENSOR_READING_DISTANCE "distancia de lectura del sensor"
 
+//#### SuplaWebPageRelay.cpp ####
+#define S_RELAY_ACTIVATION_STATUS "Estado de activación del relé"
+#define S_STATE "Expresar"
+#define S_MESSAGE "Mensaje"
+#define S_DIRECT_LINKS "Enlaces directos"
+#define S_CONDITIONING "Acondicionamiento"
+#define S_SENSOR "Sensor"
+#define S_CONDITION "Condición"
+#define S_SWITCH_ON_VALUE "valor de encendido"
+#define S_SWITCH_OFF_VALUE "valor de desconexión"
+#define S_SETTINGS_FOR_RELAYS "Configuraciones para relés"
+
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index ab63e916..3645c42d 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -131,4 +131,16 @@
 #define S_DEPTH_CM "Profondeur [cm]"
 #define S_SENSOR_READING_DISTANCE "distance de lecture du capteur"
 
+//#### SuplaWebPageRelay.cpp ####
+#define S_RELAY_ACTIVATION_STATUS "État d'activation du relais"
+#define S_STATE "État"
+#define S_MESSAGE "Un message"
+#define S_DIRECT_LINKS "Liens directs"
+#define S_CONDITIONING "Conditionnement"
+#define S_SENSOR "Capteur"
+#define S_CONDITION "Condition"
+#define S_SWITCH_ON_VALUE "valeur d'enclenchement"
+#define S_SWITCH_OFF_VALUE "valeur de coupure"
+#define S_SETTINGS_FOR_RELAYS "Paramètres des relais"
+
 #endif  // _LANGUAGE_FR_S_H_
diff --git a/src/language/pl.h b/src/language/pl.h
index fb969ac1..bf8f9ddd 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -131,4 +131,16 @@
 #define S_DEPTH_CM "Głębokość [cm]"
 #define S_SENSOR_READING_DISTANCE "maksymalna odległość odczytu czujnika"
 
+//#### SuplaWebPageRelay.cpp ####
+#define S_RELAY_ACTIVATION_STATUS "Status załączenia przekaźnika"
+#define S_STATE "Stan"
+#define S_MESSAGE "Wiadomość"
+#define S_DIRECT_LINKS "Linki bezpośrednie"
+#define S_CONDITIONING "Warunkowanie"
+#define S_SENSOR "Czujnik"
+#define S_CONDITION "Warunek"
+#define S_SWITCH_ON_VALUE "wartość włączenia"
+#define S_SWITCH_OFF_VALUE "wartość wyłączenia"
+#define S_SETTINGS_FOR_RELAYS "Ustawienia dla przekaźników"
+
 #endif  // _LANGUAGE_PL_S_H_

From 9349f25640c0a3a207397bcf599522db53afbeb6 Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Mon, 1 Mar 2021 21:42:27 +0100
Subject: [PATCH 163/165] =?UTF-8?q?t=C5=82umaczenie=20SuplaCommonPROGMEM.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaCommonPROGMEM.h | 32 ++++++++++++++++----------------
 src/language/common.h    |  2 ++
 src/language/de.h        |  7 +++++++
 src/language/en.h        |  9 ++++++++-
 src/language/es.h        |  7 +++++++
 src/language/fr.h        |  7 +++++++
 src/language/pl.h        |  9 ++++++++-
 7 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/src/SuplaCommonPROGMEM.h b/src/SuplaCommonPROGMEM.h
index 9940d311..6aecd182 100644
--- a/src/SuplaCommonPROGMEM.h
+++ b/src/SuplaCommonPROGMEM.h
@@ -161,9 +161,9 @@ const char SH1106[] PROGMEM = "SH1106 - 1,3''";
 const char SSD1306_WEMOS_SHIELD[] PROGMEM = "SSD1306 - 0,66'' WEMOS OLED shield";
 const char* const OLED_P[] PROGMEM = {OFF, SSD1306, SH1106, SSD1306_WEMOS_SHIELD};
 
-const char CONTROLL_NORMAL[] PROGMEM = "NORMALNE";
-const char CONTROLL_SLOW[] PROGMEM = "WOLNE";
-const char CONTROLL_MANUAL[] PROGMEM = "RĘCZNE";
+const char CONTROLL_NORMAL[] PROGMEM = S_NORMAL;
+const char CONTROLL_SLOW[] PROGMEM = S_SLOW;
+const char CONTROLL_MANUAL[] PROGMEM = S_MANUALLY;
 const char* const OLED_CONTROLL_P[] PROGMEM = {CONTROLL_NORMAL, CONTROLL_SLOW, CONTROLL_MANUAL};
 #endif
 
@@ -179,10 +179,10 @@ enum conditioningType
 const char CONDITIONING__COOLING[] PROGMEM = "Temperatura - chłodzenie";
 const char CONDITIONING__MOISTURIZING[] PROGMEM = "Wilgotność - nawilżanie";
 const char CONDITIONING__DRAINGE[] PROGMEM = "Wilgotność - osuszanie";*/
-const char CONDITIONING__HEATING[] PROGMEM = "ON < wartość kanału > OFF - ogrzewanie";
-const char CONDITIONING__COOLING[] PROGMEM = "ON > wartość kanału < OFF - chłodzenie";
-const char CONDITIONING__MOISTURIZING[] PROGMEM = "ON < 2 wartość kanału > OFF - nawilżanie";
-const char CONDITIONING__DRAINGE[] PROGMEM = "ON > 2 wartość kanału < OFF - osuszanie";
+const char CONDITIONING__HEATING[] PROGMEM = S_ON_CH_VAL_OFF_HEATING;
+const char CONDITIONING__COOLING[] PROGMEM = S_ON_CH_VAL_OFF_COOLING;
+const char CONDITIONING__MOISTURIZING[] PROGMEM = S_ON_2CH_VAL_OFF_HUMIDIFICATION;
+const char CONDITIONING__DRAINGE[] PROGMEM = S_ON_2CH_VAL_OFF_DRYING;
 const char* const CONDITIONS_TYPE_P[] PROGMEM = {CONDITIONING__HEATING, CONDITIONING__COOLING, CONDITIONING__MOISTURIZING, CONDITIONING__DRAINGE};
 
 enum sensorList
@@ -199,15 +199,15 @@ enum sensorList
   COUNT_SENSOR_LIST
 };
 
-const char NAME_DS18B20[] PROGMEM = "DS18B20";
-const char NAME_DHT11[] PROGMEM = "DHT11";
-const char NAME_DHT22[] PROGMEM = "DHT22";
-const char NAME_SI7021_SONOFF[] PROGMEM = "SI7021 SONOFF";
-const char NAME_HC_SR04[] PROGMEM = "HC-SR04 [m]";
-const char NAME_BME280[] PROGMEM = "BME280";
-const char NAME_SHT3x[] PROGMEM = "SHT3x";
-const char NAME_SI7021[] PROGMEM = "SI7021";
-const char NAME_MAX6675[] PROGMEM = "MAX6675";
+const char NAME_DS18B20[] PROGMEM = S_DS18B20;
+const char NAME_DHT11[] PROGMEM = S_DHT11;
+const char NAME_DHT22[] PROGMEM = S_DHT22;
+const char NAME_SI7021_SONOFF[] PROGMEM = S_SI7021_SONOFF;
+const char NAME_HC_SR04[] PROGMEM = S_HC_SR04;
+const char NAME_BME280[] PROGMEM = S_BME280;
+const char NAME_SHT3x[] PROGMEM = S_SHT3X;
+const char NAME_SI7021[] PROGMEM = S_SI702;
+const char NAME_MAX6675[] PROGMEM = S_MAX6675;
 
 const char* const SENSOR_LIST_P[] PROGMEM = {OFF,          NAME_DS18B20, NAME_DHT11, NAME_DHT22,  NAME_SI7021_SONOFF,
                                              NAME_HC_SR04, NAME_BME280,  NAME_SHT3x, NAME_SI7021, NAME_MAX6675};
diff --git a/src/language/common.h b/src/language/common.h
index c7de1bc5..b23a6565 100644
--- a/src/language/common.h
+++ b/src/language/common.h
@@ -15,6 +15,7 @@
 #define S_RGBW_RGB_DIMMER "RGBW/RGB/DIMMER"
 #define S_PUSHOVER "PUSHOVER"
 #define S_OLED "OLED"
+#define S_BME280 "BME280"
 #define S_DS18B20 "DS18B20"
 #define S_MULTI_DS18B20 "Multi DS18B20"
 #define S_DHT11 "DHT11"
@@ -23,6 +24,7 @@
 #define S_SI702 "Si7021"
 #define S_SI7021_SONOFF "Si7021 Sonoff"
 #define S_MCP23017 "MCP23017"
+#define S_MAX6675 "MAX6675"
 #define S_MAX6675_MAX31855 "MAX6675/MAX31855"
 #define S_PUSHOVER "Pushover"
 //### PIN codes not translated ###
diff --git a/src/language/de.h b/src/language/de.h
index 62b86748..0ac081e6 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -96,6 +96,13 @@
 #define S_REACTION_ON_CHANGE  "STATUS ÄNDERUNG"
 #define S_CFG_10_PRESSES      "10 MAL DRÜCKEN"
 #define S_5SEK_HOLD           "5 SEKUNDEN GEDRÜCKT HALTEN"
+#define S_NORMAL "NORMAL"
+#define S_SLOW "SCHLEPPEND"
+#define S_MANUALLY "MANUELL"
+#define S_ON_CH_VAL_OFF_HEATING "EIN < Kanalwert > AUS - Heizung"
+#define S_ON_CH_VAL_OFF_COOLING "EIN > Kanalwert < AUS - Kühlung"
+#define S_ON_2CH_VAL_OFF_HUMIDIFICATION "EIN < 2. Kanalwert > AUS - Befeuchtung"
+#define S_ON_2CH_VAL_OFF_DRYING "EIN > 2. Kanalwert < AUS - Trocknen"
 
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "ABWESEND"
diff --git a/src/language/en.h b/src/language/en.h
index 176c12fb..df6664c8 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -95,7 +95,14 @@
 #define S_REACTION_ON_RELEASE "ON RELEASE"
 #define S_REACTION_ON_CHANGE  "ON CHANGE"
 #define S_CFG_10_PRESSES      "10 ON PRESSES"
-#define S_5SEK_HOLD           "5 SEK HOLD"
+#define S_5SEK_HOLD           "5 SEC HOLD"
+#define S_NORMAL "NORMAL"
+#define S_SLOW "SLOW"
+#define S_MANUALLY "MANUALLY"
+#define S_ON_CH_VAL_OFF_HEATING "ON < channel value > OFF - heating"
+#define S_ON_CH_VAL_OFF_COOLING "ON > channel value < OFF - cooling"
+#define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < 2nd channel value > OFF - humidification"
+#define S_ON_2CH_VAL_OFF_DRYING "ON > 2nd channel value < OFF - drying"
 
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "ABSENT"
diff --git a/src/language/es.h b/src/language/es.h
index 5f2fbfea..92706b54 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -99,6 +99,13 @@
 #define S_REACTION_ON_CHANGE  "AL CAMBIAR DE ESTADO"
 #define S_CFG_10_PRESSES      "AL PRESIONAR 10 VECES"
 #define S_5SEK_HOLD           "AL MANTENER PRESIONADO 5 SEGUNDOS"
+#define S_NORMAL "NORMAL"
+#define S_SLOW "LENTO"
+#define S_MANUALLY "A MANO"
+#define S_ON_CH_VAL_OFF_HEATING "ON < valor del cana l> OFF - calefacción"
+#define S_ON_CH_VAL_OFF_COOLING "ON > valor del canal < OFF - refrigeración"
+#define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < valor del segundo canal > OFF - humidificación"
+#define S_ON_2CH_VAL_OFF_DRYING "ON > valor del segundo canal < OFF - secado"
 
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "BRAK"
diff --git a/src/language/fr.h b/src/language/fr.h
index 3645c42d..869a3116 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -97,6 +97,13 @@
 #define S_REACTION_ON_CHANGE  "SUR LE CHANGEMENT"
 #define S_CFG_10_PRESSES      "10 FOIS SUR PRESSE"
 #define S_5SEK_HOLD           "5 SEC TENIR"
+#define S_NORMAL "ORDINAIRE"
+#define S_SLOW "LENT"
+#define S_MANUALLY "MANUELLEMENT"
+#define S_ON_CH_VAL_OFF_HEATING "ON < valeur de canal > OFF - chauffage"
+#define S_ON_CH_VAL_OFF_COOLING "ON > valeur du canal < OFF - refroidissement"
+#define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < Valeur 2ème canal > OFF - humidification"
+#define S_ON_2CH_VAL_OFF_DRYING "ON > Valeur 2ème canal < OFF - séchage"
 
 // #### SuplaTemplateBoard.h ####
 #define S_ABSENT "ABSENT"
diff --git a/src/language/pl.h b/src/language/pl.h
index bf8f9ddd..c4c322ca 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -96,7 +96,14 @@
 #define S_REACTION_ON_RELEASE "ZWOLNIENIE"
 #define S_REACTION_ON_CHANGE  "ZMIANA STANU"
 #define S_CFG_10_PRESSES      "10 WCIŚNIĘĆ"
-#define S_5SEK_HOLD           "5 SEK"
+#define S_5SEK_HOLD           "WCIŚNIĘTY 5 SEKUND"
+#define S_NORMAL "NORMALNE"
+#define S_SLOW "WOLNE"
+#define S_MANUALLY "RĘCZNE"
+#define S_ON_CH_VAL_OFF_HEATING "ON < wartość kanału > OFF - ogrzewanie"
+#define S_ON_CH_VAL_OFF_COOLING "ON > wartość kanału < OFF - chłodzenie"
+#define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < 2 wartość kanału > OFF - nawilżanie"
+#define S_ON_2CH_VAL_OFF_DRYING "ON > 2 wartość kanału < OFF - osuszanie"
 
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "BRAK"

From b15cd195099981e0c29e91da82b4cd6fd890b66d Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Mon, 1 Mar 2021 21:52:11 +0100
Subject: [PATCH 164/165] =?UTF-8?q?t=C5=82umaczenie=20SuplaWebServer.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/SuplaWebServer.cpp | 2 +-
 src/language/de.h      | 3 +++
 src/language/en.h      | 3 +++
 src/language/es.h      | 3 +++
 src/language/fr.h      | 3 +++
 src/language/pl.h      | 3 +++
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/SuplaWebServer.cpp b/src/SuplaWebServer.cpp
index 0da024ca..6af0f3c7 100644
--- a/src/SuplaWebServer.cpp
+++ b/src/SuplaWebServer.cpp
@@ -210,7 +210,7 @@ void SuplaWebServer::deviceSettings(int save) {
 #endif
 
 #ifdef SUPLA_LIMIT_SWITCH
-  addButton(webContentBuffer, F("KRAŃCÓWKI"), PATH_SWITCH);
+  addButton(webContentBuffer, S_LIMIT_SWITCHES, PATH_SWITCH);
 #endif
 
 #if defined(SUPLA_DS18B20) || defined(SUPLA_DHT11) || defined(SUPLA_DHT22) || defined(SUPLA_SI7021_SONOFF)
diff --git a/src/language/de.h b/src/language/de.h
index 0ac081e6..bf7f97fc 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -104,6 +104,9 @@
 #define S_ON_2CH_VAL_OFF_HUMIDIFICATION "EIN < 2. Kanalwert > AUS - Befeuchtung"
 #define S_ON_2CH_VAL_OFF_DRYING "EIN > 2. Kanalwert < AUS - Trocknen"
 
+//#### SuplaWebServer.cpp ####
+#define S_LIMIT_SWITCHES "GRENZSCHALTER"
+
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "ABWESEND"
 
diff --git a/src/language/en.h b/src/language/en.h
index df6664c8..4c3500a6 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -104,6 +104,9 @@
 #define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < 2nd channel value > OFF - humidification"
 #define S_ON_2CH_VAL_OFF_DRYING "ON > 2nd channel value < OFF - drying"
 
+//#### SuplaWebServer.cpp ####
+#define S_LIMIT_SWITCHES "LIMIT SWITCHES"
+
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "ABSENT"
 
diff --git a/src/language/es.h b/src/language/es.h
index 92706b54..60172c0e 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -107,6 +107,9 @@
 #define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < valor del segundo canal > OFF - humidificación"
 #define S_ON_2CH_VAL_OFF_DRYING "ON > valor del segundo canal < OFF - secado"
 
+//#### SuplaWebServer.cpp ####
+#define S_LIMIT_SWITCHES "FINALES DE CARRERA"
+
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "BRAK"
 
diff --git a/src/language/fr.h b/src/language/fr.h
index 869a3116..a61dca0c 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -105,6 +105,9 @@
 #define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < Valeur 2ème canal > OFF - humidification"
 #define S_ON_2CH_VAL_OFF_DRYING "ON > Valeur 2ème canal < OFF - séchage"
 
+//#### SuplaWebServer.cpp ####
+#define S_LIMIT_SWITCHES "INTERRUPTEURS DE FIN DE COURSE"
+
 // #### SuplaTemplateBoard.h ####
 #define S_ABSENT "ABSENT"
 
diff --git a/src/language/pl.h b/src/language/pl.h
index c4c322ca..89290df8 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -105,6 +105,9 @@
 #define S_ON_2CH_VAL_OFF_HUMIDIFICATION "ON < 2 wartość kanału > OFF - nawilżanie"
 #define S_ON_2CH_VAL_OFF_DRYING "ON > 2 wartość kanału < OFF - osuszanie"
 
+//#### SuplaWebServer.cpp ####
+#define S_LIMIT_SWITCHES "KRAŃCÓWKI"
+
 //#### SuplaTemplateBoard.h ####
 #define S_ABSENT "BRAK"
 

From ef4e3c2fd53d27ddc18567907129aada7d4eb0ad Mon Sep 17 00:00:00 2001
From: Goral64 <goral64@gmail.com>
Date: Mon, 1 Mar 2021 22:55:54 +0100
Subject: [PATCH 165/165] =?UTF-8?q?t=C5=82umaczenie=20SuplaHTTPUpdateServe?=
 =?UTF-8?q?r.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GUIGenericCommon.h        |  5 ++---
 src/SuplaHTTPUpdateServer.cpp | 28 ++++++++++++++++++++--------
 src/language/common.h         |  1 -
 src/language/de.h             | 11 +++++++++++
 src/language/en.h             | 11 +++++++++++
 src/language/es.h             | 11 +++++++++++
 src/language/fr.h             | 11 +++++++++++
 src/language/pl.h             | 11 +++++++++++
 8 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/src/GUIGenericCommon.h b/src/GUIGenericCommon.h
index 16eb3593..72f5c973 100644
--- a/src/GUIGenericCommon.h
+++ b/src/GUIGenericCommon.h
@@ -3,13 +3,12 @@
 
 #include "language/common.h"
 #ifndef UI_LANGUAGE
-#include "language/pl.h"
-#else
+#define UI_LANGUAGE pl
+#endif
 #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
 
 #include "SuplaDeviceGUI.h"
 
diff --git a/src/SuplaHTTPUpdateServer.cpp b/src/SuplaHTTPUpdateServer.cpp
index f59c8c93..aefd5ed8 100644
--- a/src/SuplaHTTPUpdateServer.cpp
+++ b/src/SuplaHTTPUpdateServer.cpp
@@ -14,24 +14,25 @@
 
 static const char serverIndex[] PROGMEM =
     R"(<!DOCTYPE html>
-     <html lang='en'>
+     <html lang='{l}'>
      <head>
          <meta charset='utf-8'>
          <meta name='viewport' content='width=device-width,initial-scale=1'/>
      </head>
      <body>
-     <div>Flash Size: {f}kB</div>
-     <div>Sketch Max Size: {s}kB</div>
+     <div>{F}: {f}kB</div>
+     <div>{U}: {u}kB</div>
+     <div>{S}: {s}kB</div>
      <form method='POST' action='' enctype='multipart/form-data'>
          <input type='file' accept='.bin,.bin.gz' name='firmware'>
          </br>
-         <input type='submit' value='Update Firmware'>
+         <input type='submit' value='{b}'>
      </form>
      </body>
      </html>)";
-static const char successResponse[] PROGMEM = "<META http-equiv='refresh' content='10'>Update Success! Rebooting...";
+static const char successResponse[] PROGMEM = "<META http-equiv='refresh' content='10'>{m}";
 static const char twoStepResponse[] PROGMEM =
-    "<META http-equiv='refresh' content='5'><b>WARNING</b> only use 2-step OTA update. Use GUI-GenericUpdater.bin";
+    "<META http-equiv='refresh' content='5'><b>{w}</b> {o} GUI-GenericUpdater.bin";
 
 ESP8266HTTPUpdateServer::ESP8266HTTPUpdateServer(bool serial_debug) {
   _serial_output = serial_debug;
@@ -53,8 +54,14 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
       return _server->requestAuthentication();
 
     String index = FPSTR(serverIndex);
+    index.replace("{l}", S_LANG);
     index.replace("{f}", String(ESP.getFlashChipRealSize() / 1024));
     index.replace("{s}", String(ESP.getFreeSketchSpace() / 1024));
+    index.replace("{u}", String(ESP.getSketchSize() / 1024));
+    index.replace("{F}", S_FLASH_MEMORY_SIZE);
+    index.replace("{S}", S_SKETCH_UPLOAD_MAX_SIZE);
+    index.replace("{U}", S_SKETCH_LOADED_SIZE);
+    index.replace("{b}", S_UPDATE_FIRMWARE);
     _server->send(200, PSTR("text/html"), index);
   });
 
@@ -68,8 +75,10 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
           _server->send(200, F("text/html"), String(F("Update error: ")) + _updaterError);
         }
         else {
+          String succes = FPSTR(successResponse);
+          succes.replace("{m}", S_UPDATE_SUCCESS_REBOOTING);
           _server->client().setNoDelay(true);
-          _server->send_P(200, PSTR("text/html"), successResponse);
+          _server->send_P(200, PSTR("text/html"), succes.c_str());
           delay(100);
           _server->client().stop();
           ESP.restart();
@@ -114,7 +123,10 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer* server, const String& path
           if (_serial_output)
             Serial.printf(".");
           if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
-            _server->send_P(200, PSTR("text/html"), twoStepResponse);
+        	String twoStep = FPSTR(twoStepResponse);
+        	twoStep.replace("{w}", S_WARNING);
+        	twoStep.replace("{o}", S_ONLY_2_STEP_OTA);
+            _server->send_P(200, PSTR("text/html"), twoStep.c_str());
 
             _setUpdaterError();
           }
diff --git a/src/language/common.h b/src/language/common.h
index b23a6565..9d2e647d 100644
--- a/src/language/common.h
+++ b/src/language/common.h
@@ -13,7 +13,6 @@
 #define S_HC_SR04 "HC-SR04"
 #define S_HLW8012 "HLW8012"
 #define S_RGBW_RGB_DIMMER "RGBW/RGB/DIMMER"
-#define S_PUSHOVER "PUSHOVER"
 #define S_OLED "OLED"
 #define S_BME280 "BME280"
 #define S_DS18B20 "DS18B20"
diff --git a/src/language/de.h b/src/language/de.h
index bf7f97fc..4fb3c7f3 100644
--- a/src/language/de.h
+++ b/src/language/de.h
@@ -1,6 +1,8 @@
 #ifndef _LANGUAGE_DE_S_H_
 #define _LANGUAGE_DE_S_H_
 
+#define S_LANG "de"
+
 #define S_SETTING_FOR                                          "Einstellungen für"
 #define S_SETTING_WIFI_SSID                                    "WIFI Einstellung"
 #define S_WIFI_SSID                                            "WIFI Name"
@@ -152,4 +154,13 @@
 #define S_SWITCH_OFF_VALUE "Ausschaltwert"
 #define S_SETTINGS_FOR_RELAYS "Einstellungen für Relais"
 
+//#### SuplaHTTPUpdateServer.cpp ####
+#define S_FLASH_MEMORY_SIZE "Flash-Speichergröße"
+#define S_SKETCH_LOADED_SIZE "Skizze geladene Größe"
+#define S_SKETCH_UPLOAD_MAX_SIZE "Skizze Hochladen Max Größe"
+#define S_UPDATE_FIRMWARE "Firmware aktualisieren"
+#define S_UPDATE_SUCCESS_REBOOTING "Update Erfolg! Neustart ..."
+#define S_WARNING "WARNUNG"
+#define S_ONLY_2_STEP_OTA "Verwenden Sie nur das 2-Schritt-OTA-Update. Benutzen"
+
 #endif  // _LANGUAGE_DE_S_H_
diff --git a/src/language/en.h b/src/language/en.h
index 4c3500a6..5dd0fcb0 100644
--- a/src/language/en.h
+++ b/src/language/en.h
@@ -1,6 +1,8 @@
 #ifndef _LANGUAGE_EN_S_H_
 #define _LANGUAGE_EN_S_H_
 
+#define S_LANG "en"
+
 #define S_SETTING_FOR                                          "Setting for"
 #define S_SETTING_WIFI_SSID                                    "Setting WIFI"
 #define S_WIFI_SSID                                            "Name WIFI"
@@ -152,4 +154,13 @@
 #define S_SWITCH_OFF_VALUE "switch-off value"
 #define S_SETTINGS_FOR_RELAYS "Settings for relays"
 
+//#### SuplaHTTPUpdateServer.cpp ####
+#define S_FLASH_MEMORY_SIZE "Flash Memory Size"
+#define S_SKETCH_LOADED_SIZE "Sketch Loaded Size"
+#define S_SKETCH_UPLOAD_MAX_SIZE "Sketch Upload Max Size"
+#define S_UPDATE_FIRMWARE "Update Firmware"
+#define S_UPDATE_SUCCESS_REBOOTING "Update Success! Rebooting..."
+#define S_WARNING "WARNING"
+#define S_ONLY_2_STEP_OTA "only use 2-step OTA update. Use"
+
 #endif  // _LANGUAGE_EN_S_H_
diff --git a/src/language/es.h b/src/language/es.h
index 60172c0e..a75c0f1a 100644
--- a/src/language/es.h
+++ b/src/language/es.h
@@ -1,6 +1,8 @@
 #ifndef _LANGUAGE_ES_S_H_
 #define _LANGUAGE_ES_S_H_
 
+#define S_LANG "es"
+
 // Translated by EñE Partycja Gajek-Nowrot
 // Checked by elmaya
 
@@ -155,4 +157,13 @@
 #define S_SWITCH_OFF_VALUE "valor de desconexión"
 #define S_SETTINGS_FOR_RELAYS "Configuraciones para relés"
 
+//#### SuplaHTTPUpdateServer.cpp ####
+#define S_FLASH_MEMORY_SIZE "Tamaño de la memoria flash"
+#define S_SKETCH_LOADED_SIZE "Tamaño de boceto cargado"
+#define S_SKETCH_UPLOAD_MAX_SIZE "Tamaño máx de carga de bocetos"
+#define S_UPDATE_FIRMWARE "Actualice el firmware"
+#define S_UPDATE_SUCCESS_REBOOTING "¡Actualización exitosa! Reiniciando ..."
+#define S_WARNING "ADVERTENCIA"
+#define S_ONLY_2_STEP_OTA "solo use la actualización OTA de 2 pasos. Usar"
+
 #endif  // _LANGUAGE_ES_S_H_
diff --git a/src/language/fr.h b/src/language/fr.h
index a61dca0c..0beb7cd0 100644
--- a/src/language/fr.h
+++ b/src/language/fr.h
@@ -1,6 +1,8 @@
 #ifndef _LANGUAGE_FR_S_H_
 #define _LANGUAGE_FR_S_H_
 
+#define S_LANG "fr"
+
 // translated by Fryga
 #define S_SETTING_FOR                                          "Paramètres pour "
 #define S_SETTING_WIFI_SSID                                    "Mettre à jour du WIFI"
@@ -153,4 +155,13 @@
 #define S_SWITCH_OFF_VALUE "valeur de coupure"
 #define S_SETTINGS_FOR_RELAYS "Paramètres des relais"
 
+//#### SuplaHTTPUpdateServer.cpp ####
+#define S_FLASH_MEMORY_SIZE "Taille de la mémoire flash"
+#define S_SKETCH_LOADED_SIZE "Taille chargée de l'esquisse"
+#define S_SKETCH_UPLOAD_MAX_SIZE "Taille max. du téléchargement de l'esquisse"
+#define S_UPDATE_FIRMWARE "Mise à jour du firmware"
+#define S_UPDATE_SUCCESS_REBOOTING "Mise à jour réussie! Redémarrage ..."
+#define S_WARNING "ATTENTION"
+#define S_ONLY_2_STEP_OTA "utilisez uniquement la mise à jour OTA en 2 étapes. Utilisation"
+
 #endif  // _LANGUAGE_FR_S_H_
diff --git a/src/language/pl.h b/src/language/pl.h
index 89290df8..d9afba14 100644
--- a/src/language/pl.h
+++ b/src/language/pl.h
@@ -2,6 +2,8 @@
 #ifndef _LANGUAGE_PL_S_H_
 #define _LANGUAGE_PL_S_H_
 
+#define S_LANG "pl"
+
 #define S_SETTING_FOR                                          "Ustawienia dla"
 #define S_SETTING_WIFI_SSID                                    "Ustawienia WIFI"
 #define S_WIFI_SSID                                            "Nazwa sieci"
@@ -153,4 +155,13 @@
 #define S_SWITCH_OFF_VALUE "wartość wyłączenia"
 #define S_SETTINGS_FOR_RELAYS "Ustawienia dla przekaźników"
 
+//#### SuplaHTTPUpdateServer.cpp ####
+#define S_FLASH_MEMORY_SIZE "Rozmiar pamięci Flash"
+#define S_SKETCH_LOADED_SIZE "Rozmiar wczytanego szkicu"
+#define S_SKETCH_UPLOAD_MAX_SIZE "Maks. rozmiar przesyłanego szkicu"
+#define S_UPDATE_FIRMWARE "Aktualizacja oprogramowania"
+#define S_UPDATE_SUCCESS_REBOOTING "Aktualizacja udana! Ponowne uruchamianie ..."
+#define S_WARNING "OSTRZEŻENIE"
+#define S_ONLY_2_STEP_OTA "używaj tylko dwuetapowej aktualizacji OTA. Najpierw załaduj"
+
 #endif  // _LANGUAGE_PL_S_H_