From 99cefbcc1bbfc578ac69cdf58a4389b043d2b726 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 27 Oct 2019 11:52:47 +0100
Subject: [PATCH 001/120] 1.9.4b0

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

diff --git a/src/version.h b/src/version.h
index 9350fda31..c5400672d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.3b5"
+#define APP_VERSION "1.9.4b0"

From 9835ddb127b0353c8ac140f483349ac46e0e403a Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 27 Oct 2019 15:04:18 +0100
Subject: [PATCH 002/120] added MM200 and Junkers Cerapur Top -
 https://github.com/proddy/EMS-ESP/issues/222

---
 src/ems.h         |  2 +-
 src/ems_devices.h | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ems.h b/src/ems.h
index 2e93f0d17..8572655fb 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -186,7 +186,7 @@ const _EMS_TxTelegram EMS_TX_TELEGRAM_NEW = {
 // where defintions are stored
 typedef struct {
     uint8_t product_id;
-    char    model_string[70];
+    char    model_string[80];
 } _Boiler_Device;
 
 typedef struct {
diff --git a/src/ems_devices.h b/src/ems_devices.h
index af8307694..29f3bd46a 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -202,7 +202,7 @@ const _Boiler_Device Boiler_Devices[] = {
     {203, "Buderus Logamax U122/Junkers Cerapur"},
     {208, "Buderus Logamax plus/GB192/Bosch Condens GC9000"},
     {64, "Sieger BK13,BK15/Nefit Smartline/Buderus GB1x2"},
-    {95, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Heatronic 3"},
+    {95, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Junkers HT3"},
     {122, "Nefit Proline"},
     {170, "Buderus Logano GB212"},
     {172, "Nefit Enviline"}
@@ -228,9 +228,12 @@ const _SolarModule_Device SolarModule_Devices[] = {
  * format is PRODUCT ID, DESCRIPTION
  */
 const _Mixing_Device Mixing_Devices[] = {
+
     {160, "MM100 Mixing Module"},
+    {161, "MM200 Mixing Module"},
     {69, "MM10 Mixer Module"},
-    {159, "MM50 Mixing Module"},
+    {159, "MM50 Mixing Module"}
+
 };
 
 // Other EMS devices which are not considered boilers, thermostats or solar modules
@@ -245,6 +248,7 @@ const _Other_Device Other_Devices[] = {
     {125, 0x09, "BC25 Base Controller"},
     {169, 0x09, "BC40 Base Controller"},
     {152, 0x09, "Junkers Controller"},
+    {95, 0x09, "Junkers Controller"},
     {230, 0x09, "BC Base Controller"},
 
     {205, 0x02, "Nefit Moduline Easy Connect"},
@@ -273,7 +277,7 @@ const _Thermostat_Device Thermostat_Devices[] = {
     // Easy devices - not currently supporting write operations
     {EMS_MODEL_EASY, 202, 0x18, "Logamatic TC100/Nefit Moduline Easy", EMS_THERMOSTAT_WRITE_NO},
     {EMS_MODEL_EASY, 203, 0x18, "Bosch EasyControl CT200", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_CW100, 157, 0x18, "Bosch CW100", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_CW100, 157, 0x18, "Bosch CW100/Junkers CW100", EMS_THERMOSTAT_WRITE_NO},
 
     // Buderus/Nefit
     {EMS_MODEL_RC10, 79, 0x17, "RC10/Moduline 100", EMS_THERMOSTAT_WRITE_YES},

From 94b69e602cc46d73d0988467d69d7521c04c143b Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 27 Oct 2019 16:11:25 +0100
Subject: [PATCH 003/120] tidy up and added firmware directory

---
 .gitignore | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 81102fd7d..559d0aabf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,20 @@
 # vscode
 .vscode
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/*
 
 # platformio
 .pio
-.clang_complete
-.gcc-flags.json
 lib/readme.txt
 
 # web stuff compiled
-src/websrc/css/required.css
-src/websrc/js/required.js
-src/websrc/fonts
-src/websrc/gzipped
 src/websrc/temp
-*.gz.h
+src/webh/*.gz.h
 
 # NPM directories
-node_modules/
-jspm_packages/
-.npm
+node_modules
 
-# Output of 'npm pack'
-*.tgz
-
-# dotenv environment variables file
-.env
+# OS specific
+.DS_Store
 
 # project specfic
-.DS_Store
 scripts/stackdmp.txt
-*.bin
+firmware

From ecd28383026d9e665a6571abdba604b81c9a8742 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 27 Oct 2019 16:11:52 +0100
Subject: [PATCH 004/120] make so it can run from outside scripts directory

---
 scripts/build.sh | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index d07a51e09..750ad6113 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -11,16 +11,13 @@ is_git() {
 }
 
 stat_bytes() {
-    echo "size is:"
-    case "$(uname -s)" in
-        Darwin) stat -f %z "$1";;
-        *) stat -c %s "$1";;
-    esac
+	filesize=`du -k "$1" | cut -f1;`
+	echo 'size:' $filesize 'bytes'
 }
 
 # Available environments
 list_envs() {
-    grep env: ../platformio.ini | sed 's/\[env:\(.*\)\]/\1/g'
+    grep env: platformio.ini | sed 's/\[env:\(.*\)\]/\1/g'
 }
 
 print_available() {
@@ -59,7 +56,7 @@ set_default_environments() {
 }
 
 build_webui() {
-    cd ../tools/webfilesbuilder
+    cd ./tools/webfilesbuilder
 
     # Build system uses gulpscript.js to build web interface
     if [ ! -e node_modules/gulp/bin/gulp.js ]; then
@@ -73,12 +70,6 @@ build_webui() {
     echo "Building web interface..."
     node node_modules/gulp/bin/gulp.js || exit
 
-    # TODO: do something if webui files are different
-    # for now, just print in travis log
-    if ${TRAVIS:-false}; then
-        git --no-pager diff --stat
-    fi
-
     cd ../..
 }
 
@@ -88,11 +79,10 @@ build_environments() {
     mkdir -p $destination/EMS-ESP-$version
 
     for environment in $environments; do
-        echo -n "* EMS-ESP-$version-$environment.bin --- "
+        echo "* EMS-ESP-$version-$environment.bin"
         platformio run --silent --environment $environment || exit 1
         stat_bytes .pio/build/$environment/firmware.bin
-        [[ "${TRAVIS_BUILD_STAGE_NAME}" = "Test" ]] || \
-            mv .pio/build/$environment/firmware.bin $destination/EMS-ESP-$version/EMS-ESP-$version-$environment.bin
+        mv .pio/build/$environment/firmware.bin $destination/EMS-ESP-$version/EMS-ESP-$version-$environment.bin
     done
     echo "--------------------------------------------------------------" 
 }
@@ -101,7 +91,7 @@ build_environments() {
 ####### MAIN
 
 destination=firmware
-version_file=../src/version.h
+version_file=./src/version.h
 version=$(grep -E '^#define APP_VERSION' $version_file | awk '{print $3}' | sed 's/"//g')
 
 if ${TRAVIS:-false}; then
@@ -115,6 +105,8 @@ else
     git_tag=
 fi
 
+echo $git_tag
+
 if [[ -n $git_tag ]]; then
     new_version=${version/-*}
     sed -i -e "s@$version@$new_version@" $version_file
@@ -183,7 +175,7 @@ fi
 # for debugging
 echo "* git_revision = $git_revision"
 echo "* git_tag = $git_tag"
-echo "* TRAVIS_EVENT_TYPE = $TRAVIS_EVENT_TYPE"
+echo "* TRAVIS_COMMIT = $TRAVIS_COMMIT"
 echo "* TRAVIS_TAG = $TRAVIS_TAG"
 echo "* TRAVIS_BRANCH = $TRAVIS_BRANCH"
 echo "* TRAVIS_BUILD_STAGE_NAME = $TRAVIS_BUILD_STAGE_NAME"

From 2fcfc4a97e6e731e2d7bc7c9771323637336f1b1 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 27 Oct 2019 22:36:11 +0100
Subject: [PATCH 005/120] add FR50 -
 https://github.com/proddy/EMS-ESP/issues/224

---
 src/ems-esp.cpp   | 7 ++++---
 src/ems_devices.h | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index f8aa35e81..d12285490 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -390,6 +390,7 @@ void showInfo() {
             _m_curr     = 10; // *100
             break;
         case EMS_MODEL_FR10:
+        case EMS_MODEL_FR50:
         case EMS_MODEL_FW100:
         case EMS_MODEL_FW120:
             _m_setpoint = 1; // *10
@@ -684,8 +685,8 @@ void publishValues(bool force) {
                         dataThermostat[THERMOSTAT_SELTEMP] = (double)thermostat->setpoint_roomTemp / 100;
                     if (thermostat->curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
                         dataThermostat[THERMOSTAT_CURRTEMP] = (double)thermostat->curr_roomTemp / 100;
-                } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FW100)
-                           || (ems_getThermostatModel() == EMS_MODEL_FW120)) {
+                } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FR50)
+                           || (ems_getThermostatModel() == EMS_MODEL_FW100) || (ems_getThermostatModel() == EMS_MODEL_FW120)) {
                     if (thermostat->setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
                         dataThermostat[THERMOSTAT_SELTEMP] = (double)thermostat->setpoint_roomTemp / 10;
                     if (thermostat->curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
@@ -1758,7 +1759,7 @@ void WebCallback(JsonObject root) {
                 thermostat["ts"] = (double)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 100;
             if (EMS_Thermostat.hc[hc_num - 1].curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
                 thermostat["tc"] = (double)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 100;
-        } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FW100)
+        } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FR50) || (ems_getThermostatModel() == EMS_MODEL_FW100)
                    || (ems_getThermostatModel() == EMS_MODEL_FW120)) {
             if (EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
                 thermostat["ts"] = (double)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 10;
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 29f3bd46a..9221ae2f2 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -181,6 +181,7 @@ typedef enum {
     EMS_MODEL_OT,
     EMS_MODEL_FW100,
     EMS_MODEL_FR10,
+    EMS_MODEL_FR50,
     EMS_MODEL_FR100,
     EMS_MODEL_FR110,
     EMS_MODEL_FW120,
@@ -297,6 +298,7 @@ const _Thermostat_Device Thermostat_Devices[] = {
     {EMS_MODEL_FR10, 111, 0x18, "Junkers FR10", EMS_THERMOSTAT_WRITE_NO},
     {EMS_MODEL_FR100, 105, 0x18, "Junkers FR100", EMS_THERMOSTAT_WRITE_NO},
     {EMS_MODEL_FR110, 108, 0x18, "Junkers FR110", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FW120, 192, 0x10, "Junkers FW120", EMS_THERMOSTAT_WRITE_NO}
+    {EMS_MODEL_FW120, 192, 0x10, "Junkers FW120", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_FR50, 147, 0x10, "Junkers FR50", EMS_THERMOSTAT_WRITE_NO}
 
 };

From 28b42f797c458ce8fec7182e0a086aac1b8d63af Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 27 Oct 2019 23:01:29 +0100
Subject: [PATCH 006/120] `publish_always` option.
 https://github.com/proddy/EMS-ESP/issues/224

---
 CHANGELOG.md                |  2 ++
 src/custom.htm              | 15 +++++++++++++++
 src/custom.js               | 14 ++++++++++++++
 src/ems-esp.cpp             | 25 +++++++++++++++++++++++++
 src/version.h               |  2 +-
 tools/wsemulator/wserver.js |  1 +
 6 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05747c618..dbc38ac26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added `publish_always` forcing MQTT topics to be always sent regardless if the data hasn't changed
+
 ### Fixed
 
 ### Changed
diff --git a/src/custom.htm b/src/custom.htm
index d7ca2187c..e97ed54e6 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -122,6 +122,21 @@
         <br>
     </div>
 
+    <div class="row form-group">
+        <label class="col-xs-3">Publish Always<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                data-content="Always send MQTT topics, regardless if the payload hasn't changed"></i></label>
+        <span class="col-xs-9">
+            <form>
+                <label class="radio-inline">
+                    <input type="radio" value="1" name="publish_always">Enabled</label>
+                <label class="radio-inline">
+                    <input type="radio" value="0" name="publish_always" checked>Disabled</label>
+            </form>
+        </span>
+        <br>
+    </div>
+
     <div class="row form-group">
         <label class="col-xs-3">Tx mode<i style="margin-left: 10px;"
                 class="glyphicon glyphicon-exclamation-sign text-danger" aria-hidden="true" data-toggle="popover"
diff --git a/src/custom.js b/src/custom.js
index 93eca92fd..416c7a13e 100644
--- a/src/custom.js
+++ b/src/custom.js
@@ -9,6 +9,7 @@ var custom_config = {
         "shower_timer": false,
         "shower_alert": false,
         "publish_time": 120,
+        "publish_always": false,
         "tx_mode": 1
     }
 };
@@ -23,18 +24,26 @@ function listcustom() {
     if (custom_config.settings.led) {
         $("input[name=\"led\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.dallas_parasite) {
         $("input[name=\"dallas_parasite\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.listen_mode) {
         $("input[name=\"listen_mode\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.shower_timer) {
         $("input[name=\"shower_timer\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.shower_alert) {
         $("input[name=\"shower_alert\"][value=\"1\"]").prop("checked", true);
     }
+
+    if (custom_config.settings.publish_always) {
+        $("input[name=\"publish_always\"][value=\"1\"]").prop("checked", true);
+    }
 }
 
 function savecustom() {
@@ -66,6 +75,11 @@ function savecustom() {
         custom_config.settings.led = true;
     }
 
+    custom_config.settings.publish_always = false;
+    if (parseInt($("input[name=\"publish_always\"]:checked").val()) === 1) {
+        custom_config.settings.publish_always = true;
+    }
+
     custom_config.settings.publish_time = parseInt(document.getElementById("publish_time").value);
     custom_config.settings.tx_mode = parseInt(document.getElementById("tx_mode").value);
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index d12285490..c259f1a68 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -89,6 +89,7 @@ typedef struct {
     bool     led;             // LED on/off
     bool     listen_mode;     // stop automatic Tx on/off
     uint16_t publish_time;    // frequency of MQTT publish in seconds
+    bool     publish_always;  // true if publish MQTT regardless if data has changed
     uint8_t  led_gpio;        // pin for LED
     uint8_t  dallas_gpio;     // pin for attaching external dallas temperature sensors
     bool     dallas_parasite; // on/off is using parasite
@@ -113,6 +114,8 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "shower_timer <on | off>", "send MQTT notification on all shower durations"},
     {true, "shower_alert <on | off>", "stop hot water to send 3 cold burst warnings after max shower time is exceeded"},
     {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"},
+    {true, "publish_always <on | off>", "set to on to skip payload comparison since last publish"},
+
     {true, "tx_mode <n>", "changes Tx logic. 1=ems generic, 2=ems+, 3=Junkers HT3"},
 
     {false, "info", "show current captured on the devices"},
@@ -527,6 +530,11 @@ void publishValues(bool force) {
         return;
     }
 
+    // override force
+    if (EMSESP_Settings.publish_always) {
+        force = true;
+    }
+
     char                                      s[20] = {0}; // for formatting strings
     StaticJsonDocument<MQTT_MAX_PAYLOAD_SIZE> doc;
     char                                      data[MQTT_MAX_PAYLOAD_SIZE] = {0};
@@ -1026,6 +1034,7 @@ bool LoadSaveCallback(MYESP_FSACTION action, JsonObject settings) {
         EMSESP_Settings.shower_timer    = settings["shower_timer"];
         EMSESP_Settings.shower_alert    = settings["shower_alert"];
         EMSESP_Settings.publish_time    = settings["publish_time"] | DEFAULT_PUBLISHTIME;
+        EMSESP_Settings.publish_always  = settings["publish_always"];
 
         EMSESP_Settings.listen_mode = settings["listen_mode"];
         ems_setTxDisabled(EMSESP_Settings.listen_mode);
@@ -1045,6 +1054,7 @@ bool LoadSaveCallback(MYESP_FSACTION action, JsonObject settings) {
         settings["shower_timer"]    = EMSESP_Settings.shower_timer;
         settings["shower_alert"]    = EMSESP_Settings.shower_alert;
         settings["publish_time"]    = EMSESP_Settings.publish_time;
+        settings["publish_always"]  = EMSESP_Settings.publish_always;
         settings["tx_mode"]         = EMSESP_Settings.tx_mode;
 
         return true;
@@ -1179,6 +1189,19 @@ bool SetListCallback(MYESP_FSACTION action, uint8_t wc, const char * setting, co
             ok                           = true;
         }
 
+        // publish_always
+        if ((strcmp(setting, "publish_always") == 0) && (wc == 2)) {
+            if (strcmp(value, "on") == 0) {
+                EMSESP_Settings.publish_always = true;
+                ok                             = true;
+            } else if (strcmp(value, "off") == 0) {
+                EMSESP_Settings.publish_always = false;
+                ok                             = true;
+            } else {
+                myDebug_P(PSTR("Error. Usage: set publish_always <on | off>"));
+            }
+        }
+
         // tx_mode
         if ((strcmp(setting, "tx_mode") == 0) && (wc == 2)) {
             uint8_t mode = atoi(value);
@@ -1202,6 +1225,7 @@ bool SetListCallback(MYESP_FSACTION action, uint8_t wc, const char * setting, co
         myDebug_P(PSTR("  shower_timer=%s"), EMSESP_Settings.shower_timer ? "on" : "off");
         myDebug_P(PSTR("  shower_alert=%s"), EMSESP_Settings.shower_alert ? "on" : "off");
         myDebug_P(PSTR("  publish_time=%d"), EMSESP_Settings.publish_time);
+        myDebug_P(PSTR("  publish_always=%s"), EMSESP_Settings.publish_always ? "on" : "off");
     }
 
     return ok;
@@ -1878,6 +1902,7 @@ void initEMSESP() {
     EMSESP_Settings.led            = true; // LED is on by default
     EMSESP_Settings.listen_mode    = false;
     EMSESP_Settings.publish_time   = DEFAULT_PUBLISHTIME;
+    EMSESP_Settings.publish_always = false;
     EMSESP_Settings.timestamp      = millis();
     EMSESP_Settings.dallas_sensors = 0;
     EMSESP_Settings.led_gpio       = EMSESP_LED_GPIO;
diff --git a/src/version.h b/src/version.h
index c5400672d..1533a7e99 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b0"
+#define APP_VERSION "1.9.4b1"
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index 1ae6c2be7..e0689365a 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -102,6 +102,7 @@ var custom_configfile = {
         "shower_timer": true,
         "shower_alert": false,
         "publish_time": 120,
+        "publish_always": false,
         "tx_mode": 1
     }
 };

From c5df5e764ec9c89bde39273eab3ab7afbd8f2d23 Mon Sep 17 00:00:00 2001
From: Christian Weithe <Christian@Christians-MacBook-Pro.local>
Date: Mon, 28 Oct 2019 18:36:58 +0100
Subject: [PATCH 007/120] `publish_always` option.
 https://github.com/proddy/EMS-ESP/issues/224

---
 CHANGELOG.md                |  2 ++
 src/custom.htm              | 15 +++++++++++++++
 src/custom.js               | 14 ++++++++++++++
 src/ems-esp.cpp             | 25 +++++++++++++++++++++++++
 src/version.h               |  2 +-
 tools/wsemulator/wserver.js |  1 +
 6 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05747c618..dbc38ac26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added `publish_always` forcing MQTT topics to be always sent regardless if the data hasn't changed
+
 ### Fixed
 
 ### Changed
diff --git a/src/custom.htm b/src/custom.htm
index d7ca2187c..e97ed54e6 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -122,6 +122,21 @@
         <br>
     </div>
 
+    <div class="row form-group">
+        <label class="col-xs-3">Publish Always<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                data-content="Always send MQTT topics, regardless if the payload hasn't changed"></i></label>
+        <span class="col-xs-9">
+            <form>
+                <label class="radio-inline">
+                    <input type="radio" value="1" name="publish_always">Enabled</label>
+                <label class="radio-inline">
+                    <input type="radio" value="0" name="publish_always" checked>Disabled</label>
+            </form>
+        </span>
+        <br>
+    </div>
+
     <div class="row form-group">
         <label class="col-xs-3">Tx mode<i style="margin-left: 10px;"
                 class="glyphicon glyphicon-exclamation-sign text-danger" aria-hidden="true" data-toggle="popover"
diff --git a/src/custom.js b/src/custom.js
index 93eca92fd..416c7a13e 100644
--- a/src/custom.js
+++ b/src/custom.js
@@ -9,6 +9,7 @@ var custom_config = {
         "shower_timer": false,
         "shower_alert": false,
         "publish_time": 120,
+        "publish_always": false,
         "tx_mode": 1
     }
 };
@@ -23,18 +24,26 @@ function listcustom() {
     if (custom_config.settings.led) {
         $("input[name=\"led\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.dallas_parasite) {
         $("input[name=\"dallas_parasite\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.listen_mode) {
         $("input[name=\"listen_mode\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.shower_timer) {
         $("input[name=\"shower_timer\"][value=\"1\"]").prop("checked", true);
     }
+
     if (custom_config.settings.shower_alert) {
         $("input[name=\"shower_alert\"][value=\"1\"]").prop("checked", true);
     }
+
+    if (custom_config.settings.publish_always) {
+        $("input[name=\"publish_always\"][value=\"1\"]").prop("checked", true);
+    }
 }
 
 function savecustom() {
@@ -66,6 +75,11 @@ function savecustom() {
         custom_config.settings.led = true;
     }
 
+    custom_config.settings.publish_always = false;
+    if (parseInt($("input[name=\"publish_always\"]:checked").val()) === 1) {
+        custom_config.settings.publish_always = true;
+    }
+
     custom_config.settings.publish_time = parseInt(document.getElementById("publish_time").value);
     custom_config.settings.tx_mode = parseInt(document.getElementById("tx_mode").value);
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index d12285490..c259f1a68 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -89,6 +89,7 @@ typedef struct {
     bool     led;             // LED on/off
     bool     listen_mode;     // stop automatic Tx on/off
     uint16_t publish_time;    // frequency of MQTT publish in seconds
+    bool     publish_always;  // true if publish MQTT regardless if data has changed
     uint8_t  led_gpio;        // pin for LED
     uint8_t  dallas_gpio;     // pin for attaching external dallas temperature sensors
     bool     dallas_parasite; // on/off is using parasite
@@ -113,6 +114,8 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "shower_timer <on | off>", "send MQTT notification on all shower durations"},
     {true, "shower_alert <on | off>", "stop hot water to send 3 cold burst warnings after max shower time is exceeded"},
     {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"},
+    {true, "publish_always <on | off>", "set to on to skip payload comparison since last publish"},
+
     {true, "tx_mode <n>", "changes Tx logic. 1=ems generic, 2=ems+, 3=Junkers HT3"},
 
     {false, "info", "show current captured on the devices"},
@@ -527,6 +530,11 @@ void publishValues(bool force) {
         return;
     }
 
+    // override force
+    if (EMSESP_Settings.publish_always) {
+        force = true;
+    }
+
     char                                      s[20] = {0}; // for formatting strings
     StaticJsonDocument<MQTT_MAX_PAYLOAD_SIZE> doc;
     char                                      data[MQTT_MAX_PAYLOAD_SIZE] = {0};
@@ -1026,6 +1034,7 @@ bool LoadSaveCallback(MYESP_FSACTION action, JsonObject settings) {
         EMSESP_Settings.shower_timer    = settings["shower_timer"];
         EMSESP_Settings.shower_alert    = settings["shower_alert"];
         EMSESP_Settings.publish_time    = settings["publish_time"] | DEFAULT_PUBLISHTIME;
+        EMSESP_Settings.publish_always  = settings["publish_always"];
 
         EMSESP_Settings.listen_mode = settings["listen_mode"];
         ems_setTxDisabled(EMSESP_Settings.listen_mode);
@@ -1045,6 +1054,7 @@ bool LoadSaveCallback(MYESP_FSACTION action, JsonObject settings) {
         settings["shower_timer"]    = EMSESP_Settings.shower_timer;
         settings["shower_alert"]    = EMSESP_Settings.shower_alert;
         settings["publish_time"]    = EMSESP_Settings.publish_time;
+        settings["publish_always"]  = EMSESP_Settings.publish_always;
         settings["tx_mode"]         = EMSESP_Settings.tx_mode;
 
         return true;
@@ -1179,6 +1189,19 @@ bool SetListCallback(MYESP_FSACTION action, uint8_t wc, const char * setting, co
             ok                           = true;
         }
 
+        // publish_always
+        if ((strcmp(setting, "publish_always") == 0) && (wc == 2)) {
+            if (strcmp(value, "on") == 0) {
+                EMSESP_Settings.publish_always = true;
+                ok                             = true;
+            } else if (strcmp(value, "off") == 0) {
+                EMSESP_Settings.publish_always = false;
+                ok                             = true;
+            } else {
+                myDebug_P(PSTR("Error. Usage: set publish_always <on | off>"));
+            }
+        }
+
         // tx_mode
         if ((strcmp(setting, "tx_mode") == 0) && (wc == 2)) {
             uint8_t mode = atoi(value);
@@ -1202,6 +1225,7 @@ bool SetListCallback(MYESP_FSACTION action, uint8_t wc, const char * setting, co
         myDebug_P(PSTR("  shower_timer=%s"), EMSESP_Settings.shower_timer ? "on" : "off");
         myDebug_P(PSTR("  shower_alert=%s"), EMSESP_Settings.shower_alert ? "on" : "off");
         myDebug_P(PSTR("  publish_time=%d"), EMSESP_Settings.publish_time);
+        myDebug_P(PSTR("  publish_always=%s"), EMSESP_Settings.publish_always ? "on" : "off");
     }
 
     return ok;
@@ -1878,6 +1902,7 @@ void initEMSESP() {
     EMSESP_Settings.led            = true; // LED is on by default
     EMSESP_Settings.listen_mode    = false;
     EMSESP_Settings.publish_time   = DEFAULT_PUBLISHTIME;
+    EMSESP_Settings.publish_always = false;
     EMSESP_Settings.timestamp      = millis();
     EMSESP_Settings.dallas_sensors = 0;
     EMSESP_Settings.led_gpio       = EMSESP_LED_GPIO;
diff --git a/src/version.h b/src/version.h
index c5400672d..1533a7e99 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b0"
+#define APP_VERSION "1.9.4b1"
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index 1ae6c2be7..e0689365a 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -102,6 +102,7 @@ var custom_configfile = {
         "shower_timer": true,
         "shower_alert": false,
         "publish_time": 120,
+        "publish_always": false,
         "tx_mode": 1
     }
 };

From 13f86edd8a5cb7d58b1ac4e45d6ffbb63fb23533 Mon Sep 17 00:00:00 2001
From: Christian Weithe <Christian@Christians-MacBook-Pro.local>
Date: Mon, 28 Oct 2019 18:42:14 +0100
Subject: [PATCH 008/120] rename RC20F to RC20RF

---
 CHANGELOG.md      |  4 ++--
 src/ems.cpp       | 10 +++++-----
 src/ems_devices.h |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc38ac26..381396edc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -371,7 +371,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Renamed project from EMS-ESP-Boiler to EMS-ESP since it's kinda EMS generic now
-- Support for RC20F and RFM20 (https://github.com/proddy/EMS-ESP/issues/18)
+- Support for RC20RF and RFM20 (https://github.com/proddy/EMS-ESP/issues/18)
 - Moved all EMS device information into a separate file `ems_devices.h` so no longer need to touch `ems.h`
 - Telnet commands can be strings now and output is suspended when typing
 
@@ -392,7 +392,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Scanning known EMS Devices now ignores duplicates (https://github.com/proddy/EMS-ESP/pull/30)
 - ServiceCode stored as a two byte char
-- Support for RC20F and RFM20 (https://github.com/proddy/EMS-ESP/issues/18)
+- Support for RC20RF and RFM20 (https://github.com/proddy/EMS-ESP/issues/18)
 
 ## [1.2.3] 2019-01-03
 
diff --git a/src/ems.cpp b/src/ems.cpp
index cd3cebf24..02c4945ee 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -137,16 +137,16 @@ const _EMS_Type EMS_Types[] = {
     {EMS_MODEL_RC10, EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set},
     {EMS_MODEL_RC10, EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage},
 
-    // RC20 and RC20F
+    // RC20 and RC20RF
     {EMS_MODEL_RC20, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
     {EMS_MODEL_RC20, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
     {EMS_MODEL_RC20, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
     {EMS_MODEL_RC20, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
 
-    {EMS_MODEL_RC20F, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
-    {EMS_MODEL_RC20F, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_MODEL_RC20F, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
-    {EMS_MODEL_RC20F, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
+    {EMS_MODEL_RC20RF, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
+    {EMS_MODEL_RC20RF, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
+    {EMS_MODEL_RC20RF, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
+    {EMS_MODEL_RC20RF, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
 
     // RC30
     {EMS_MODEL_RC30, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 9221ae2f2..49a075d26 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -171,7 +171,7 @@ typedef enum {
     EMS_MODEL_ES73,
     EMS_MODEL_RC10,
     EMS_MODEL_RC20,
-    EMS_MODEL_RC20F,
+    EMS_MODEL_RC20RF,
     EMS_MODEL_RC30,
     EMS_MODEL_RC35,
     EMS_MODEL_EASY,
@@ -283,7 +283,7 @@ const _Thermostat_Device Thermostat_Devices[] = {
     // Buderus/Nefit
     {EMS_MODEL_RC10, 79, 0x17, "RC10/Moduline 100", EMS_THERMOSTAT_WRITE_YES},
     {EMS_MODEL_RC20, 77, 0x17, "RC20/Moduline 300", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC20F, 93, 0x18, "RC20F", EMS_THERMOSTAT_WRITE_YES},
+    {EMS_MODEL_RC20RF, 93, 0x18, "RC20RF", EMS_THERMOSTAT_WRITE_YES},
     {EMS_MODEL_RC30, 67, 0x10, "RC30", EMS_THERMOSTAT_WRITE_YES},
     {EMS_MODEL_RC30, 78, 0x10, "RC30/Moduline 400", EMS_THERMOSTAT_WRITE_YES},
     {EMS_MODEL_RC35, 86, 0x10, "RC35", EMS_THERMOSTAT_WRITE_YES},

From c62502052d0d24ab636fd6855f1ce2d9d547ffb1 Mon Sep 17 00:00:00 2001
From: Christian Weithe <Christian@Christians-MacBook-Pro.local>
Date: Mon, 28 Oct 2019 19:26:29 +0100
Subject: [PATCH 009/120] RC20RF tap water one time loading function

---
 src/ems-esp.cpp   | 16 +++++++++++++++-
 src/ems.cpp       | 22 ++++++++++++++++++++++
 src/ems.h         |  1 +
 src/ems_devices.h |  2 ++
 src/my_config.h   |  1 +
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index c259f1a68..44ffee0de 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -592,6 +592,9 @@ void publishValues(bool force) {
 
     if (EMS_Boiler.wWActivated != EMS_VALUE_INT_NOTSET)
         rootBoiler["wWActivated"] = _bool_to_char(s, EMS_Boiler.wWActivated);
+    
+    if (EMS_Boiler.wWActivated != EMS_VALUE_INT_NOTSET)
+        rootBoiler["wWOnetime"] = _bool_to_char(s, EMS_Boiler.wWOneTime);
 
     if (EMS_Boiler.burnGas != EMS_VALUE_INT_NOTSET)
         rootBoiler["burnGas"] = _bool_to_char(s, EMS_Boiler.burnGas);
@@ -1506,8 +1509,9 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
         // this is used for example for comfort, flowtemp
         myESP.mqttSubscribe(TOPIC_BOILER_CMD);
 
-        // these two need to be unqiue topics
+        // these three need to be unqiue topics
         myESP.mqttSubscribe(TOPIC_BOILER_CMD_WWACTIVATED);
+        myESP.mqttSubscribe(TOPIC_BOILER_CMD_WWONETIME);
         myESP.mqttSubscribe(TOPIC_BOILER_CMD_WWTEMP);
 
         // generic incoming MQTT command for EMS-ESP
@@ -1621,6 +1625,16 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
         return;
     }
 
+    // wwOneTime
+    if (strcmp(topic, TOPIC_BOILER_CMD_WWONETIME) == 0) {
+        if (message[0] == '1' || strcmp(message, "on") == 0) {
+            ems_setWarmWaterOnetime(true);
+        } else if (message[0] == '0' || strcmp(message, "off") == 0) {
+            ems_setWarmWaterOnetime(false);
+        }
+        return;
+    }
+
     // boiler wwtemp changes
     if (strcmp(topic, TOPIC_BOILER_CMD_WWTEMP) == 0) {
         uint8_t t = atoi((char *)message);
diff --git a/src/ems.cpp b/src/ems.cpp
index 02c4945ee..8dc5771c3 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1292,6 +1292,28 @@ void _process_UBAMonitorWWMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.wWCurFlow = _toByte(9);
 }
 
+/**
+ * Activate / De-activate One Time warm water 0x35
+ * true = on, false = off
+ */
+void ems_setWarmWaterOnetime(bool activated) {
+    myDebug_P(PSTR("Setting boiler warm water OneTime loading %s"), activated ? "on" : "off");
+
+    _EMS_TxTelegram EMS_TxTelegram = EMS_TX_TELEGRAM_NEW; // create new Tx
+    EMS_TxTelegram.timestamp       = millis();            // set timestamp
+    EMS_Sys_Status.txRetryCount    = 0;                   // reset retry counter
+
+    EMS_TxTelegram.action        = EMS_TX_TELEGRAM_WRITE;
+    EMS_TxTelegram.dest          = EMS_Boiler.device_id;
+    EMS_TxTelegram.type          = EMS_TYPE_UBAFlags;
+    EMS_TxTelegram.offset        = EMS_OFFSET_UBAParameterWW_wwOneTime;
+    EMS_TxTelegram.length        = EMS_MIN_TELEGRAM_LENGTH;
+    EMS_TxTelegram.type_validate = EMS_ID_NONE;               // don't validate
+    EMS_TxTelegram.dataValue     = (activated ? 0x22 : 0x02); // 0x22 is on, 0x02 is off for RC20RF
+
+    EMS_TxQueue.push(EMS_TxTelegram);
+}
+
 /**
  * UBAMonitorFast - type 0x18 - central heating monitor part 1 (25 bytes long)
  * received every 10 seconds
diff --git a/src/ems.h b/src/ems.h
index 8572655fb..59a9bcb7e 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -408,6 +408,7 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc);
 void ems_setWarmWaterTemp(uint8_t temperature);
 void ems_setFlowTemp(uint8_t temperature);
 void ems_setWarmWaterActivated(bool activated);
+void ems_setWarmWaterOnetime(bool activated);
 void ems_setWarmTapWaterActivated(bool activated);
 void ems_setPoll(bool b);
 void ems_setLogging(_EMS_SYS_LOGGING loglevel, bool silent = false);
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 49a075d26..7c1fb5fa8 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -26,6 +26,7 @@
 #define EMS_TYPE_UBAMaintenanceStatusMessage 0x1C // is an automatic monitor broadcast
 #define EMS_TYPE_UBAParameterWW 0x33
 #define EMS_TYPE_UBATotalUptimeMessage 0x14
+#define EMS_TYPE_UBAFlags 0x35
 #define EMS_TYPE_UBAMaintenanceSettingsMessage 0x15
 #define EMS_TYPE_UBAParametersMessage 0x16
 #define EMS_TYPE_UBASetPoints 0x1A
@@ -33,6 +34,7 @@
 
 #define EMS_OFFSET_UBAParameterWW_wwtemp 2                  // WW Temperature
 #define EMS_OFFSET_UBAParameterWW_wwactivated 1             // WW Activated
+#define EMS_OFFSET_UBAParameterWW_wwOneTime 5               // WW OneTime loading
 #define EMS_OFFSET_UBAParameterWW_wwComfort 9               // WW is in comfort or eco mode
 #define EMS_VALUE_UBAParameterWW_wwComfort_Hot 0x00         // the value for hot
 #define EMS_VALUE_UBAParameterWW_wwComfort_Eco 0xD8         // the value for eco
diff --git a/src/my_config.h b/src/my_config.h
index dfcd59578..a36662d9d 100644
--- a/src/my_config.h
+++ b/src/my_config.h
@@ -44,6 +44,7 @@
 
 #define TOPIC_BOILER_CMD "boiler_cmd"                         // for receiving boiler commands via MQTT
 #define TOPIC_BOILER_CMD_WWACTIVATED "boiler_cmd_wwactivated" // change water on/off
+#define TOPIC_BOILER_CMD_WWONETIME "boiler_cmd_wwonetime"     // warm warter one time loading
 #define TOPIC_BOILER_CMD_WWTEMP "boiler_cmd_wwtemp"           // wwtemp changes via MQTT
 #define TOPIC_BOILER_CMD_COMFORT "comfort"                    // ww comfort setting via MQTT
 #define TOPIC_BOILER_CMD_FLOWTEMP "flowtemp"                  // flowtemp value via MQTT

From fe9bc33117c3320559312fdfc5aac67bed076916 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 28 Oct 2019 20:42:13 +0100
Subject: [PATCH 010/120] DWH OneTime -
 https://github.com/proddy/EMS-ESP/issues/195

---
 CHANGELOG.md  | 1 +
 src/version.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 381396edc..4232f2abb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Added `publish_always` forcing MQTT topics to be always sent regardless if the data hasn't changed
+- Support for DHW once (OneTime water) heating command via MQTT [issue 195](https://github.com/proddy/EMS-ESP/issues/195)
 
 ### Fixed
 
diff --git a/src/version.h b/src/version.h
index 1533a7e99..9a2395692 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b1"
+#define APP_VERSION "1.9.4b2"

From c256f3803fc2c623e8958bf4e35e9a4ecd127ec3 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 28 Oct 2019 20:42:29 +0100
Subject: [PATCH 011/120] added more Junkers devices

---
 src/ems-esp.cpp   |  2 +-
 src/ems.cpp       | 13 ++++++-------
 src/ems_devices.h | 33 +++++++++++++++++----------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 44ffee0de..b0f830572 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -592,7 +592,7 @@ void publishValues(bool force) {
 
     if (EMS_Boiler.wWActivated != EMS_VALUE_INT_NOTSET)
         rootBoiler["wWActivated"] = _bool_to_char(s, EMS_Boiler.wWActivated);
-    
+
     if (EMS_Boiler.wWActivated != EMS_VALUE_INT_NOTSET)
         rootBoiler["wWOnetime"] = _bool_to_char(s, EMS_Boiler.wWOneTime);
 
diff --git a/src/ems.cpp b/src/ems.cpp
index 8dc5771c3..93c7d1e7d 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -187,8 +187,8 @@ const _EMS_Type EMS_Types[] = {
     {EMS_MODEL_ALL, EMS_TYPE_JunkersStatusMessage, "JunkersStatusMessage", _process_JunkersStatusMessage},
 
     // Mixing devices
-    {EMS_MODEL_MM100, EMS_TYPE_MMPLUSStatusMessage_HC1, "MMPLUSStatusMessage_HC1", _process_MMPLUSStatusMessage},
-    {EMS_MODEL_MM100, EMS_TYPE_MMPLUSStatusMessage_HC2, "MMPLUSStatusMessage_HC2", _process_MMPLUSStatusMessage},
+    {EMS_MODEL_MM, EMS_TYPE_MMPLUSStatusMessage_HC1, "MMPLUSStatusMessage_HC1", _process_MMPLUSStatusMessage},
+    {EMS_MODEL_MM, EMS_TYPE_MMPLUSStatusMessage_HC2, "MMPLUSStatusMessage_HC2", _process_MMPLUSStatusMessage},
 
 };
 
@@ -2521,8 +2521,10 @@ void ems_scanDevices() {
 
     std::list<uint8_t> Device_Ids; // create a new list
 
-    // add boiler device_id which is always 0x08
-    Device_Ids.push_back(EMS_ID_BOILER);
+
+    Device_Ids.push_back(EMS_ID_BOILER); // add boiler device_id which is always 0x08
+    Device_Ids.push_back(EMS_ID_HP);     // add heat pump
+    Device_Ids.push_back(EMS_ID_SM);     // add solar module
 
     // copy over thermostats
     for (_Thermostat_Device tt : Thermostat_Devices) {
@@ -2534,9 +2536,6 @@ void ems_scanDevices() {
         Device_Ids.push_back(ot.device_id);
     }
 
-    Device_Ids.push_back(EMS_ID_HP); // add heat pump
-    Device_Ids.push_back(EMS_ID_SM); // add solar module
-
     // remove duplicates and reserved IDs (like our own device)
     Device_Ids.sort();
     Device_Ids.unique();
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 7c1fb5fa8..dec79a6d7 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -160,16 +160,12 @@ typedef enum {
     EMS_MODEL_NONE, // unset
     EMS_MODEL_ALL,  // common for all devices
 
-    // heatpump
-    EMS_MODEL_HP,
+    EMS_MODEL_HP,  // heatpump
+    EMS_MODEL_SM,  // solar module
+    EMS_MODEL_MM,  // mixer module
+    EMS_MODEL_UBA, // boiler
 
-    // solar module
-    EMS_MODEL_SM,
-
-    // boiler
-    EMS_MODEL_UBA,
-
-    // and the thermostats
+    // and the various thermostats
     EMS_MODEL_ES73,
     EMS_MODEL_RC10,
     EMS_MODEL_RC20,
@@ -187,9 +183,8 @@ typedef enum {
     EMS_MODEL_FR100,
     EMS_MODEL_FR110,
     EMS_MODEL_FW120,
-
-    // mixing devices
-    EMS_MODEL_MM100
+    EMS_MODEL_FW200,
+    EMS_MODEL_FR120
 
 } _EMS_MODEL_ID;
 
@@ -235,7 +230,10 @@ const _Mixing_Device Mixing_Devices[] = {
     {160, "MM100 Mixing Module"},
     {161, "MM200 Mixing Module"},
     {69, "MM10 Mixer Module"},
-    {159, "MM50 Mixing Module"}
+    {159, "MM50 Mixing Module"},
+    {79, "MM100 Mixer Module"},
+    {80, "MM200 Mixer Module"},
+    {78, "MM400 Mixer Module"}
 
 };
 
@@ -251,7 +249,7 @@ const _Other_Device Other_Devices[] = {
     {125, 0x09, "BC25 Base Controller"},
     {169, 0x09, "BC40 Base Controller"},
     {152, 0x09, "Junkers Controller"},
-    {95, 0x09, "Junkers Controller"},
+    {95, 0x09, "Junkers HT3 Controller"},
     {230, 0x09, "BC Base Controller"},
 
     {205, 0x02, "Nefit Moduline Easy Connect"},
@@ -274,6 +272,7 @@ const _HeatPump_Device HeatPump_Devices[] = {
 /*
  * Known thermostat types and their capabilities
  * format is MODEL_ID, PRODUCT ID, DEVICE ID, DESCRIPTION
+ * Typically on DeviceID 0x10 or 0x18
  */
 const _Thermostat_Device Thermostat_Devices[] = {
 
@@ -297,9 +296,11 @@ const _Thermostat_Device Thermostat_Devices[] = {
 
     // Junkers
     {EMS_MODEL_FW100, 105, 0x10, "Junkers FW100", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FR10, 111, 0x18, "Junkers FR10", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FR100, 105, 0x18, "Junkers FR100", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_FW200, 106, 0x10, "Junkers FW200", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_FR100, 107, 0x18, "Junkers FR100", EMS_THERMOSTAT_WRITE_NO},
     {EMS_MODEL_FR110, 108, 0x18, "Junkers FR110", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_FR10, 111, 0x18, "Junkers FR10", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_FR120, 191, 0x10, "Junkers FR120", EMS_THERMOSTAT_WRITE_NO},
     {EMS_MODEL_FW120, 192, 0x10, "Junkers FW120", EMS_THERMOSTAT_WRITE_NO},
     {EMS_MODEL_FR50, 147, 0x10, "Junkers FR50", EMS_THERMOSTAT_WRITE_NO}
 

From 9967c96b7b22d17d0a8bfb6331089bd723a24516 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 28 Oct 2019 22:39:34 +0100
Subject: [PATCH 012/120] fix bug for receiving HA thermostat cmds

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

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index b0f830572..2c2631389 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1492,11 +1492,11 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
         char topic_s[50];
         char buffer[4];
         for (uint8_t hc = 1; hc <= EMS_THERMOSTAT_MAXHC; hc++) {
-            strlcpy(topic_s, TOPIC_THERMOSTAT_CMD_TEMP, sizeof(topic_s));
+            strlcpy(topic_s, TOPIC_THERMOSTAT_CMD_TEMP_HA, sizeof(topic_s));
             strlcat(topic_s, itoa(hc, buffer, 10), sizeof(topic_s));
             myESP.mqttSubscribe(topic_s);
 
-            strlcpy(topic_s, TOPIC_THERMOSTAT_CMD_MODE, sizeof(topic_s));
+            strlcpy(topic_s, TOPIC_THERMOSTAT_CMD_MODE_HA, sizeof(topic_s));
             strlcat(topic_s, itoa(hc, buffer, 10), sizeof(topic_s));
             myESP.mqttSubscribe(topic_s);
         }

From 7a46e857c0c7153b4be2d1056bf7fbb1cda57f9a Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 28 Oct 2019 23:07:45 +0100
Subject: [PATCH 013/120] remove directory to get travis to behave

---
 scripts/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 750ad6113..aca0f9e1d 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -76,13 +76,14 @@ build_webui() {
 build_environments() {
     echo "--------------------------------------------------------------"
     echo "Building firmware images..."
-    mkdir -p $destination/EMS-ESP-$version
+    # mkdir -p $destination
 
     for environment in $environments; do
         echo "* EMS-ESP-$version-$environment.bin"
         platformio run --silent --environment $environment || exit 1
         stat_bytes .pio/build/$environment/firmware.bin
-        mv .pio/build/$environment/firmware.bin $destination/EMS-ESP-$version/EMS-ESP-$version-$environment.bin
+        # mv .pio/build/$environment/firmware.bin $destination/EMS-ESP-$version-$environment.bin
+        mv .pio/build/$environment/firmware.bin EMS-ESP-$version-$environment.bin
     done
     echo "--------------------------------------------------------------" 
 }

From cc120cab1dc72dc96ee105b43a83bb77d8553330 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 10:57:43 +0100
Subject: [PATCH 014/120] automated builds

---
 .travis.yml | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ems.cpp |  8 ++++--
 2 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..7b3f44657
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,82 @@
+os: linux
+language: python
+python:
+  - '2.7'
+
+cache:
+  directories:
+    - ${HOME}/.pio
+
+env:
+  global:
+#   - BUILDER_TOTAL_THREADS=4
+    - BUILDER_TOTAL_THREADS=1
+    - OWNER=${TRAVIS_REPO_SLUG%/*}
+    - DEV=${OWNER/proddy/dev}
+    - BRANCH=${TRAVIS_BRANCH/dev/}
+    - TAG=${DEV}${BRANCH:+_}${BRANCH}
+
+install:
+  - env | grep TRAVIS
+  - set -e
+  - pip install -U platformio
+  - pio platform update -p
+  - set +e
+
+branches:
+  except:
+    - /^travis-.*-build$/
+
+script:
+  - ./scripts/build.sh
+# - ./scripts/build.sh -p
+
+stages:
+  - name: Release
+#    if: type IN (cron, api)
+
+jobs:
+  include:
+  - stage: Release
+#    env: BUILDER_THREAD=0
+#  - env: BUILDER_THREAD=1
+#  - env: BUILDER_THREAD=2
+#  - env: BUILDER_THREAD=3
+
+before_deploy:
+  - git tag -f travis-${TAG}-build
+  - git remote add gh
+    https://${OWNER}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
+  - git push gh :travis-${TAG}-build || true
+  - git push -f gh travis-${TAG}-build
+  - git remote remove gh
+
+deploy:
+  provider: releases
+  edge:
+    branch: master
+  token: ${GITHUB_TOKEN} 
+  file_glob: true
+  file: "*.bin"
+  name: EMS-ESP development build (${TRAVIS_BRANCH})
+  release_notes: Automatic EMS-ESP development build of $TRAVIS_BRANCH branch
+    (commit $TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z').
+  cleanup: false
+  prerelease: true
+  overwrite: true
+  target_commitish: $TRAVIS_COMMIT
+  on:
+    tags: false
+    branch: dev
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+
+  #webhooks:
+  #  urls:
+  #    - https://webhooks.gitter.im/e/83e4c4ab123eca3082b4
+  #  on_success: change  # options: [always|never|change] default: always
+  #  on_failure: always  # options: [always|never|change] default: always
+  #  on_start: false     # default: false
diff --git a/src/ems.cpp b/src/ems.cpp
index 93c7d1e7d..3af8a630d 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1520,9 +1520,11 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
         case EMS_OFFSET_RCPLUSStatusMessage_currsetpoint:         // current setpoint temp,  e.g. Thermostat -> all, telegram: 10 00 FF 06 01 A5 22
             EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(0); // value is * 2
             break;
-        case EMS_OFFSET_RCPLUSStatusMessage_mode:            // thermostat mode auto/manual
-                                                             // manual : 10 00 FF 0A 01 A5 02
-                                                             // auto : Thermostat -> all, type 0x01A5 telegram: 10 00 FF 0A 01 A5 03
+        case EMS_OFFSET_RCPLUSStatusMessage_mode: // thermostat mode auto/manual
+                                                  // manual : 10 00 FF 0A 01 A5 02
+                                                  // auto : Thermostat -> all, type 0x01A5 telegram: 10 00 FF 0A 01 A5 03
+
+            // TODO this may be bit 2 instead of 1 on an RC300 - still to validate
             EMS_Thermostat.hc[hc].mode     = _bitRead(0, 0); // bit 1, mode (auto=1 or manual=0)
             EMS_Thermostat.hc[hc].day_mode = _bitRead(0, 1); // get day mode flag
 

From aa2e1b5058c3f2cd468a2666343d9c31c3f841c4 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 12:13:47 +0100
Subject: [PATCH 015/120] Added permissions for build.sh

---
 scripts/build.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/build.sh

diff --git a/scripts/build.sh b/scripts/build.sh
old mode 100644
new mode 100755

From 6fd0497eccf195f6676dccced9e7b7f2907bbc4c Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 13:54:53 +0100
Subject: [PATCH 016/120] update automatic build text

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b3f44657..28f538573 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,9 +58,9 @@ deploy:
   token: ${GITHUB_TOKEN} 
   file_glob: true
   file: "*.bin"
-  name: EMS-ESP development build (${TRAVIS_BRANCH})
-  release_notes: Automatic EMS-ESP development build of $TRAVIS_BRANCH branch
-    (commit $TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z').
+  name: latest development build
+  release_notes: Automatic firmware builds of the latest EMS-ESP $TRAVIS_BRANCH branch
+    (commit $TRAVIS_COMMIT). Built by Travis CI on $(date +'%F %T %Z').
   cleanup: false
   prerelease: true
   overwrite: true

From 15954d0e8298d4cd7f087940e68c0e873f40156e Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 18:02:51 +0100
Subject: [PATCH 017/120] text changes and formatting

---
 .travis.yml     | 34 ++++++++++++++++++----------------
 src/ems-esp.cpp |  4 ++--
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 28f538573..4f0de059e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 os: linux
 language: python
 python:
-  - '2.7'
+  - "2.7"
 
 cache:
   directories:
@@ -9,7 +9,7 @@ cache:
 
 env:
   global:
-#   - BUILDER_TOTAL_THREADS=4
+    #   - BUILDER_TOTAL_THREADS=4
     - BUILDER_TOTAL_THREADS=1
     - OWNER=${TRAVIS_REPO_SLUG%/*}
     - DEV=${OWNER/proddy/dev}
@@ -33,15 +33,15 @@ script:
 
 stages:
   - name: Release
-#    if: type IN (cron, api)
+#   if: type IN (cron, api)
 
 jobs:
   include:
-  - stage: Release
-#    env: BUILDER_THREAD=0
-#  - env: BUILDER_THREAD=1
-#  - env: BUILDER_THREAD=2
-#  - env: BUILDER_THREAD=3
+    - stage: Release
+#     env: BUILDER_THREAD=0
+#   - env: BUILDER_THREAD=1
+#   - env: BUILDER_THREAD=2
+#   - env: BUILDER_THREAD=3
 
 before_deploy:
   - git tag -f travis-${TAG}-build
@@ -55,11 +55,13 @@ deploy:
   provider: releases
   edge:
     branch: master
-  token: ${GITHUB_TOKEN} 
+  token: ${GITHUB_TOKEN}
   file_glob: true
+  # file: "firmware/*.bin"
   file: "*.bin"
   name: latest development build
-  release_notes: Automatic firmware builds of the latest EMS-ESP $TRAVIS_BRANCH branch
+  release_notes:
+    Automatic firmware builds of the current EMS-ESP $TRAVIS_BRANCH branch
     (commit $TRAVIS_COMMIT). Built by Travis CI on $(date +'%F %T %Z').
   cleanup: false
   prerelease: true
@@ -74,9 +76,9 @@ notifications:
     on_success: change
     on_failure: change
 
-  #webhooks:
-  #  urls:
-  #    - https://webhooks.gitter.im/e/83e4c4ab123eca3082b4
-  #  on_success: change  # options: [always|never|change] default: always
-  #  on_failure: always  # options: [always|never|change] default: always
-  #  on_start: false     # default: false
+webhooks:
+  urls:
+    - https://webhooks.gitter.im/e/83e4c4ab123eca3082b4
+  on_success: change # options: [always|never|change] default: always
+  on_failure: always # options: [always|never|change] default: always
+  on_start: false # default: false
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 2c2631389..fe45dc3da 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -116,7 +116,7 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"},
     {true, "publish_always <on | off>", "set to on to skip payload comparison since last publish"},
 
-    {true, "tx_mode <n>", "changes Tx logic. 1=ems generic, 2=ems+, 3=Junkers HT3"},
+    {true, "tx_mode <n>", "changes Tx logic. 1=EMS generic, 2=EMS+, 3=HT3"},
 
     {false, "info", "show current captured on the devices"},
     {false, "log <n | b | t | s | r | j | v>", "set logging mode to none, basic, thermostat only, solar module only, raw, jabber or verbose"},
@@ -237,7 +237,7 @@ void showInfo() {
     myDebug_P(PSTR("\n%sEMS Bus stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
 
     if (ems_getBusConnected()) {
-        myDebug_P(PSTR("  Bus is connected, protocol: %s"), ((EMS_Sys_Status.emsIDMask == 0x80) ? "Junkers HT3" : "Buderus"));
+        myDebug_P(PSTR("  Bus is connected, protocol: %s"), ((EMS_Sys_Status.emsIDMask == 0x80) ? "HT3" : "Buderus"));
         myDebug_P(PSTR("  Rx: # successful read requests=%d, # CRC errors=%d"), EMS_Sys_Status.emsRxPgks, EMS_Sys_Status.emxCrcErr);
 
         if (ems_getTxCapable()) {

From 0bb598efe7db815fcb328932bf1aa503bb2dbc0e Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 18:03:08 +0100
Subject: [PATCH 018/120] added Greenstar i

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

diff --git a/src/ems.h b/src/ems.h
index 59a9bcb7e..fa52f1373 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -186,7 +186,7 @@ const _EMS_TxTelegram EMS_TX_TELEGRAM_NEW = {
 // where defintions are stored
 typedef struct {
     uint8_t product_id;
-    char    model_string[80];
+    char    model_string[100];
 } _Boiler_Device;
 
 typedef struct {
diff --git a/src/ems_devices.h b/src/ems_devices.h
index dec79a6d7..1078b1e33 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -200,7 +200,7 @@ const _Boiler_Device Boiler_Devices[] = {
     {203, "Buderus Logamax U122/Junkers Cerapur"},
     {208, "Buderus Logamax plus/GB192/Bosch Condens GC9000"},
     {64, "Sieger BK13,BK15/Nefit Smartline/Buderus GB1x2"},
-    {95, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Junkers HT3"},
+    {95, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Worcester Greenstar i/Generic HT3"},
     {122, "Nefit Proline"},
     {170, "Buderus Logano GB212"},
     {172, "Nefit Enviline"}
@@ -249,7 +249,7 @@ const _Other_Device Other_Devices[] = {
     {125, 0x09, "BC25 Base Controller"},
     {169, 0x09, "BC40 Base Controller"},
     {152, 0x09, "Junkers Controller"},
-    {95, 0x09, "Junkers HT3 Controller"},
+    {95, 0x09, "HT3 Controller"},
     {230, 0x09, "BC Base Controller"},
 
     {205, 0x02, "Nefit Moduline Easy Connect"},

From 65428f74d0256f4468b33f4243e856a46c6ff0d1 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 18:06:09 +0100
Subject: [PATCH 019/120] added comment

---
 scripts/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/build.sh b/scripts/build.sh
index aca0f9e1d..dac14fc93 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -76,6 +76,7 @@ build_webui() {
 build_environments() {
     echo "--------------------------------------------------------------"
     echo "Building firmware images..."
+    # don't move to firmware folder until Travis fixed (see https://github.com/travis-ci/dpl/issues/846#issuecomment-547157406)
     # mkdir -p $destination
 
     for environment in $environments; do

From 53ab8106776bf9c7021bd043cc78ed0393931660 Mon Sep 17 00:00:00 2001
From: Proddy <proddy@users.noreply.github.com>
Date: Tue, 29 Oct 2019 18:13:49 +0100
Subject: [PATCH 020/120] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c80759829..3d58fb72c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![release-date](https://img.shields.io/github/release-date/proddy/EMS-ESP.svg?label=Released)](https://github.com/proddy/EMS-ESP/commits/master)
 <br />
 [![license](https://img.shields.io/github/license/proddy/EMS-ESP.svg)](LICENSE)
-[![travis](https://travis-ci.com/proddy/EMS-ESP.svg?branch=master)](https://travis-ci.com/proddy/EMS-ESP)
+[![travis](https://travis-ci.com/proddy/EMS-ESP.svg?branch=dev)](https://travis-ci.com/proddy/EMS-ESP)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/b8880625bdf841d4adb2829732030887)](https://app.codacy.com/app/proddy/EMS-ESP?utm_source=github.com&utm_medium=referral&utm_content=proddy/EMS-ESP&utm_campaign=Badge_Grade_Settings)
 [![downloads](https://img.shields.io/github/downloads/proddy/EMS-ESP/total.svg)](https://github.com/proddy/EMS-ESP/releases)
 <br />
@@ -50,4 +50,4 @@ Follow [these instructions](https://github.com/proddy/EMS-ESP/wiki/Building-and-
 The firmware fully supports BBQKees' [EMS Gateway](https://shop.hotgoodies.nl/ems/) board with integrated Wemos D1 ESP8266.
 
 | ![on boiler](https://github.com/proddy/EMS-ESP/raw/master/doc/ems%20gateway/on-boiler.jpg) | ![kit](https://github.com/proddy/EMS-ESP/raw/master/doc/ems%20gateway/ems-kit-2.jpg) | ![basic circuit](https://github.com/proddy/EMS-ESP/raw/master/doc/ems%20gateway/ems-board-white.jpg) |
-| ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------- |
\ No newline at end of file
+| ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------- |

From ce17d5fdee4f04c78fde8160f9d85d4cf8c02d57 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 22:34:32 +0100
Subject: [PATCH 021/120] prep for downloading beta versions via web upgrade

---
 src/MyESP.cpp               | 23 ++++++++++++++++-------
 src/MyESP.h                 |  5 +++--
 src/ems-esp.cpp             |  4 ++--
 tools/wsemulator/wserver.js |  1 +
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index c75ccee53..f39406874 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -2531,11 +2531,12 @@ void MyESP::_sendCustomStatus() {
 
     JsonObject root = doc.to<JsonObject>();
 
-    root["command"]    = "custom_status";
-    root["version"]    = _app_version;
-    root["customname"] = _app_name;
-    root["appurl"]     = _app_url;
-    root["updateurl"]  = _app_updateurl;
+    root["command"]       = "custom_status";
+    root["version"]       = _app_version;
+    root["customname"]    = _app_name;
+    root["appurl"]        = _app_url;
+    root["updateurl"]     = _app_updateurl;
+    root["updateurl_dev"] = _app_updateurl_dev;
 
     // add specific custom stuff
     if (_web_callback_f) {
@@ -2914,12 +2915,20 @@ void MyESP::_bootupSequence() {
 }
 
 // setup MyESP
-void MyESP::begin(const char * app_hostname, const char * app_name, const char * app_version, const char * app_url, const char * app_updateurl) {
+void MyESP::begin(const char * app_hostname, const char * app_name, const char * app_version, const char * app_url, const char * app_url_api) {
     _general_hostname = strdup(app_hostname);
     _app_name         = strdup(app_name);
     _app_version      = strdup(app_version);
     _app_url          = strdup(app_url);
-    _app_updateurl    = strdup(app_updateurl);
+
+    char s[100];
+    strlcpy(s, app_url_api, sizeof(s));
+    strlcat(s, "/releases/latest", sizeof(s)); // append "/releases/latest"
+    _app_updateurl = strdup(s);
+
+    strlcpy(s, app_url_api, sizeof(s));
+    strlcat(s, "/releases/tags/travis-dev-build", sizeof(s)); // append "/releases/tags/travis-dev-build"
+    _app_updateurl_dev = strdup(s);
 
     _telnet_setup(); // Telnet setup, called first to set Serial
 
diff --git a/src/MyESP.h b/src/MyESP.h
index 8e7456627..fbebf7a32 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.12"
+#define MYESP_VERSION "1.2.13"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -308,7 +308,7 @@ class MyESP {
     // general
     void     end();
     void     loop();
-    void     begin(const char * app_hostname, const char * app_name, const char * app_version, const char * app_url, const char * app_updateurl);
+    void     begin(const char * app_hostname, const char * app_name, const char * app_version, const char * app_url, const char * app_url_api);
     void     resetESP();
     int      getWifiQuality();
     void     showSystemStats();
@@ -407,6 +407,7 @@ class MyESP {
     char *        _app_version;
     char *        _app_url;
     char *        _app_updateurl;
+    char *        _app_updateurl_dev;
     bool          _suspendOutput;
     bool          _general_serial;
     bool          _general_log_events;
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index fe45dc3da..9db85400d 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -31,7 +31,7 @@ DS18 ds18;
 #define APP_NAME "EMS-ESP"
 #define APP_HOSTNAME "ems-esp"
 #define APP_URL "https://github.com/proddy/EMS-ESP"
-#define APP_UPDATEURL "https://api.github.com/repos/proddy/EMS-ESP/releases/latest"
+#define APP_URL_API "https://api.github.com/repos/proddy/EMS-ESP"
 
 // set to value >0 if the ESP is overheating or there are timing issues. Recommend a value of 1.
 #define EMSESP_DELAY 0 // initially set to 0 for no delay. Change to 1 if getting WDT resets from wifi
@@ -2016,7 +2016,7 @@ void setup() {
     myESP.setSettings(LoadSaveCallback, SetListCallback, false); // default is Serial off
     myESP.setWeb(WebCallback);                                   // web custom settings
     myESP.setOTA(OTACallback_pre, OTACallback_post);             // OTA callback which is called when OTA is starting and stopping
-    myESP.begin(APP_HOSTNAME, APP_NAME, APP_VERSION, APP_URL, APP_UPDATEURL);
+    myESP.begin(APP_HOSTNAME, APP_NAME, APP_VERSION, APP_URL, APP_URL_API);
 
     // at this point we have all the settings from our internall SPIFFS config file
     // fire up the UART now
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index e0689365a..6cb72cea6 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -156,6 +156,7 @@ function sendCustomStatus() {
         "customname": "EMS-ESP",
         "appurl": "https://github.com/proddy/EMS-ESP",
         "updateurl": "https://api.github.com/repos/proddy/EMS-ESP/releases/latest",
+        "updateurl_dev": "https://api.github.com/repos/proddy/EMS-ESP/releases/tags/travis-dev-build",
 
         "emsbus": {
             "ok": true,

From d09111960e682796fd7ebd2c9d62752bde24c8bb Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 22:35:12 +0100
Subject: [PATCH 022/120] don't prevent sending telegrams when dest = 0x00
 (https://github.com/proddy/EMS-ESP/issues/138)

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

diff --git a/src/ems.cpp b/src/ems.cpp
index 3af8a630d..285c8c6ce 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -589,11 +589,13 @@ void _ems_sendTelegram() {
     // we don't remove from the queue yet
     _EMS_TxTelegram EMS_TxTelegram = EMS_TxQueue.first();
 
+    /*
     // if there is no destination, also delete it from the queue
     if (EMS_TxTelegram.dest == EMS_ID_NONE) {
         EMS_TxQueue.shift(); // remove from queue
         return;
     }
+    */
 
     // if we're in raw mode just fire and forget
     if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_RAW) {
diff --git a/src/version.h b/src/version.h
index 9a2395692..b1c1b3eff 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b2"
+#define APP_VERSION "1.9.4b3"

From 02f5958f613260ae820191419369535544a36ffc Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 29 Oct 2019 23:05:23 +0100
Subject: [PATCH 023/120] add version to travis build github release notes

---
 .travis.yml      | 5 +++--
 scripts/build.sh | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4f0de059e..d9fa24097 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,7 @@ jobs:
 #   - env: BUILDER_THREAD=3
 
 before_deploy:
+  - export FIRMWARE_VERSION=$(grep -E '^#define APP_VERSION' ./src/version.h | awk '{print $3}' | sed 's/"//g')
   - git tag -f travis-${TAG}-build
   - git remote add gh
     https://${OWNER}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
@@ -61,8 +62,8 @@ deploy:
   file: "*.bin"
   name: latest development build
   release_notes:
-    Automatic firmware builds of the current EMS-ESP $TRAVIS_BRANCH branch
-    (commit $TRAVIS_COMMIT). Built by Travis CI on $(date +'%F %T %Z').
+    Automatic firmware builds of the current EMS-ESP branch for version $FIRMWARE_VERSION.
+    Built by Travis CI on $(date +'%F %T %Z') from commit $TRAVIS_COMMIT.
   cleanup: false
   prerelease: true
   overwrite: true
diff --git a/scripts/build.sh b/scripts/build.sh
index dac14fc93..e0a868710 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -84,7 +84,8 @@ build_environments() {
         platformio run --silent --environment $environment || exit 1
         stat_bytes .pio/build/$environment/firmware.bin
         # mv .pio/build/$environment/firmware.bin $destination/EMS-ESP-$version-$environment.bin
-        mv .pio/build/$environment/firmware.bin EMS-ESP-$version-$environment.bin
+        # mv .pio/build/$environment/firmware.bin EMS-ESP-$version-$environment.bin
+        mv .pio/build/$environment/firmware.bin EMS-ESP-dev-$environment.bin
     done
     echo "--------------------------------------------------------------" 
 }

From 13509527feaa96b7438880014b8e633bc94db375 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 30 Oct 2019 13:49:02 +0100
Subject: [PATCH 024/120] update to gitter

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9fa24097..f20f51a73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,7 @@ deploy:
   name: latest development build
   release_notes:
     Automatic firmware builds of the current EMS-ESP branch for version $FIRMWARE_VERSION.
+    This is work in progress and not fully tested. Use at your own risk.
     Built by Travis CI on $(date +'%F %T %Z') from commit $TRAVIS_COMMIT.
   cleanup: false
   prerelease: true
@@ -79,7 +80,7 @@ notifications:
 
 webhooks:
   urls:
-    - https://webhooks.gitter.im/e/83e4c4ab123eca3082b4
+    - https://webhooks.gitter.im/e/57e15f7798656d888194
   on_success: change # options: [always|never|change] default: always
-  on_failure: always # options: [always|never|change] default: always
+  on_failure: never # options: [always|never|change] default: always
   on_start: false # default: false

From cfaabb57c6e3162b4a1d8695c6cc7deaf5e7209f Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 30 Oct 2019 15:02:19 +0100
Subject: [PATCH 025/120] silent mode in node

---
 tools/wsemulator/run.ps1 | 2 +-
 tools/wsemulator/run.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 tools/wsemulator/run.sh

diff --git a/tools/wsemulator/run.ps1 b/tools/wsemulator/run.ps1
index d277a119c..cb345db5c 100644
--- a/tools/wsemulator/run.ps1
+++ b/tools/wsemulator/run.ps1
@@ -2,7 +2,7 @@ $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
 
 # build web
 $webfilesbuilder = $ScriptDir + "\..\webfilesbuilder"
-node $webfilesbuilder\node_modules\gulp\bin\gulp.js --cwd $webfilesbuilder
+node $webfilesbuilder\node_modules\gulp\bin\gulp.js --silent --cwd $webfilesbuilder
 
 # run chrome
 $pathToChrome = 'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
diff --git a/tools/wsemulator/run.sh b/tools/wsemulator/run.sh
old mode 100644
new mode 100755
index 4895c6245..234af81ad
--- a/tools/wsemulator/run.sh
+++ b/tools/wsemulator/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-node  $PWD/../webfilesbuilder/node_modules/gulp/bin/gulp.js --cwd $PWD/../webfilesbuilder
+node $PWD/../webfilesbuilder/node_modules/gulp/bin/gulp.js --silent --cwd $PWD/../webfilesbuilder
 
 open -na Google\ Chrome --args --disable-web-security --remote-debugging-port=9222 --user-data-dir="/tmp/chrome_dev" $PWD/../../src/websrc/temp/index.html 
 

From 8570a707ae08ce4fcc23880f395b1f84bc9611e3 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 30 Oct 2019 15:03:51 +0100
Subject: [PATCH 026/120] Make run.sh and run.ps1 executable

---
 tools/wsemulator/run.ps1 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tools/wsemulator/run.ps1

diff --git a/tools/wsemulator/run.ps1 b/tools/wsemulator/run.ps1
old mode 100644
new mode 100755

From e5920151b7f94feb582dbffe00685fa905c4516a Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 30 Oct 2019 22:45:54 +0100
Subject: [PATCH 027/120] enable download of beta releases via webui

---
 .travis.yml             |   6 +-
 src/websrc/index.html   |   5 +-
 src/websrc/myesp.js     | 121 +++++++++++++++++++++-------------------
 tools/wsemulator/run.sh |   2 +-
 4 files changed, 72 insertions(+), 62 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f20f51a73..0a066d868 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,9 +62,9 @@ deploy:
   file: "*.bin"
   name: latest development build
   release_notes:
-    Automatic firmware builds of the current EMS-ESP branch for version $FIRMWARE_VERSION.
-    This is work in progress and not fully tested. Use at your own risk.
-    Built by Travis CI on $(date +'%F %T %Z') from commit $TRAVIS_COMMIT.
+    Version $FIRMWARE_VERSION.
+    Automatic firmware builds of the current EMS-ESP branch built on $(date +'%F %T %Z') from commit $TRAVIS_COMMIT.
+    Warning, this is a development build and not fully tested. Use at your own risk.
   cleanup: false
   prerelease: true
   overwrite: true
diff --git a/src/websrc/index.html b/src/websrc/index.html
index 944620a64..074fec01c 100644
--- a/src/websrc/index.html
+++ b/src/websrc/index.html
@@ -194,7 +194,10 @@
                         </div>
                         <div class="modal-body">
                             <div>
-                                <h4>Latest Stable Release</h4>
+                                <div>
+                                    <button id="updateb" onclick="switchfirmware()" type="submit" class="btn btn-success btn-sm pull-right">Official Release</button>
+                                </div>
+
                                 <div id="onlineupdate">
                                     <h5 id=releasehead></h5>
                                     <div style="clear:both;">
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index fcf04cb19..e0e01267e 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -8,6 +8,24 @@ var ajaxobj;
 
 var custom_config = {};
 
+var xDown = null;
+var yDown = null;
+
+var page = 1;
+var haspages;
+var file = {};
+var backupstarted = false;
+var updateurl = "";
+var updateurl_dev = "";
+
+var use_beta_firmware = false;
+
+var myespcontent;
+
+var formData = new FormData();
+
+var nextIsNotJson = false;
+
 var config = {
     "command": "configfile",
     "network": {
@@ -40,14 +58,6 @@ var config = {
     }
 };
 
-var page = 1;
-var haspages;
-var file = {};
-var backupstarted = false;
-var updateurl = "";
-
-var myespcontent;
-
 function browserTime() {
     var d = new Date(0);
     var c = new Date();
@@ -209,8 +219,6 @@ function savenetwork() {
     saveconfig();
 }
 
-var formData = new FormData();
-
 function inProgress(callback) {
     $("body").load("myesp.html #progresscontent", function (responseTxt, statusTxt, xhr) {
         if (statusTxt === "success") {
@@ -510,6 +518,7 @@ function getContent(contentname) {
                     $("#appurl2").text(ajaxobj.appurl);
 
                     updateurl = ajaxobj.updateurl;
+                    updateurl_dev = ajaxobj.updateurl_dev;
                     listCustomStats();
                     break;
                 default:
@@ -734,8 +743,6 @@ function initMQTTLogTable() {
     });
 }
 
-var nextIsNotJson = false;
-
 function socketMessageListener(evt) {
     var obj = JSON.parse(evt.data);
     if (obj.hasOwnProperty("command")) {
@@ -814,46 +821,6 @@ function restart() {
     inProgress("restart");
 }
 
-$("#dismiss, .overlay").on("click", function () {
-    $("#sidebar").removeClass("active");
-    $(".overlay").fadeOut();
-});
-
-$("#sidebarCollapse").on("click", function () {
-    $("#sidebar").addClass("active");
-    $(".overlay").fadeIn();
-    $(".collapse.in").toggleClass("in");
-    $("a[aria-expanded=true]").attr("aria-expanded", "false");
-});
-
-$("#custom_status").click(function () {
-    websock.send("{\"command\":\"custom_status\"}");
-    return false;
-});
-
-$("#status").click(function () {
-    websock.send("{\"command\":\"status\"}");
-    return false;
-});
-
-$("#custom").click(function () { getContent("#customcontent"); return false; });
-
-$("#network").on("click", (function () { getContent("#networkcontent"); return false; }));
-$("#general").click(function () { getContent("#generalcontent"); return false; });
-$("#mqtt").click(function () { getContent("#mqttcontent"); return false; });
-$("#ntp").click(function () { getContent("#ntpcontent"); return false; });
-$("#backup").click(function () { getContent("#backupcontent"); return false; });
-$("#reset").click(function () { $("#destroy").modal("show"); return false; });
-$("#restart").click(function () { $("#reboot").modal("show"); return false; });
-$("#eventlog").click(function () { getContent("#eventcontent"); return false; });
-
-$(".noimp").on("click", function () {
-    $("#noimp").modal("show");
-});
-
-var xDown = null;
-var yDown = null;
-
 function handleTouchStart(evt) {
     xDown = evt.touches[0].clientX;
     yDown = evt.touches[0].clientY;
@@ -953,8 +920,26 @@ function login() {
     }
 }
 
+function switchfirmware() {
+    if (use_beta_firmware) {
+         use_beta_firmware = false;
+         document.getElementById("updateb").innerHTML = "Official Release";
+    } else {
+        use_beta_firmware = true;
+        document.getElementById("updateb").innerHTML = "Beta Build";
+    }
+    getLatestReleaseInfo();
+}
+
 function getLatestReleaseInfo() {
-    $.getJSON(updateurl).done(function (release) {
+
+    if (use_beta_firmware) {
+        var url = updateurl_dev;
+    } else {
+        var url = updateurl;
+    }
+
+    $.getJSON(url).done(function (release) {
         var asset = release.assets[0];
         var downloadCount = 0;
         for (var i = 0; i < release.assets.length; i++) {
@@ -978,10 +963,6 @@ function getLatestReleaseInfo() {
     }).error(function () { $("#onlineupdate").html("<h5>Couldn't get release details. Make sure there is an Internet connection.</h5>"); });
 }
 
-$("#update").on("shown.bs.modal", function (e) {
-    getLatestReleaseInfo();
-});
-
 function allowUpload() {
     $("#upbtn").prop("disabled", false);
 }
@@ -1014,5 +995,31 @@ function refreshStatus() {
     websock.send("{\"command\":\"status\"}");
 }
 
+$("#dismiss, .overlay").on("click", function () {
+    $("#sidebar").removeClass("active");
+    $(".overlay").fadeOut();
+});
+
+$("#sidebarCollapse").on("click", function () {
+    $("#sidebar").addClass("active");
+    $(".overlay").fadeIn();
+    $(".collapse.in").toggleClass("in");
+    $("a[aria-expanded=true]").attr("aria-expanded", "false");
+});
+
+$("#custom_status").click(function () { websock.send("{\"command\":\"custom_status\"}"); return false; });
+$("#status").click(function () { websock.send("{\"command\":\"status\"}"); return false; });
+$("#custom").click(function () { getContent("#customcontent"); return false; });
+$("#network").on("click", (function () { getContent("#networkcontent"); return false; }));
+$("#general").click(function () { getContent("#generalcontent"); return false; });
+$("#mqtt").click(function () { getContent("#mqttcontent"); return false; });
+$("#ntp").click(function () { getContent("#ntpcontent"); return false; });
+$("#backup").click(function () { getContent("#backupcontent"); return false; });
+$("#reset").click(function () { $("#destroy").modal("show"); return false; });
+$("#restart").click(function () { $("#reboot").modal("show"); return false; });
+$("#eventlog").click(function () { getContent("#eventcontent"); return false; });
+$(".noimp").on("click", function () { $("#noimp").modal("show"); });
+$("#update").on("shown.bs.modal", function (e) { getLatestReleaseInfo(); });
+
 document.addEventListener("touchstart", handleTouchStart, false);
 document.addEventListener("touchmove", handleTouchMove, false);
diff --git a/tools/wsemulator/run.sh b/tools/wsemulator/run.sh
index 234af81ad..03ac3be32 100755
--- a/tools/wsemulator/run.sh
+++ b/tools/wsemulator/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-node $PWD/../webfilesbuilder/node_modules/gulp/bin/gulp.js --silent --cwd $PWD/../webfilesbuilder
+node $PWD/../webfilesbuilder/node_modules/gulp/bin/gulp.js --cwd $PWD/../webfilesbuilder
 
 open -na Google\ Chrome --args --disable-web-security --remote-debugging-port=9222 --user-data-dir="/tmp/chrome_dev" $PWD/../../src/websrc/temp/index.html 
 

From 6adccdfb1d06031bd7ec05ee50935dc5c29ff919 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 30 Oct 2019 23:01:41 +0100
Subject: [PATCH 028/120] update release version, renamed Beta to Development

---
 CHANGELOG.md        | 2 ++
 src/version.h       | 2 +-
 src/websrc/myesp.js | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4232f2abb..bed58e5eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added `publish_always` forcing MQTT topics to be always sent regardless if the data hasn't changed
 - Support for DHW once (OneTime water) heating command via MQTT [issue 195](https://github.com/proddy/EMS-ESP/issues/195)
+- Added scripts to automatically build firmware images on every Commit/Pull and nightly builds using TravisCI
+- Added option to WebUI to also download the latest development build
 
 ### Fixed
 
diff --git a/src/version.h b/src/version.h
index b1c1b3eff..f16beb84d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b3"
+#define APP_VERSION "1.9.4b4"
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index e0e01267e..6a69766b4 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -922,11 +922,11 @@ function login() {
 
 function switchfirmware() {
     if (use_beta_firmware) {
-         use_beta_firmware = false;
-         document.getElementById("updateb").innerHTML = "Official Release";
+        use_beta_firmware = false;
+        document.getElementById("updateb").innerHTML = "Official Release";
     } else {
         use_beta_firmware = true;
-        document.getElementById("updateb").innerHTML = "Beta Build";
+        document.getElementById("updateb").innerHTML = "Development Build";
     }
     getLatestReleaseInfo();
 }

From ec18194a25c2384c2aafd119b2dbbb841779c72c Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 1 Nov 2019 14:59:51 +0100
Subject: [PATCH 029/120] remove silent mode

---
 tools/wsemulator/run.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wsemulator/run.ps1 b/tools/wsemulator/run.ps1
index cb345db5c..d277a119c 100755
--- a/tools/wsemulator/run.ps1
+++ b/tools/wsemulator/run.ps1
@@ -2,7 +2,7 @@ $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
 
 # build web
 $webfilesbuilder = $ScriptDir + "\..\webfilesbuilder"
-node $webfilesbuilder\node_modules\gulp\bin\gulp.js --silent --cwd $webfilesbuilder
+node $webfilesbuilder\node_modules\gulp\bin\gulp.js --cwd $webfilesbuilder
 
 # run chrome
 $pathToChrome = 'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'

From a4881625ae2d0ff5a16a4ee34f7c0eb140d7a41d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 1 Nov 2019 15:01:37 +0100
Subject: [PATCH 030/120] fix versions for Library

---
 platformio.ini | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index b818c6f33..fa7611ba8 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,7 +11,7 @@ default_envs = debug
 ; -DTESTS
 ; -DCRASH
 ; -DFORCE_SERIAL
-custom_flags = 
+custom_flags =
 
 ;general_flags = -DNO_GLOBAL_EEPROM -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -DBEARSSL_SSL_BASIC
 general_flags = -DNO_GLOBAL_EEPROM
@@ -20,16 +20,17 @@ general_flags = -DNO_GLOBAL_EEPROM
 framework = arduino
 platform = espressif8266
 lib_deps =
-  https://github.com/bakercp/CRC32
-  https://github.com/rlogiacco/CircularBuffer 
+  https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
-  https://github.com/xoseperez/justwifi
-  https://github.com/marvinroger/async-mqtt-client
-  https://github.com/xoseperez/eeprom_rotate
-  https://github.com/bblanchon/ArduinoJson
-  https://github.com/me-no-dev/ESPAsyncUDP
-  https://github.com/me-no-dev/ESPAsyncTCP
   https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
+  https://github.com/bakercp/CRC32
+  JustWifi@2.0.2
+  AsyncMqttClient@0.8.2
+  EEPROM_Rotate@0.9.2
+  ArduinoJson@6.12.0
+  ;https://github.com/bblanchon/ArduinoJson#v6.13.0
+  ESPAsyncUDP
+  ESPAsyncTCP@1.2.2
 upload_speed = 921600
 monitor_speed = 115200
 
@@ -37,11 +38,10 @@ monitor_speed = 115200
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
 
-; comment next 2 lines is not using OTA
-upload_protocol = espota
-upload_port = ems-esp.local
+; uncomment next 2 lines if using OTA
+;upload_protocol = espota
+;upload_port = ems-esp.local
 
-# Special build for CI test
 [env:travis]
 board = esp12e
 build_flags = ${common.general_flags}

From 905ae885f735b4685885c44fbf3c60d5c8bfce2e Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 1 Nov 2019 15:03:06 +0100
Subject: [PATCH 031/120] 1.9.4b

---
 CHANGELOG.md  | 8 +++++++-
 src/version.h | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bed58e5eb..8fad9e78a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,11 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for DHW once (OneTime water) heating command via MQTT [issue 195](https://github.com/proddy/EMS-ESP/issues/195)
 - Added scripts to automatically build firmware images on every Commit/Pull and nightly builds using TravisCI
 - Added option to WebUI to also download the latest development build
+- Added build scripts for automated CI with TravisCI
+- Implemented timezone support and automatic adjustment, also taking daylight saving times into account
+- Added `kick` command to reset core services like NTP, Web, Web Sockets
 
 ### Fixed
 
 ### Changed
 
+- Debug log times show real internet time (if NTP enabled)
+- `system` shows local time instead of UTC
+- fixed version numbers of libraries in `platformio.ini`
+
 ### Removed
 
 ## [1.9.3] 2019-10-26
@@ -26,7 +33,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Report # TCP dropouts in the `system` command. These could be due to WiFI or MQTT disconnected.
 - Added temp and mode to the MQTT `thermostat_cmd` topic
-- build scripts for automated CI with TravisCI
   
 ### Fixed
 
diff --git a/src/version.h b/src/version.h
index f16beb84d..a5099fc1b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b4"
+#define APP_VERSION "1.9.4b5"

From 6275245b0393aceccb7c8d2b29dedb00808e6d10 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 1 Nov 2019 15:04:17 +0100
Subject: [PATCH 032/120] timezone support

---
 src/MyESP.cpp               | 167 +++++++++++++++++++++---------
 src/MyESP.h                 |  29 +++---
 src/Ntp.cpp                 |  92 +++++++++++++++--
 src/Ntp.h                   |  16 ++-
 src/TimeLib.cpp             |  53 ++++++++++
 src/TimeLib.h               |  16 ++-
 src/Timezone.cpp            | 200 ++++++++++++++++++++++++++++++++++++
 src/Timezone.h              |  53 ++++++++++
 src/ems-esp.cpp             |  21 ++--
 src/ems.cpp                 |  51 ++++++---
 src/ems.h                   |  24 ++---
 src/websrc/myesp.htm        |  21 +++-
 src/websrc/myesp.js         |  24 ++---
 tools/wsemulator/wserver.js |  11 +-
 14 files changed, 642 insertions(+), 136 deletions(-)
 create mode 100644 src/Timezone.cpp
 create mode 100644 src/Timezone.h

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index f39406874..1d5392360 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -97,8 +97,9 @@ MyESP::MyESP() {
 
     // ntp
     _ntp_server   = strdup(MYESP_NTP_SERVER);
-    _ntp_interval = 60;
+    _ntp_interval = NTP_INTERVAL_DEFAULT;
     _ntp_enabled  = false;
+    _ntp_timezone = NTP_TIMEZONE_DEFAULT;
 
     // get the build time
     _buildTime = _getBuildTime();
@@ -251,8 +252,8 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
 
         // NTP now that we have a WiFi connection
         if (_ntp_enabled) {
-            NTP.Ntp(_ntp_server, _ntp_interval); // set up NTP server
-            myDebug_P(PSTR("[NTP] NTP internet time enabled via server %s"), _ntp_server);
+            NTP.Ntp(_ntp_server, _ntp_interval, _ntp_timezone); // set up NTP server
+            myDebug_P(PSTR("[NTP] NTP internet time enabled via server %s with timezone %d"), _ntp_server, _ntp_timezone);
         }
 
         // call any final custom stuff
@@ -632,6 +633,27 @@ void MyESP::_telnet_setup() {
     memset(_command, 0, TELNET_MAX_COMMAND_LENGTH);
 }
 
+// restart some services like web, mqtt, ntp etc...
+void MyESP::_kick() {
+    myDebug_P(PSTR("Kicking services..."));
+
+    // NTP - fetch new time
+    if (_ntp_enabled) {
+        myDebug_P(PSTR(" - Requesting NTP time"));
+        NTP.getNtpTime();
+    }
+
+    // kick web
+    myDebug_P(PSTR(" - Restart web server and web sockets"));
+    _ws->enable(false);
+    //_webServer->reset();
+    _ws->enable(true);
+
+    // kick mqtt
+    myDebug_P(PSTR(" - Restart MQTT"));
+    mqttClient.disconnect();
+}
+
 // Show help of commands
 void MyESP::_consoleShowHelp() {
     myDebug_P(PSTR(""));
@@ -652,7 +674,7 @@ void MyESP::_consoleShowHelp() {
     myDebug_P(PSTR("*"));
     myDebug_P(PSTR("* Commands:"));
     myDebug_P(PSTR("*  ?/help=show commands, CTRL-D/quit=close telnet session"));
-    myDebug_P(PSTR("*  set, system, restart, mqttlog"));
+    myDebug_P(PSTR("*  set, system, restart, mqttlog, kick"));
 
 #ifdef CRASH
     myDebug_P(PSTR("*  crash <dump | clear | test [n]>"));
@@ -696,6 +718,8 @@ void MyESP::_printSetCommands() {
     myDebug_P(PSTR("  set mqtt_keepalive [seconds]"));
     myDebug_P(PSTR("  set mqtt_retain [on | off]"));
     myDebug_P(PSTR("  set ntp_enabled <on | off>"));
+    myDebug_P(PSTR("  set ntp_interval [n]"));
+    myDebug_P(PSTR("  set ntp_timezone [n]"));
     myDebug_P(PSTR("  set serial <on | off>"));
     myDebug_P(PSTR("  set log_events <on | off>"));
 
@@ -760,6 +784,9 @@ void MyESP::_printSetCommands() {
 #endif
 
     myDebug_P(PSTR("  ntp_enabled=%s"), (_ntp_enabled) ? "on" : "off");
+    myDebug_P(PSTR("  ntp_interval=%d"), _ntp_interval);
+    myDebug_P(PSTR("  ntp_timezone=%d"), _ntp_timezone);
+
     myDebug_P(PSTR("  log_events=%s"), (_general_log_events) ? "on" : "off");
 
     // print any custom settings
@@ -849,6 +876,10 @@ bool MyESP::_changeSetting(uint8_t wc, const char * setting, const char * value)
         save_config = fs_setSettingValue(&_mqtt_heartbeat, value, false);
     } else if (strcmp(setting, "ntp_enabled") == 0) {
         save_config = fs_setSettingValue(&_ntp_enabled, value, false);
+    } else if (strcmp(setting, "ntp_interval") == 0) {
+        save_config = fs_setSettingValue(&_ntp_interval, value, NTP_INTERVAL_DEFAULT);
+    } else if (strcmp(setting, "ntp_timezone") == 0) {
+        save_config = fs_setSettingValue(&_ntp_timezone, value, NTP_TIMEZONE_DEFAULT);
     } else if (strcmp(setting, "log_events") == 0) {
         save_config = fs_setSettingValue(&_general_log_events, value, false);
     } else {
@@ -946,6 +977,12 @@ void MyESP::_telnetCommand(char * commandLine) {
         return;
     }
 
+    // kick command
+    if ((strcmp(ptrToCommandName, "kick") == 0) && (wc == 1)) {
+        _kick();
+        return;
+    }
+
     // restart command
     if (((strcmp(ptrToCommandName, "restart") == 0) || (strcmp(ptrToCommandName, "reboot") == 0)) && (wc == 1)) {
         resetESP();
@@ -1282,8 +1319,9 @@ void MyESP::showSystemStats() {
         myDebug_P(PSTR(" [MQTT] is disconnected"));
     }
 
-    if (_ntp_enabled) {
-        myDebug_P(PSTR(" [NTP] Time in UTC is %02d:%02d:%02d"), to_hour(now()), to_minute(now()), to_second(now()));
+    if (_have_ntp_time) {
+        uint32_t real_time = getSystemTime();
+        myDebug_P(PSTR(" [NTP] Local Time is %02d:%02d:%02d %s (%d)"), to_hour(real_time), to_minute(real_time), to_second(real_time), NTP.tcr->abbrev, real_time);
     }
 
 #ifdef CRASH
@@ -1540,18 +1578,18 @@ char * MyESP::_mqttTopic(const char * topic) {
 
 // validates a file in SPIFFS, loads it into the json buffer and returns true if ok
 size_t MyESP::_fs_validateConfigFile(const char * filename, size_t maxsize, JsonDocument & doc) {
+    // myDebug_P(PSTR("[FS] Checking file %s"), filename); // remove for debugging
+
     // see if we can open it
     File file = SPIFFS.open(filename, "r");
     if (!file) {
-        myDebug_P(PSTR("[FS] File %s not found"), filename);
+        myDebug_P(PSTR("[FS] Cannot open config file %s for reading"), filename);
         return 0;
     }
 
     // check size
     size_t size = file.size();
 
-    // myDebug_P(PSTR("[FS] Checking file %s (%d bytes)"), filename, size); // remove for debugging
-
     if (size > maxsize) {
         file.close();
         myDebug_P(PSTR("[FS] Error. File %s size %d is too large (max %d)"), filename, size, maxsize);
@@ -1752,8 +1790,9 @@ bool MyESP::_fs_loadConfig() {
     _ntp_server    = strdup(ntp["server"] | "");
     _ntp_interval  = ntp["interval"] | 60;
     if (_ntp_interval < 2)
-        _ntp_interval = 60;
-    _ntp_enabled = ntp["enabled"];
+        _ntp_interval = NTP_INTERVAL_DEFAULT;
+    _ntp_enabled  = ntp["enabled"];
+    _ntp_timezone = ntp["timezone"] | NTP_TIMEZONE_DEFAULT;
 
     myDebug_P(PSTR("[FS] System config loaded (%d bytes)"), size);
 
@@ -1800,6 +1839,18 @@ bool MyESP::fs_setSettingValue(uint8_t * setting, const char * value, uint8_t va
     return true;
 }
 
+// saves a signed 8-bit integer into a config setting, using default value if non set
+// returns true if successful
+bool MyESP::fs_setSettingValue(int8_t * setting, const char * value, int8_t value_default) {
+    if (_hasValue(value)) {
+        *setting = (int8_t)atoi(value);
+    } else {
+        *setting = value_default; // use the default value
+    }
+
+    return true;
+}
+
 // saves a bool into a config setting, using default value if non set
 // returns true if successful
 bool MyESP::fs_setSettingValue(bool * setting, const char * value, bool value_default) {
@@ -1830,6 +1881,7 @@ bool MyESP::_fs_loadCustomConfig() {
 
     if (_fs_loadsave_callback_f) {
         const JsonObject & json = doc["settings"];
+
         if (!(_fs_loadsave_callback_f)(MYESP_FSACTION_LOAD, json)) {
             myDebug_P(PSTR("[FS] Error reading custom config"));
             return false;
@@ -1852,6 +1904,7 @@ bool MyESP::fs_saveCustomConfig(JsonObject root) {
 
     // open for writing
     File configFile = SPIFFS.open(MYESP_CUSTOMCONFIG_FILE, "w");
+
     if (!configFile) {
         myDebug_P(PSTR("[FS] Failed to open custom config for writing"));
         ok = false;
@@ -1888,15 +1941,16 @@ bool MyESP::fs_saveCustomConfig(JsonObject root) {
 
 // save system config to spiffs
 bool MyESP::fs_saveConfig(JsonObject root) {
-    bool ok = false;
-
     // call any custom functions before handling SPIFFS
     if (_ota_pre_callback_f) {
         (_ota_pre_callback_f)();
     }
 
+    bool ok = false;
+
     // open for writing
     File configFile = SPIFFS.open(MYESP_CONFIG_FILE, "w");
+
     if (!configFile) {
         myDebug_P(PSTR("[FS] Failed to open system config for writing"));
         ok = false;
@@ -1940,6 +1994,7 @@ bool MyESP::_fs_writeConfig() {
     general["serial"]     = _general_serial;
     general["hostname"]   = _general_hostname;
     general["log_events"] = _general_log_events;
+    general["version"]    = _app_version;
 
     JsonObject mqtt   = doc.createNestedObject("mqtt");
     mqtt["enabled"]   = _mqtt_enabled;
@@ -1950,14 +2005,14 @@ bool MyESP::_fs_writeConfig() {
     mqtt["qos"]       = _mqtt_qos;
     mqtt["keepalive"] = _mqtt_keepalive;
     mqtt["retain"]    = _mqtt_retain;
-
-    mqtt["password"] = _mqtt_password;
-    mqtt["base"]     = _mqtt_base;
+    mqtt["password"]  = _mqtt_password;
+    mqtt["base"]      = _mqtt_base;
 
     JsonObject ntp  = doc.createNestedObject("ntp");
     ntp["server"]   = _ntp_server;
     ntp["interval"] = _ntp_interval;
     ntp["enabled"]  = _ntp_enabled;
+    ntp["timezone"] = _ntp_timezone;
 
     bool ok = fs_saveConfig(root); // save it
 
@@ -1993,28 +2048,15 @@ void MyESP::_fs_setup() {
         (_ota_pre_callback_f)(); // call custom function
     }
 
+    // check SPIFFS is OK
     if (!SPIFFS.begin()) {
-        myDebug_P(PSTR("[FS] Formatting filesystem..."));
         if (SPIFFS.format()) {
-            if (_general_log_events) {
-                _writeEvent("WARN", "system", "File system formatted", "");
-            }
+            myDebug_P(PSTR("[FS] File system formatted"));
         } else {
             myDebug_P(PSTR("[FS] Failed to format file system"));
         }
     }
-
-    // load the main system config file if we can. Otherwise create it and expect user to configure in web interface
-    if (!_fs_loadConfig()) {
-        myDebug_P(PSTR("[FS] Creating a new system config"));
-        _fs_writeConfig(); // create the initial config file
-    }
-
-    // load system and custom config
-    if (!_fs_loadCustomConfig()) {
-        _fs_createCustomConfig(); // create the initial config file
-    }
-
+    
     /*
     // fill event log with tests
     SPIFFS.remove(MYESP_EVENTLOG_FILE);
@@ -2039,6 +2081,17 @@ void MyESP::_fs_setup() {
         }
     }
 
+    // load the main system config file if we can. Otherwise create it and expect user to configure in web interface
+    if (!_fs_loadConfig()) {
+        myDebug_P(PSTR("[FS] Creating a new system config"));
+        _fs_writeConfig(); // create the initial config file
+    }
+
+    // load system and custom config
+    if (!_fs_loadCustomConfig()) {
+        _fs_createCustomConfig(); // create the initial config file
+    }
+
     if (_ota_post_callback_f) {
         (_ota_post_callback_f)(); // call custom function
     }
@@ -2266,7 +2319,7 @@ void MyESP::_writeEvent(const char * type, const char * src, const char * desc,
     // this will also create the file if its doesn't exist
     File eventlog = SPIFFS.open(MYESP_EVENTLOG_FILE, "a");
     if (!eventlog) {
-        //Serial.println("[SYSTEM] Error opening event log for writing"); // for debugging
+        // Serial.println("[SYSTEM] Error opening event log for writing"); // for debugging
         eventlog.close();
         return;
     }
@@ -2279,12 +2332,9 @@ void MyESP::_writeEvent(const char * type, const char * src, const char * desc,
     root["time"] = now(); // is relative if we're not using NTP
 
     // Serialize JSON to file
-    size_t n = serializeJson(root, eventlog);
-    eventlog.print("\n"); // this indicates end of the entry
+    (void)serializeJson(root, eventlog);
 
-    if (!n) {
-        //Serial.println("[SYSTEM] Error writing to event log"); // for debugging
-    }
+    eventlog.print("\n"); // this indicates end of the entry
 
     eventlog.close();
 }
@@ -2453,17 +2503,7 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
         uint8_t page = doc["page"];
         _sendEventLog(page);
     } else if (strcmp(command, "clearevent") == 0) {
-        if (_ota_pre_callback_f) {
-            (_ota_pre_callback_f)(); // call custom function
-        }
-        if (SPIFFS.remove(MYESP_EVENTLOG_FILE)) {
-            _writeEvent("WARN", "system", "Event log cleared", "");
-        } else {
-            myDebug_P(PSTR("[WEB] Could not clear event log"));
-        }
-        if (_ota_post_callback_f) {
-            (_ota_post_callback_f)(); // call custom function
-        }
+        _emptyEventLog();
     } else if (strcmp(command, "scan") == 0) {
         WiFi.scanNetworksAsync(std::bind(&MyESP::_printScanResult, this, std::placeholders::_1), true);
     } else if (strcmp(command, "gettime") == 0) {
@@ -2480,6 +2520,22 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
     client->_tempObject = NULL;
 }
 
+// delete the event log
+void MyESP::_emptyEventLog() {
+    if (_ota_pre_callback_f) {
+        (_ota_pre_callback_f)(); // call custom function
+    }
+    if (SPIFFS.remove(MYESP_EVENTLOG_FILE)) {
+        _writeEvent("WARN", "system", "Event log cleared", "");
+        myDebug_P(PSTR("[WEB] Event log cleared"));
+    } else {
+        myDebug_P(PSTR("[WEB] Could not clear event log"));
+    }
+    if (_ota_post_callback_f) {
+        (_ota_post_callback_f)(); // call custom function
+    }
+}
+
 // read both system config and the custom config and send as json to web socket
 bool MyESP::_fs_sendConfig() {
     File   configFile;
@@ -2866,6 +2922,16 @@ void MyESP::_sendTime() {
     _ws->textAll(buffer, len);
 }
 
+// returns real time from the internet/NTP if availble
+// otherwise elapsed system time
+unsigned long MyESP::getSystemTime() {
+    if (_have_ntp_time) {
+        return now();
+    }
+
+    return millis(); // elapsed time
+}
+
 // bootup sequence
 // quickly flash LED until we get a Wifi connection, or AP established
 void MyESP::_bootupSequence() {
@@ -2964,7 +3030,8 @@ void MyESP::loop() {
     _heartbeatCheck();
     _bootupSequence(); // see if a reset was pressed during bootup
 
-    jw.loop();           // WiFi
+    jw.loop(); // WiFi
+
     ArduinoOTA.handle(); // OTA
 
     ESP.wdtFeed();   // feed the watchdog...
diff --git a/src/MyESP.h b/src/MyESP.h
index fbebf7a32..be5ee1525 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.13"
+#define MYESP_VERSION "1.2.14"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -295,6 +295,7 @@ class MyESP {
     bool fs_setSettingValue(char ** setting, const char * value, const char * value_default);
     bool fs_setSettingValue(uint16_t * setting, const char * value, uint16_t value_default);
     bool fs_setSettingValue(uint8_t * setting, const char * value, uint8_t value_default);
+    bool fs_setSettingValue(int8_t * setting, const char * value, int8_t value_default);
     bool fs_setSettingValue(bool * setting, const char * value, bool value_default);
 
     // Web
@@ -306,17 +307,18 @@ class MyESP {
     void crashInfo();
 
     // general
-    void     end();
-    void     loop();
-    void     begin(const char * app_hostname, const char * app_name, const char * app_version, const char * app_url, const char * app_url_api);
-    void     resetESP();
-    int      getWifiQuality();
-    void     showSystemStats();
-    bool     getHeartbeat();
-    uint32_t getSystemLoadAverage();
-    uint32_t getSystemResetReason();
-    uint8_t  getSystemBootStatus();
-    bool     _have_ntp_time;
+    void          end();
+    void          loop();
+    void          begin(const char * app_hostname, const char * app_name, const char * app_version, const char * app_url, const char * app_url_api);
+    void          resetESP();
+    int           getWifiQuality();
+    void          showSystemStats();
+    bool          getHeartbeat();
+    uint32_t      getSystemLoadAverage();
+    uint32_t      getSystemResetReason();
+    uint8_t       getSystemBootStatus();
+    bool          _have_ntp_time;
+    unsigned long getSystemTime();
 
   private:
     // mqtt
@@ -418,6 +420,7 @@ class MyESP {
     char *        _getBuildTime();
     bool          _hasValue(const char * s);
     void          _printHeap(const char * s);
+    void          _kick();
 
     // reset reason and rtcmem
     bool _rtcmem_status;
@@ -464,6 +467,7 @@ class MyESP {
 
     // log
     void _sendEventLog(uint8_t page);
+    void _emptyEventLog();
 
     // web
     void _onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t * data, size_t len);
@@ -481,6 +485,7 @@ class MyESP {
     char *  _ntp_server;
     uint8_t _ntp_interval;
     bool    _ntp_enabled;
+    uint8_t _ntp_timezone;
 };
 
 extern MyESP myESP;
diff --git a/src/Ntp.cpp b/src/Ntp.cpp
index 679bbae7b..5b294ee40 100644
--- a/src/Ntp.cpp
+++ b/src/Ntp.cpp
@@ -3,16 +3,75 @@
  */
 
 #include "Ntp.h"
+#include "MyESP.h"
 
-char *    NtpClient::TimeServerName;
-time_t    NtpClient::syncInterval;
-IPAddress NtpClient::timeServer;
-AsyncUDP  NtpClient::udpListener;
-byte      NtpClient::NTPpacket[NTP_PACKET_SIZE];
+char *           NtpClient::TimeServerName;
+Timezone *       NtpClient::tz;
+TimeChangeRule * NtpClient::tcr;
+time_t           NtpClient::syncInterval;
+IPAddress        NtpClient::timeServer;
+AsyncUDP         NtpClient::udpListener;
+byte             NtpClient::NTPpacket[NTP_PACKET_SIZE];
 
-void ICACHE_FLASH_ATTR NtpClient::Ntp(const char * server, time_t syncMins) {
+// Australia Eastern Time Zone (Sydney, Melbourne)
+TimeChangeRule aEDT = {"AEDT", First, Sun, Oct, 2, 660}; // UTC + 11 hours
+TimeChangeRule aEST = {"AEST", First, Sun, Apr, 3, 600}; // UTC + 10 hours
+Timezone       ausET(aEDT, aEST);
+
+// Moscow Standard Time (MSK, does not observe DST)
+TimeChangeRule msk = {"MSK", Last, Sun, Mar, 1, 180};
+Timezone       tzMSK(msk);
+
+// Central European Time (Frankfurt, Paris)
+TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120}; // Central European Summer Time
+TimeChangeRule CET  = {"CET ", Last, Sun, Oct, 3, 60};  // Central European Standard Time
+Timezone       CE(CEST, CET);
+
+// United Kingdom (London, Belfast)
+TimeChangeRule BST = {"BST", Last, Sun, Mar, 1, 60}; // British Summer Time
+TimeChangeRule GMT = {"GMT", Last, Sun, Oct, 2, 0};  // Standard Time
+Timezone       UK(BST, GMT);
+
+// UTC
+TimeChangeRule utcRule = {"UTC", Last, Sun, Mar, 1, 0}; // UTC
+Timezone       UTC(utcRule);
+
+// US Eastern Time Zone (New York, Detroit)
+TimeChangeRule usEDT = {"EDT", Second, Sun, Mar, 2, -240}; // Eastern Daylight Time = UTC - 4 hours
+TimeChangeRule usEST = {"EST", First, Sun, Nov, 2, -300};  // Eastern Standard Time = UTC - 5 hours
+Timezone       usET(usEDT, usEST);
+
+// US Central Time Zone (Chicago, Houston)
+TimeChangeRule usCDT = {"CDT", Second, Sun, Mar, 2, -300};
+TimeChangeRule usCST = {"CST", First, Sun, Nov, 2, -360};
+Timezone       usCT(usCDT, usCST);
+
+// US Mountain Time Zone (Denver, Salt Lake City)
+TimeChangeRule usMDT = {"MDT", Second, Sun, Mar, 2, -360};
+TimeChangeRule usMST = {"MST", First, Sun, Nov, 2, -420};
+Timezone       usMT(usMDT, usMST);
+
+// Arizona is US Mountain Time Zone but does not use DST
+Timezone usAZ(usMST);
+
+// US Pacific Time Zone (Las Vegas, Los Angeles)
+TimeChangeRule usPDT = {"PDT", Second, Sun, Mar, 2, -420};
+TimeChangeRule usPST = {"PST", First, Sun, Nov, 2, -480};
+Timezone       usPT(usPDT, usPST);
+
+// build index of all timezones
+Timezone * timezones[] = {&ausET, &tzMSK, &CE, &UK, &UTC, &usET, &usCT, &usMT, &usAZ, &usPT};
+
+void ICACHE_FLASH_ATTR NtpClient::Ntp(const char * server, time_t syncMins, uint8_t tz_index) {
     TimeServerName = strdup(server);
     syncInterval   = syncMins * 60; // convert to seconds
+
+    // check for out of bounds
+    if (tz_index > NTP_TIMEZONE_MAX) {
+        tz_index = NTP_TIMEZONE_DEFAULT;
+    }
+    tz = timezones[tz_index]; // set timezone
+
     WiFi.hostByName(TimeServerName, timeServer);
     setSyncProvider(getNtpTime);
     setSyncInterval(syncInterval);
@@ -35,10 +94,23 @@ time_t ICACHE_FLASH_ATTR NtpClient::getNtpTime() {
     NTPpacket[15] = 52;
     if (udpListener.connect(timeServer, 123)) {
         udpListener.onPacket([](AsyncUDPPacket packet) {
-            unsigned long highWord    = word(packet.data()[40], packet.data()[41]);
-            unsigned long lowWord     = word(packet.data()[42], packet.data()[43]);
-            time_t        UnixUTCtime = (highWord << 16 | lowWord) - 2208988800UL;
-            setTime(UnixUTCtime);
+            unsigned long highWord     = word(packet.data()[40], packet.data()[41]);
+            unsigned long lowWord      = word(packet.data()[42], packet.data()[43]);
+            time_t        UnixUTCtime  = (highWord << 16 | lowWord) - 2208988800UL;
+            time_t        adjustedtime = (*tz).toLocal(UnixUTCtime, &tcr);
+
+            myESP.myDebug("[NTP] UTC internet time is %d/%d %02d:%02d:%02d. System time set to local timezone which is %02d:%02d:%02d %s\n",
+                          to_day(UnixUTCtime),
+                          to_month(UnixUTCtime),
+                          to_hour(UnixUTCtime),
+                          to_minute(UnixUTCtime),
+                          to_second(UnixUTCtime),
+                          to_hour(adjustedtime),
+                          to_minute(adjustedtime),
+                          to_second(adjustedtime),
+                          tcr->abbrev);
+
+            setTime(adjustedtime);
         });
     }
     udpListener.write(NTPpacket, sizeof(NTPpacket));
diff --git a/src/Ntp.h b/src/Ntp.h
index 7eca60b9e..03bb88946 100644
--- a/src/Ntp.h
+++ b/src/Ntp.h
@@ -10,18 +10,24 @@
 #include <ESP8266WiFi.h>
 #include <ESPAsyncUDP.h>
 
-#include "TimeLib.h" // customized version of the time library
+#include "TimeLib.h" // customized version of the Time library
+#include "Timezone.h"
 
 #define NTP_PACKET_SIZE 48 // NTP time is in the first 48 bytes of message
+#define NTP_INTERVAL_DEFAULT 60 // every hour
+#define NTP_TIMEZONE_DEFAULT 2 // CE
+#define NTP_TIMEZONE_MAX 9
 
 class NtpClient {
   public:
-    void ICACHE_FLASH_ATTR Ntp(const char * server, time_t syncMins);
+    void ICACHE_FLASH_ATTR Ntp(const char * server, time_t syncMins, uint8_t tz_index);
     ICACHE_FLASH_ATTR virtual ~NtpClient();
 
-    static char *    TimeServerName;
-    static IPAddress timeServer;
-    static time_t    syncInterval;
+    static char *           TimeServerName;
+    static IPAddress        timeServer;
+    static time_t           syncInterval;
+    static Timezone *       tz;
+    static TimeChangeRule * tcr;
 
     static AsyncUDP udpListener;
 
diff --git a/src/TimeLib.cpp b/src/TimeLib.cpp
index e59b24dc2..0595323c4 100644
--- a/src/TimeLib.cpp
+++ b/src/TimeLib.cpp
@@ -1,3 +1,8 @@
+/*
+ * customized version of Time library, originally Copyright (c) Michael Margolis 2009-2014
+ * modified by Paul S https://github.com/PaulStoffregen/Time
+ */
+
 #include "TimeLib.h"
 
 static tmElements_t tm;                 // a cache of time elements
@@ -96,6 +101,34 @@ void breakTime(time_t timeInput, tmElements_t & tm) {
     tm.Day   = time + 1;  // day of month
 }
 
+// assemble time elements into time_t
+time_t makeTime(const tmElements_t & tm) {
+    int      i;
+    uint32_t seconds;
+
+    // seconds from 1970 till 1 jan 00:00:00 of the given year
+    seconds = tm.Year * (SECS_PER_DAY * 365);
+    for (i = 0; i < tm.Year; i++) {
+        if (LEAP_YEAR(i)) {
+            seconds += SECS_PER_DAY; // add extra days for leap years
+        }
+    }
+
+    // add days for this year, months start from 1
+    for (i = 1; i < tm.Month; i++) {
+        if ((i == 2) && LEAP_YEAR(tm.Year)) {
+            seconds += SECS_PER_DAY * 29;
+        } else {
+            seconds += SECS_PER_DAY * monthDays[i - 1]; // monthDay array starts from 0
+        }
+    }
+    seconds += (tm.Day - 1) * SECS_PER_DAY;
+    seconds += tm.Hour * SECS_PER_HOUR;
+    seconds += tm.Minute * SECS_PER_MIN;
+    seconds += tm.Second;
+    return (time_t)seconds;
+}
+
 void refreshCache(time_t t) {
     if (t != cacheTime) {
         breakTime(t, tm);
@@ -118,6 +151,26 @@ uint8_t to_hour(time_t t) { // the hour for the given time
     return tm.Hour;
 }
 
+uint8_t to_day(time_t t) { // the day for the given time (0-6)
+    refreshCache(t);
+    return tm.Day;
+}
+
+uint8_t to_month(time_t t) { // the month for the given time
+    refreshCache(t);
+    return tm.Month;
+}
+
+uint8_t to_weekday(time_t t) {
+    refreshCache(t);
+    return tm.Wday;
+}
+
+uint16_t to_year(time_t t) { // the year for the given time
+    refreshCache(t);
+    return tm.Year + 1970;
+}
+
 void setTime(time_t t) {
     sysTime      = (uint32_t)t;
     nextSyncTime = (uint32_t)t + syncInterval;
diff --git a/src/TimeLib.h b/src/TimeLib.h
index 0531e270a..604caa0e1 100644
--- a/src/TimeLib.h
+++ b/src/TimeLib.h
@@ -1,3 +1,8 @@
+/*
+ * customized version of Time library, originally Copyright (c) Michael Margolis 2009-2014
+ * modified by Paul S https://github.com/PaulStoffregen/Time
+ */
+
 #ifndef _TimeLib_h
 #define _TimeLib_h
 
@@ -38,8 +43,13 @@ void         setSyncProvider(getExternalTime getTimeFunction); // identify the e
 void         setSyncInterval(time_t interval);                 // set the number of seconds between re-sync
 time_t       makeTime(const tmElements_t & tm);                // convert time elements into time_t
 
-uint8_t to_hour(time_t t);   // the hour for the given time
-uint8_t to_minute(time_t t); // the minute for the given time
-uint8_t to_second(time_t t); // the second for the given time
+uint8_t  to_hour(time_t t);    // the hour for the given time
+uint8_t  to_minute(time_t t);  // the minute for the given time
+uint8_t  to_second(time_t t);  // the second for the given time
+uint8_t  to_day(time_t t);     // the day for the given time (0-6)
+uint8_t  to_month(time_t t);   // the month for the given time
+uint8_t  to_weekday(time_t t); // weekday, sunday is day 1
+uint16_t to_year(time_t t);    // the year for the given time
+
 }
 #endif
diff --git a/src/Timezone.cpp b/src/Timezone.cpp
new file mode 100644
index 000000000..4aaa88e2b
--- /dev/null
+++ b/src/Timezone.cpp
@@ -0,0 +1,200 @@
+/*----------------------------------------------------------------------*
+ * Arduino Timezone Library                                             *
+ * Jack Christensen Mar 2012                                            *
+ *                                                                      *
+ * Stripped down for myESP by Paul Derbyshire                           *
+ *                                                                      *
+ * Arduino Timezone Library Copyright (C) 2018 by Jack Christensen and  *
+ * licensed under GNU GPL v3.0, https://www.gnu.org/licenses/gpl.html   *
+ *----------------------------------------------------------------------*/
+
+#include "Timezone.h"
+
+/*----------------------------------------------------------------------*
+ * Create a Timezone object from the given time change rules.           *
+ *----------------------------------------------------------------------*/
+Timezone::Timezone(TimeChangeRule dstStart, TimeChangeRule stdStart)
+    : m_dst(dstStart)
+    , m_std(stdStart) {
+    initTimeChanges();
+}
+
+/*----------------------------------------------------------------------*
+ * Create a Timezone object for a zone that does not observe            *
+ * daylight time.                                                       *
+ *----------------------------------------------------------------------*/
+Timezone::Timezone(TimeChangeRule stdTime)
+    : m_dst(stdTime)
+    , m_std(stdTime) {
+    initTimeChanges();
+}
+
+/*----------------------------------------------------------------------*
+ * Convert the given UTC time to local time, standard or                *
+ * daylight time, as appropriate.                                       *
+ *----------------------------------------------------------------------*/
+time_t Timezone::toLocal(time_t utc) {
+    // recalculate the time change points if needed
+    if (to_year(utc) != to_year(m_dstUTC))
+        calcTimeChanges(to_year(utc));
+
+    if (utcIsDST(utc))
+        return utc + m_dst.offset * SECS_PER_MIN;
+    else
+        return utc + m_std.offset * SECS_PER_MIN;
+}
+
+/*----------------------------------------------------------------------*
+ * Convert the given UTC time to local time, standard or                *
+ * daylight time, as appropriate, and return a pointer to the time      *
+ * change rule used to do the conversion. The caller must take care     *
+ * not to alter this rule.                                              *
+ *----------------------------------------------------------------------*/
+time_t Timezone::toLocal(time_t utc, TimeChangeRule ** tcr) {
+    // recalculate the time change points if needed
+    if (to_year(utc) != to_year(m_dstUTC))
+        calcTimeChanges(to_year(utc));
+
+    if (utcIsDST(utc)) {
+        *tcr = &m_dst;
+        return utc + m_dst.offset * SECS_PER_MIN;
+    } else {
+        *tcr = &m_std;
+        return utc + m_std.offset * SECS_PER_MIN;
+    }
+}
+
+/*----------------------------------------------------------------------*
+ * Convert the given local time to UTC time.                            *
+ *                                                                      *
+ * WARNING:                                                             *
+ * This function is provided for completeness, but should seldom be     *
+ * needed and should be used sparingly and carefully.                   *
+ *                                                                      *
+ * Ambiguous situations occur after the Standard-to-DST and the         *
+ * DST-to-Standard time transitions. When changing to DST, there is     *
+ * one hour of local time that does not exist, since the clock moves    *
+ * forward one hour. Similarly, when changing to standard time, there   *
+ * is one hour of local times that occur twice since the clock moves    *
+ * back one hour.                                                       *
+ *                                                                      *
+ * This function does not test whether it is passed an erroneous time   *
+ * value during the Local -> DST transition that does not exist.        *
+ * If passed such a time, an incorrect UTC time value will be returned. *
+ *                                                                      *
+ * If passed a local time value during the DST -> Local transition      *
+ * that occurs twice, it will be treated as the earlier time, i.e.      *
+ * the time that occurs before the transistion.                         *
+ *                                                                      *
+ * Calling this function with local times during a transition interval  *
+ * should be avoided!                                                   *
+ *----------------------------------------------------------------------*/
+time_t Timezone::toUTC(time_t local) {
+    // recalculate the time change points if needed
+    if (to_year(local) != to_year(m_dstLoc))
+        calcTimeChanges(to_year(local));
+
+    if (locIsDST(local))
+        return local - m_dst.offset * SECS_PER_MIN;
+    else
+        return local - m_std.offset * SECS_PER_MIN;
+}
+
+/*----------------------------------------------------------------------*
+ * Determine whether the given UTC time_t is within the DST interval    *
+ * or the Standard time interval.                                       *
+ *----------------------------------------------------------------------*/
+bool Timezone::utcIsDST(time_t utc) {
+    // recalculate the time change points if needed
+    if (to_year(utc) != to_year(m_dstUTC))
+        calcTimeChanges(to_year(utc));
+
+    if (m_stdUTC == m_dstUTC) // daylight time not observed in this tz
+        return false;
+    else if (m_stdUTC > m_dstUTC) // northern hemisphere
+        return (utc >= m_dstUTC && utc < m_stdUTC);
+    else // southern hemisphere
+        return !(utc >= m_stdUTC && utc < m_dstUTC);
+}
+
+/*----------------------------------------------------------------------*
+ * Determine whether the given Local time_t is within the DST interval  *
+ * or the Standard time interval.                                       *
+ *----------------------------------------------------------------------*/
+bool Timezone::locIsDST(time_t local) {
+    // recalculate the time change points if needed
+    if (to_year(local) != to_year(m_dstLoc))
+        calcTimeChanges(to_year(local));
+
+    if (m_stdUTC == m_dstUTC) // daylight time not observed in this tz
+        return false;
+    else if (m_stdLoc > m_dstLoc) // northern hemisphere
+        return (local >= m_dstLoc && local < m_stdLoc);
+    else // southern hemisphere
+        return !(local >= m_stdLoc && local < m_dstLoc);
+}
+
+/*----------------------------------------------------------------------*
+ * Calculate the DST and standard time change points for the given      *
+ * given year as local and UTC time_t values.                           *
+ *----------------------------------------------------------------------*/
+void Timezone::calcTimeChanges(int yr) {
+    m_dstLoc = toTime_t(m_dst, yr);
+    m_stdLoc = toTime_t(m_std, yr);
+    m_dstUTC = m_dstLoc - m_std.offset * SECS_PER_MIN;
+    m_stdUTC = m_stdLoc - m_dst.offset * SECS_PER_MIN;
+}
+
+/*----------------------------------------------------------------------*
+ * Initialize the DST and standard time change points.                  *
+ *----------------------------------------------------------------------*/
+void Timezone::initTimeChanges() {
+    m_dstLoc = 0;
+    m_stdLoc = 0;
+    m_dstUTC = 0;
+    m_stdUTC = 0;
+}
+
+/*----------------------------------------------------------------------*
+ * Convert the given time change rule to a time_t value                 *
+ * for the given year.                                                  *
+ *----------------------------------------------------------------------*/
+time_t Timezone::toTime_t(TimeChangeRule r, int yr) {
+    uint8_t m = r.month; // temp copies of r.month and r.week
+    uint8_t w = r.week;
+    if (w == 0) // is this a "Last week" rule?
+    {
+        if (++m > 12) // yes, for "Last", go to the next month
+        {
+            m = 1;
+            ++yr;
+        }
+        w = 1; // and treat as first week of next month, subtract 7 days later
+    }
+
+    // calculate first day of the month, or for "Last" rules, first day of the next month
+    tmElements_t tm;
+    tm.Hour   = r.hour;
+    tm.Minute = 0;
+    tm.Second = 0;
+    tm.Day    = 1;
+    tm.Month  = m;
+    tm.Year   = yr - 1970;
+    time_t t  = makeTime(tm);
+
+    // add offset from the first of the month to r.dow, and offset for the given week
+    t += ((r.dow - to_weekday(t) + 7) % 7 + (w - 1) * 7) * SECS_PER_DAY;
+    // back up a week if this is a "Last" rule
+    if (r.week == 0)
+        t -= 7 * SECS_PER_DAY;
+    return t;
+}
+
+/*----------------------------------------------------------------------*
+ * Read or update the daylight and standard time rules from RAM.        *
+ *----------------------------------------------------------------------*/
+void Timezone::setRules(TimeChangeRule dstStart, TimeChangeRule stdStart) {
+    m_dst = dstStart;
+    m_std = stdStart;
+    initTimeChanges(); // force calcTimeChanges() at next conversion call
+}
diff --git a/src/Timezone.h b/src/Timezone.h
new file mode 100644
index 000000000..2e8a93248
--- /dev/null
+++ b/src/Timezone.h
@@ -0,0 +1,53 @@
+/*----------------------------------------------------------------------*
+ * Arduino Timezone Library                                             *
+ * Jack Christensen Mar 2012                                            *
+ *                                                                      *
+ * Arduino Timezone Library Copyright (C) 2018 by Jack Christensen and  *
+ * licensed under GNU GPL v3.0, https://www.gnu.org/licenses/gpl.html   *
+ *----------------------------------------------------------------------*/
+
+#ifndef TIMEZONE_H_INCLUDED
+#define TIMEZONE_H_INCLUDED
+#include <Arduino.h>
+#include <TimeLib.h>
+
+// convenient constants for TimeChangeRules
+enum week_t { Last, First, Second, Third, Fourth };
+enum dow_t { Sun = 1, Mon, Tue, Wed, Thu, Fri, Sat };
+enum month_t { Jan = 1, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec };
+
+// structure to describe rules for when daylight/summer time begins,
+// or when standard time begins.
+struct TimeChangeRule {
+    char    abbrev[6]; // five chars max
+    uint8_t week;      // First, Second, Third, Fourth, or Last week of the month
+    uint8_t dow;       // day of week, 1=Sun, 2=Mon, ... 7=Sat
+    uint8_t month;     // 1=Jan, 2=Feb, ... 12=Dec
+    uint8_t hour;      // 0-23
+    int     offset;    // offset from UTC in minutes
+};
+
+class Timezone {
+  public:
+    Timezone(TimeChangeRule dstStart, TimeChangeRule stdStart);
+    Timezone(TimeChangeRule stdTime);
+    time_t toLocal(time_t utc);
+    time_t toLocal(time_t utc, TimeChangeRule ** tcr);
+    time_t toUTC(time_t local);
+    bool   utcIsDST(time_t utc);
+    bool   locIsDST(time_t local);
+    void   setRules(TimeChangeRule dstStart, TimeChangeRule stdStart);
+
+  private:
+    void           calcTimeChanges(int yr);
+    void           initTimeChanges();
+    time_t         toTime_t(TimeChangeRule r, int yr);
+    TimeChangeRule m_dst;    // rule for start of dst or summer time for any year
+    TimeChangeRule m_std;    // rule for start of standard time for any year
+    time_t         m_dstUTC; // dst start for given/current year, given in UTC
+    time_t         m_stdUTC; // std time start for given/current year, given in UTC
+    time_t         m_dstLoc; // dst start for given/current year, given in local time
+    time_t         m_stdLoc; // std time start for given/current year, given in local time
+};
+
+#endif
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 9db85400d..c5773827f 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -70,7 +70,6 @@ Ticker showerColdShotStopTimer;
 #define SHOWER_MAX_DURATION 420000  // in ms. 7 minutes, before trigger a shot of cold water
 
 // set this if using an external temperature sensor like a DS18B20
-// D5 is the default on a bbqkees board
 #define EMSESP_DALLAS_GPIO D5
 #define EMSESP_DALLAS_PARASITE false
 
@@ -80,8 +79,7 @@ Ticker showerColdShotStopTimer;
 #define EMSESP_LED_GPIO LED_BUILTIN
 
 typedef struct {
-    uint32_t timestamp;      // for internal timings, via millis()
-    uint8_t  dallas_sensors; // count of dallas sensors
+    uint8_t dallas_sensors; // count of dallas sensors
 
     // custom params
     bool     shower_timer;    // true if we want to report back on shower times
@@ -930,7 +928,7 @@ void do_systemCheck() {
 // only if we have a EMS connection
 void do_regularUpdates() {
     if (ems_getBusConnected() && !ems_getTxDisabled()) {
-        myDebugLog("Starting scheduled query from EMS devices");
+        myDebugLog("Fetching data from EMS devices");
         ems_getThermostatValues();
         ems_getBoilerValues();
         ems_getSolarModuleValues();
@@ -1917,7 +1915,6 @@ void initEMSESP() {
     EMSESP_Settings.listen_mode    = false;
     EMSESP_Settings.publish_time   = DEFAULT_PUBLISHTIME;
     EMSESP_Settings.publish_always = false;
-    EMSESP_Settings.timestamp      = millis();
     EMSESP_Settings.dallas_sensors = 0;
     EMSESP_Settings.led_gpio       = EMSESP_LED_GPIO;
     EMSESP_Settings.dallas_gpio    = EMSESP_DALLAS_GPIO;
@@ -1937,6 +1934,7 @@ void initEMSESP() {
  *  Shower Logic
  */
 void showerCheck() {
+    uint32_t time_now = millis();
     // if already in cold mode, ignore all this logic until we're out of the cold blast
     if (!EMSESP_Shower.doingColdShot) {
         // is the hot water running?
@@ -1944,7 +1942,7 @@ void showerCheck() {
             // if heater was previously off, start the timer
             if (EMSESP_Shower.timerStart == 0) {
                 // hot water just started...
-                EMSESP_Shower.timerStart    = EMSESP_Settings.timestamp;
+                EMSESP_Shower.timerStart    = time_now;
                 EMSESP_Shower.timerPause    = 0; // remove any last pauses
                 EMSESP_Shower.doingColdShot = false;
                 EMSESP_Shower.duration      = 0;
@@ -1952,13 +1950,12 @@ void showerCheck() {
             } else {
                 // hot water has been  on for a while
                 // first check to see if hot water has been on long enough to be recognized as a Shower/Bath
-                if (!EMSESP_Shower.showerOn && (EMSESP_Settings.timestamp - EMSESP_Shower.timerStart) > SHOWER_MIN_DURATION) {
+                if (!EMSESP_Shower.showerOn && (time_now - EMSESP_Shower.timerStart) > SHOWER_MIN_DURATION) {
                     EMSESP_Shower.showerOn = true;
                     myDebugLog("[Shower] hot water still running, starting shower timer");
                 }
                 // check if the shower has been on too long
-                else if ((((EMSESP_Settings.timestamp - EMSESP_Shower.timerStart) > SHOWER_MAX_DURATION) && !EMSESP_Shower.doingColdShot)
-                         && EMSESP_Settings.shower_alert) {
+                else if ((((time_now - EMSESP_Shower.timerStart) > SHOWER_MAX_DURATION) && !EMSESP_Shower.doingColdShot) && EMSESP_Settings.shower_alert) {
                     myDebugLog("[Shower] exceeded max shower time");
                     _showerColdShotStart();
                 }
@@ -1966,11 +1963,11 @@ void showerCheck() {
         } else { // hot water is off
             // if it just turned off, record the time as it could be a short pause
             if ((EMSESP_Shower.timerStart) && (EMSESP_Shower.timerPause == 0)) {
-                EMSESP_Shower.timerPause = EMSESP_Settings.timestamp;
+                EMSESP_Shower.timerPause = time_now;
             }
 
             // if shower has been off for longer than the wait time
-            if ((EMSESP_Shower.timerPause) && ((EMSESP_Settings.timestamp - EMSESP_Shower.timerPause) > SHOWER_PAUSE_TIME)) {
+            if ((EMSESP_Shower.timerPause) && ((time_now - EMSESP_Shower.timerPause) > SHOWER_PAUSE_TIME)) {
                 // it is over the wait period, so assume that the shower has finished and calculate the total time and publish
                 // because its unsigned long, can't have negative so check if length is less than OFFSET_TIME
                 if ((EMSESP_Shower.timerPause - EMSESP_Shower.timerStart) > SHOWER_OFFSET_TIME) {
@@ -2062,8 +2059,6 @@ void setup() {
 // Main loop
 //
 void loop() {
-    EMSESP_Settings.timestamp = millis();
-
     // the main loop
     myESP.loop();
 
diff --git a/src/ems.cpp b/src/ems.cpp
index 285c8c6ce..0ec2b1b7c 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -519,7 +519,6 @@ void ems_setTxMode(uint8_t mode) {
     EMS_Sys_Status.emsTxMode = mode;
 }
 
-
 /**
  * debug print a telegram to telnet/serial including the CRC
  */
@@ -530,18 +529,42 @@ void _debugPrintTelegram(const char * prefix, _EMS_RxTelegram * EMS_RxTelegram,
     uint8_t   data_len        = EMS_RxTelegram->data_length; // length of data block
     uint8_t   length          = EMS_RxTelegram->length;      // includes CRC
 
+    // get elapsed system time or internet time if available
+    uint8_t       t_sec, t_min, t_hour;
+    uint16_t      t_msec;
+    unsigned long timestamp   = EMS_RxTelegram->timestamp;
+    bool          haveNTPtime = (timestamp > 1572307205); // after Jan 1st 1970
+
+    if (haveNTPtime) {
+        t_sec = timestamp % 60;
+        timestamp /= 60; // now it is minutes
+        t_min = timestamp % 60;
+        timestamp /= 60; // now it is hours
+        t_hour = timestamp % 24;
+    } else {
+        t_hour = timestamp / 3600000;
+        t_min  = (timestamp / 60000) % 60;
+        t_sec  = (timestamp / 1000) % 60;
+        t_msec = timestamp % 1000;
+    }
+
     strlcpy(output_str, "(", sizeof(output_str));
     strlcat(output_str, COLOR_CYAN, sizeof(output_str));
-    strlcat(output_str, _smallitoa((uint8_t)((EMS_RxTelegram->timestamp / 3600000) % 24), buffer), sizeof(output_str));
+
+    strlcat(output_str, _smallitoa(t_hour, buffer), sizeof(output_str));
     strlcat(output_str, ":", sizeof(output_str));
-    strlcat(output_str, _smallitoa((uint8_t)((EMS_RxTelegram->timestamp / 60000) % 60), buffer), sizeof(output_str));
+    strlcat(output_str, _smallitoa(t_min, buffer), sizeof(output_str));
     strlcat(output_str, ":", sizeof(output_str));
-    strlcat(output_str, _smallitoa((uint8_t)((EMS_RxTelegram->timestamp / 1000) % 60), buffer), sizeof(output_str));
-    strlcat(output_str, ".", sizeof(output_str));
-    strlcat(output_str, _smallitoa3(EMS_RxTelegram->timestamp % 1000, buffer), sizeof(output_str));
+    strlcat(output_str, _smallitoa(t_sec, buffer), sizeof(output_str));
+
+    // internet time doesn't have millisecond precision, so ignore it
+    if (!haveNTPtime) {
+        strlcat(output_str, ".", sizeof(output_str));
+        strlcat(output_str, _smallitoa3(t_msec, buffer), sizeof(output_str));
+    }
+
     strlcat(output_str, COLOR_RESET, sizeof(output_str));
     strlcat(output_str, ") ", sizeof(output_str));
-
     strlcat(output_str, color, sizeof(output_str));
     strlcat(output_str, prefix, sizeof(output_str));
 
@@ -605,8 +628,8 @@ void _ems_sendTelegram() {
             _EMS_RxTelegram EMS_RxTelegram;                     // create new Rx object
             EMS_RxTelegram.length      = EMS_TxTelegram.length; // full length of telegram
             EMS_RxTelegram.telegram    = EMS_TxTelegram.data;
-            EMS_RxTelegram.data_length = 0;        // ignore #data=
-            EMS_RxTelegram.timestamp   = millis(); // now
+            EMS_RxTelegram.data_length = 0;                     // ignore #data=
+            EMS_RxTelegram.timestamp   = myESP.getSystemTime(); // now
             _debugPrintTelegram("Sending raw: ", &EMS_RxTelegram, COLOR_CYAN, true);
         }
 
@@ -677,7 +700,7 @@ void _ems_sendTelegram() {
         EMS_RxTelegram.length      = EMS_TxTelegram.length; // complete length of telegram incl CRC
         EMS_RxTelegram.data_length = 0;                     // ignore the data length for read and writes. only used for incoming.
         EMS_RxTelegram.telegram    = EMS_TxTelegram.data;
-        EMS_RxTelegram.timestamp   = millis(); // now
+        EMS_RxTelegram.timestamp   = myESP.getSystemTime(); // now
         _debugPrintTelegram(s, &EMS_RxTelegram, COLOR_CYAN);
     }
 
@@ -880,7 +903,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
 
     static _EMS_RxTelegram EMS_RxTelegram; // create the Rx package
     EMS_RxTelegram.telegram  = telegram;
-    EMS_RxTelegram.timestamp = millis();
+    EMS_RxTelegram.timestamp = myESP.getSystemTime();
     EMS_RxTelegram.length    = length;
 
     EMS_RxTelegram.src    = telegram[0] & 0x7F; // removing 8th bit as we deal with both reads and writes here
@@ -939,7 +962,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
 
     // here we know its a valid incoming telegram of at least 6 bytes
     // we use this to see if we always have a connection to the boiler, in case of drop outs
-    EMS_Sys_Status.emsRxTimestamp  = EMS_RxTelegram.timestamp; // timestamp of last read
+    EMS_Sys_Status.emsRxTimestamp  = millis(); // timestamp of last read
     EMS_Sys_Status.emsBusConnected = true;
 
     // now lets process it and see what to do next
@@ -1526,7 +1549,7 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
                                                   // manual : 10 00 FF 0A 01 A5 02
                                                   // auto : Thermostat -> all, type 0x01A5 telegram: 10 00 FF 0A 01 A5 03
 
-            // TODO this may be bit 2 instead of 1 on an RC300 - still to validate
+            // Note this may be bit 2 instead of 1 on an RC300 - still to validate
             EMS_Thermostat.hc[hc].mode     = _bitRead(0, 0); // bit 1, mode (auto=1 or manual=0)
             EMS_Thermostat.hc[hc].day_mode = _bitRead(0, 1); // get day mode flag
 
@@ -2791,6 +2814,7 @@ void ems_sendRawTelegram(char * telegram) {
  */
 void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype) {
     if (!ems_getThermostatEnabled()) {
+        myDebug_P(PSTR("Thermostat not online."));
         return;
     }
 
@@ -2905,6 +2929,7 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
  */
 void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
     if (!ems_getThermostatEnabled()) {
+        myDebug_P(PSTR("Thermostat not online."));
         return;
     }
 
diff --git a/src/ems.h b/src/ems.h
index fa52f1373..25dcac11b 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -147,23 +147,23 @@ typedef struct {
     uint8_t                 comparisonOffset;   // offset of where the byte is we want to compare too during validation
     uint16_t                comparisonPostRead; // after a successful write, do a read from this type ID
     bool                    forceRefresh;       // should we send to MQTT after a successful Tx?
-    uint32_t                timestamp;          // when created
+    unsigned long           timestamp;          // when created
     uint8_t                 data[EMS_MAX_TELEGRAM_LENGTH];
 } _EMS_TxTelegram;
 
 // The Rx receive package
 typedef struct {
-    uint32_t  timestamp;    // timestamp from millis()
-    uint8_t * telegram;     // the full data package
-    uint8_t   data_length;  // length in bytes of the data
-    uint8_t   length;       // full length of the complete telegram
-    uint8_t   src;          // source ID
-    uint8_t   dest;         // destination ID
-    uint16_t  type;         // type ID as a double byte to support EMS+
-    uint8_t   offset;       // offset
-    uint8_t * data;         // pointer to where telegram data starts
-    bool      emsplus;      // true if ems+/ems 2.0
-    uint8_t   emsplus_type; // FF, F7 or F9
+    unsigned long timestamp;    // timestamp from millis()
+    uint8_t *     telegram;     // the full data package
+    uint8_t       data_length;  // length in bytes of the data
+    uint8_t       length;       // full length of the complete telegram
+    uint8_t       src;          // source ID
+    uint8_t       dest;         // destination ID
+    uint16_t      type;         // type ID as a double byte to support EMS+
+    uint8_t       offset;       // offset
+    uint8_t *     data;         // pointer to where telegram data starts
+    bool          emsplus;      // true if ems+/ems 2.0
+    uint8_t       emsplus_type; // FF, F7 or F9
 } _EMS_RxTelegram;
 
 // default empty Tx, must match struct
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index 88680f64a..81ffcd160 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -391,10 +391,29 @@
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
                 data-content="Time in minutes between scheduled NTP refreshes"></i></label>
         <span class="col-xs-9 col-md-5">
-            <input class="form-control input-sm" placeholder="in Minutes" value="30" id="intervals" type="text">
+            <input class="form-control input-sm" placeholder="in Minutes" value="30" id="interval" type="text">
         </span>
         <br>
     </div>
+
+    <div class="row form-group">
+        <label class="col-xs-3">Time Zone</label>
+        <span class="col-xs-9 col-md-5">
+            <select class="form-control input-sm" name="timzeone" id="timezone">
+                <option value="0">Australia Eastern (Sydney, Melbourne)</option>
+                <option value="1">Moscow (MSK, does not observe DST)</option>
+                <option selected="selected" value="2">Central European Time (Frankfurt, Paris, Amsterdam)</option>
+                <option value="3">United Kingdom (London, Belfast)</option>
+                <option value="4">UTC</option>
+                <option value="5">US Eastern (New York, Detroit)</option>
+                <option value="6">US Central (Chicago, Houston)</option>
+                <option value="7">US Mountain (Denver, Salt Lake City)</option>
+                <option value="8">Arizona (no DST)</option>
+                <option value="9">US Pacific (Las Vegas, Los Angeles)</option>
+            </select>
+        </span>
+    </div>
+
     <br>
     <div class="col-xs-9 col-md-8">
         <button onclick="saventp()" class="btn btn-primary btn-sm pull-right">Save</button>
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index 6a69766b4..9379ee7b0 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -2,7 +2,7 @@ var version = "";
 
 var websock = null;
 var wsUri = "ws://" + window.location.host + "/ws";
-var utcSeconds;
+var ntpSeconds;
 var data = [];
 var ajaxobj;
 
@@ -37,7 +37,8 @@ var config = {
         "hostname": "",
         "serial": false,
         "password": "admin",
-        "log_events": true
+        "log_events": true,
+        "version": "1.0.0"
     },
     "mqtt": {
         "enabled": false,
@@ -53,13 +54,14 @@ var config = {
     },
     "ntp": {
         "server": "pool.ntp.org",
-        "interval": 30,
+        "interval": 60,
+        "timezone": 2,
         "enabled": true
     }
 };
 
 function browserTime() {
-    var d = new Date(0);
+    var d = new Date(0); // The 0 there is the key, which sets the date to the epoch
     var c = new Date();
     var timestamp = Math.floor((c.getTime() / 1000) + ((c.getTimezoneOffset() * 60) * -1));
     d.setUTCSeconds(timestamp);
@@ -67,10 +69,8 @@ function browserTime() {
 }
 
 function deviceTime() {
-    var c = new Date();
     var t = new Date(0); // The 0 there is the key, which sets the date to the epoch
-    var devTime = Math.floor(utcSeconds + ((c.getTimezoneOffset() * 60) * -1));
-    t.setUTCSeconds(devTime);
+    t.setUTCSeconds(ntpSeconds);
     document.getElementById("utc").innerHTML = t.toUTCString().slice(0, -3);
 }
 
@@ -96,7 +96,8 @@ function listntp() {
     websock.send("{\"command\":\"gettime\"}");
 
     document.getElementById("ntpserver").value = config.ntp.server;
-    document.getElementById("intervals").value = config.ntp.interval;
+    document.getElementById("interval").value = config.ntp.interval;
+    document.getElementById("timezone").value = config.ntp.timezone;
 
     if (config.ntp.enabled) {
         $("input[name=\"ntpenabled\"][value=\"1\"]").prop("checked", true);
@@ -137,7 +138,8 @@ function custom_saveconfig() {
 
 function saventp() {
     config.ntp.server = document.getElementById("ntpserver").value;
-    config.ntp.interval = parseInt(document.getElementById("intervals").value);
+    config.ntp.interval = parseInt(document.getElementById("interval").value);
+    config.ntp.timezone = parseInt(document.getElementById("timezone").value);
 
     config.ntp.enabled = false;
     if (parseInt($("input[name=\"ntpenabled\"]:checked").val()) === 1) {
@@ -674,8 +676,6 @@ function initEventTable() {
                     if (value < 1563300000) {
                         return "(" + value + ")";
                     } else {
-                        var comp = new Date();
-                        value = Math.floor(value + ((comp.getTimezoneOffset() * 60) * -1));
                         var vuepoch = new Date(value * 1000);
                         var formatted = vuepoch.getUTCFullYear() +
                             "-" + twoDigits(vuepoch.getUTCMonth() + 1) +
@@ -769,7 +769,7 @@ function socketMessageListener(evt) {
                 builddata(obj);
                 break;
             case "gettime":
-                utcSeconds = obj.epoch;
+                ntpSeconds = obj.epoch;
                 deviceTime();
                 break;
             case "ssidlist":
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index 6cb72cea6..da9a4ad54 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -54,7 +54,7 @@ var eventlog = {
     "list": [
         "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #1\",\"time\": 1563371160}",
         "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #2\",\"time\":0}",
-        "{\"type\":\"INFO\",\"src\":\"system\",\"desc\":\"System booted\",\"data\":\"\",\"time\":1568660479}",
+        "{\"type\":\"INFO\",\"src\":\"system\",\"desc\":\"System booted Local Time is 13:02:54 CET\",\"data\":\"\",\"time\":1572613374}",
         "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #3\",\"time\":0}"
     ]
 }
@@ -70,6 +70,7 @@ var configfile = {
         "hostname": "myesp",
         "password": "admin",
         "serial": true,
+        "version": "1.9.1",
         "log_events": true
     },
     "mqtt": {
@@ -86,7 +87,8 @@ var configfile = {
     },
     "ntp": {
         "server": "pool.ntp.org",
-        "interval": "30",
+        "interval": 60,
+        "timezone": 2,
         "enabled": false
     }
 };
@@ -128,7 +130,7 @@ function sendStatus() {
         "availsize": 2469,
         "ip": "10.10.10.198",
         "ssid": "my_ssid",
-        "mac": "DC:4F:11:22:93:06",
+        "mac": "DC:4F:12:22:13:06",
         "signalstr": 62,
         "systemload": 0,
         "mqttconnected": true,
@@ -243,8 +245,7 @@ wss.on('connection', function connection(ws) {
                 console.log("[INFO] Sending time");
                 var res = {};
                 res.command = "gettime";
-                res.epoch = Math.floor((new Date).getTime() / 1000);
-                //res.epoch = 1567107755;
+                res.epoch = 1572613374; // this is 13:02:54 CET
                 wss.broadcast(res);
                 break;
             case "settime":

From 332fc3a5f85ed9b3bf7c65ca4541de28ced74a5e Mon Sep 17 00:00:00 2001
From: Christian Weithe <Christian@Christians-MacBook-Pro.local>
Date: Fri, 1 Nov 2019 18:59:48 +0100
Subject: [PATCH 033/120] correct offset for water one time loading

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

diff --git a/src/ems_devices.h b/src/ems_devices.h
index 1078b1e33..115ac61a3 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -34,7 +34,7 @@
 
 #define EMS_OFFSET_UBAParameterWW_wwtemp 2                  // WW Temperature
 #define EMS_OFFSET_UBAParameterWW_wwactivated 1             // WW Activated
-#define EMS_OFFSET_UBAParameterWW_wwOneTime 5               // WW OneTime loading
+#define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00            // WW OneTime loading
 #define EMS_OFFSET_UBAParameterWW_wwComfort 9               // WW is in comfort or eco mode
 #define EMS_VALUE_UBAParameterWW_wwComfort_Hot 0x00         // the value for hot
 #define EMS_VALUE_UBAParameterWW_wwComfort_Eco 0xD8         // the value for eco

From cd7e918690b14b0325d5b5d04f90379f5d7e495d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 3 Nov 2019 11:05:49 +0100
Subject: [PATCH 034/120] timezone improvements

---
 src/MyESP.cpp               |  2 +-
 src/Ntp.cpp                 |  6 ++++++
 src/websrc/index.html       |  2 +-
 src/websrc/myesp.htm        | 22 ++++++++++------------
 src/websrc/myesp.js         |  2 --
 tools/wsemulator/wserver.js |  2 +-
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 1d5392360..81897c5a7 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -2467,7 +2467,7 @@ void MyESP::_onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, A
 // handle ws from browser
 void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
     // We should always get a JSON object from browser, so parse it
-    StaticJsonDocument<400> doc;
+    StaticJsonDocument<500> doc;
     char                    json[sz + 1];
     memcpy(json, (char *)(client->_tempObject), sz);
     json[sz] = '\0';
diff --git a/src/Ntp.cpp b/src/Ntp.cpp
index 5b294ee40..156184972 100644
--- a/src/Ntp.cpp
+++ b/src/Ntp.cpp
@@ -13,6 +13,12 @@ IPAddress        NtpClient::timeServer;
 AsyncUDP         NtpClient::udpListener;
 byte             NtpClient::NTPpacket[NTP_PACKET_SIZE];
 
+// references:
+// https://github.com/filipdanic/compact-timezone-list/blob/master/index.js
+// https://github.com/sanohin/google-timezones-json/blob/master/timezones.json
+// https://github.com/dmfilipenko/timezones.json/blob/master/timezones.json
+// https://home.kpn.nl/vanadovv/time/TZworld.html
+
 // Australia Eastern Time Zone (Sydney, Melbourne)
 TimeChangeRule aEDT = {"AEDT", First, Sun, Oct, 2, 660}; // UTC + 11 hours
 TimeChangeRule aEST = {"AEST", First, Sun, Apr, 3, 600}; // UTC + 10 hours
diff --git a/src/websrc/index.html b/src/websrc/index.html
index 074fec01c..0bd7ac770 100644
--- a/src/websrc/index.html
+++ b/src/websrc/index.html
@@ -212,7 +212,7 @@
                                 </div>
                             </div>
                             <div style="clear:both;">
-                                <br>
+                              <br>
                             </div>
                             <div>
                                 <div class="form-group">
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index 81ffcd160..963e79ce6 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -338,22 +338,21 @@
 <div id="ntpcontent">
     <br>
     <legend>Time Settings</legend>
-    <h6 class="text-muted">With Network Time Protocol (NTP) enabled, all times are adjusted to the local timezone
-        and
-        respect daylight saving
-        time (DST)</h6>
+    <h6 class="text-muted">With Network Time Protocol (NTP) enabled, all times are adjusted to the local timezone and
+        respect daylight saving time (DST)</h6>
     <br>
     <div class="row form-group">
         <label class="col-xs-3">Device Time</label>
-        <span id="utc" class="col-xs-9 col-md-5">
-        </span>
+        <span id="utc" class="col-xs-9 col-md-5"></span>
+        <div class="col-xs-3">
+            <button onclick="forcentp()" id="forcentp" class="btn btn-info btn-sm">Sync Device with Internet
+                Time</button>
+        </div>
     </div>
+
     <div class="row form-group">
         <label class="col-xs-3">Browser Time</label>
-        <span id="rtc" class="col-xs-9 col-md-5">
-        </span>
-    </div>
-    <div class="row form-group">
+        <span id="rtc" class="col-xs-9 col-md-5"></span>
         <div class="col-xs-3">
             <button onclick="syncBrowserTime()" class="btn btn-info btn-sm">Sync Browser Time to Device</button><i
                 style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true"
@@ -361,6 +360,7 @@
                 data-content="Use your browser time. Useful when the system does not have an internet connection."></i>
         </div>
     </div>
+
     <div class="row form-group">
         <label class="col-xs-3">NTP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
@@ -372,8 +372,6 @@
                 <label class="radio-inline">
                     <input type="radio" value="0" onclick="handleNTPOFF();" name="ntpenabled" checked>Disabled</label>
             </form>
-            <button onclick="forcentp()" id="forcentp" class="btn btn-info btn-sm">Sync Device with Internet
-                Time</button>
         </div>
     </div>
     <div class="row form-group">
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index 9379ee7b0..d46061e6d 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -715,8 +715,6 @@ function initMQTTLogTable() {
                     if (value < 1563300000) {
                         return "(" + value + ")";
                     } else {
-                        var comp = new Date();
-                        value = Math.floor(value + ((comp.getTimezoneOffset() * 60) * -1));
                         var vuepoch = new Date(value * 1000);
                         var formatted = vuepoch.getUTCFullYear() +
                             "-" + twoDigits(vuepoch.getUTCMonth() + 1) +
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index da9a4ad54..d4f9976cb 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -89,7 +89,7 @@ var configfile = {
         "server": "pool.ntp.org",
         "interval": 60,
         "timezone": 2,
-        "enabled": false
+        "enabled": true
     }
 };
 

From 59051a86bf771290b20cf8f5d8f1142491b0ccde Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 3 Nov 2019 11:06:50 +0100
Subject: [PATCH 035/120] fix webhooks notification

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a066d868..2a1633459 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,9 +78,9 @@ notifications:
     on_success: change
     on_failure: change
 
-webhooks:
-  urls:
-    - https://webhooks.gitter.im/e/57e15f7798656d888194
-  on_success: change # options: [always|never|change] default: always
-  on_failure: never # options: [always|never|change] default: always
-  on_start: false # default: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/57e15f7798656d888194
+    on_success: change # options: [always|never|change] default: always
+    on_failure: never # options: [always|never|change] default: always
+    on_start: false # default: false

From 77e4705e47fef1c86bebb7cbaf3c2e3f6cb6bd8d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 3 Nov 2019 11:08:51 +0100
Subject: [PATCH 036/120] prepare for CW400 HCn support -
 https://github.com/proddy/EMS-ESP/issues/206

---
 src/ems.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/ems.cpp b/src/ems.cpp
index 0ec2b1b7c..c11e39b17 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -2863,18 +2863,30 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
         EMS_TxTelegram.type_validate      = EMS_TxTelegram.type;
 
     } else if (model_id == EMS_MODEL_RC300) {
-        EMS_TxTelegram.type = EMS_TYPE_RCPLUSSet; // for 3000 and 1010, e.g. 0B 10 FF (0A | 08) 01 89 2B
-        // check mode
+        // check mode to determine offset
         if (EMS_Thermostat.hc[hc_num - 1].mode == 1) {        // auto
             EMS_TxTelegram.offset = 0x08;                     // auto offset
         } else if (EMS_Thermostat.hc[hc_num - 1].mode == 0) { // manuaL
             EMS_TxTelegram.offset = 0x0A;                     // manual offset
         }
+
+        if (hc_num == 1) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet; // for 3000 and 1010, e.g. 0B 10 FF (0A | 08) 01 89 2B
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC1;
+        } else if (hc_num == 2) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet + 1;
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC2;
+        } else if (hc_num == 3) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet + 2;
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC3;
+        } else if (hc_num == 4) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet + 3;
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC4;
+        }
+
         // EMS_TxTelegram.type_validate = EMS_TYPE_RCPLUSStatusMessage; // validate by reading from a different telegram
         EMS_TxTelegram.type_validate = EMS_ID_NONE; // validate by reading from a different telegram
 
-        EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC1 + hc_num - 1; // after write, do a full fetch of all values
-
     } else if ((model_id == EMS_MODEL_RC35) || (model_id == EMS_MODEL_ES73)) {
         switch (temptype) {
         case 1: // change the night temp

From 4f9452afd1f949d95e844053b6737326eb584977 Mon Sep 17 00:00:00 2001
From: Christian Weithe <Christian@Christians-MacBook-Pro.local>
Date: Sun, 3 Nov 2019 12:54:21 +0100
Subject: [PATCH 037/120] correct offset of one time loading

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

diff --git a/src/ems_devices.h b/src/ems_devices.h
index 115ac61a3..dd7bba68e 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -34,7 +34,7 @@
 
 #define EMS_OFFSET_UBAParameterWW_wwtemp 2                  // WW Temperature
 #define EMS_OFFSET_UBAParameterWW_wwactivated 1             // WW Activated
-#define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00            // WW OneTime loading
+#define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00             // WW OneTime loading
 #define EMS_OFFSET_UBAParameterWW_wwComfort 9               // WW is in comfort or eco mode
 #define EMS_VALUE_UBAParameterWW_wwComfort_Hot 0x00         // the value for hot
 #define EMS_VALUE_UBAParameterWW_wwComfort_Eco 0xD8         // the value for eco

From 1fdee78b41b3ae2209bbec07783d386813d2b492 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 13:00:36 +0100
Subject: [PATCH 038/120] added Buderus Logamax Plus GB122-24 -
 https://github.com/proddy/EMS-ESP/issues/235

---
 src/ems_devices.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ems_devices.h b/src/ems_devices.h
index 1078b1e33..4c1364224 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -200,6 +200,7 @@ const _Boiler_Device Boiler_Devices[] = {
     {203, "Buderus Logamax U122/Junkers Cerapur"},
     {208, "Buderus Logamax plus/GB192/Bosch Condens GC9000"},
     {64, "Sieger BK13,BK15/Nefit Smartline/Buderus GB1x2"},
+    {234, "Buderus Logamax Plus GB122"},
     {95, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Worcester Greenstar i/Generic HT3"},
     {122, "Nefit Proline"},
     {170, "Buderus Logano GB212"},

From e4aa262202b48650319e8cc5d1a621b4334eab2b Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 19:15:30 +0100
Subject: [PATCH 039/120] added MC110

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

diff --git a/src/ems_devices.h b/src/ems_devices.h
index 4c1364224..2a940c993 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -195,7 +195,7 @@ const _Boiler_Device Boiler_Devices[] = {
 
     {72, "MC10 Module"},
     {123, "Buderus GBx72/Nefit Trendline/Junkers Cerapur/Worcester Greenstar Si"},
-    {133, "Buderus GB125"},
+    {133, "Buderus GB125/Logamatic MC110"},
     {115, "Nefit Topline/Buderus GB162"},
     {203, "Buderus Logamax U122/Junkers Cerapur"},
     {208, "Buderus Logamax plus/GB192/Bosch Condens GC9000"},
@@ -280,7 +280,7 @@ const _Thermostat_Device Thermostat_Devices[] = {
     // Easy devices - not currently supporting write operations
     {EMS_MODEL_EASY, 202, 0x18, "Logamatic TC100/Nefit Moduline Easy", EMS_THERMOSTAT_WRITE_NO},
     {EMS_MODEL_EASY, 203, 0x18, "Bosch EasyControl CT200", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_CW100, 157, 0x18, "Bosch CW100/Junkers CW100", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_CW100, 157, 0x18, "Buderus RC200/Bosch CW100/Junkers CW100", EMS_THERMOSTAT_WRITE_NO},
 
     // Buderus/Nefit
     {EMS_MODEL_RC10, 79, 0x17, "RC10/Moduline 100", EMS_THERMOSTAT_WRITE_YES},

From 17dc48b376fdb7f1c0387776bb687d64689b4e36 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 19:15:45 +0100
Subject: [PATCH 040/120] added Turkey as timezone

---
 src/Ntp.cpp          | 11 ++++++++---
 src/Ntp.h            |  4 ++--
 src/websrc/myesp.htm |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Ntp.cpp b/src/Ntp.cpp
index 156184972..4d7e8cea7 100644
--- a/src/Ntp.cpp
+++ b/src/Ntp.cpp
@@ -18,6 +18,7 @@ byte             NtpClient::NTPpacket[NTP_PACKET_SIZE];
 // https://github.com/sanohin/google-timezones-json/blob/master/timezones.json
 // https://github.com/dmfilipenko/timezones.json/blob/master/timezones.json
 // https://home.kpn.nl/vanadovv/time/TZworld.html
+// https://www.timeanddate.com/time/zones/
 
 // Australia Eastern Time Zone (Sydney, Melbourne)
 TimeChangeRule aEDT = {"AEDT", First, Sun, Oct, 2, 660}; // UTC + 11 hours
@@ -26,7 +27,11 @@ Timezone       ausET(aEDT, aEST);
 
 // Moscow Standard Time (MSK, does not observe DST)
 TimeChangeRule msk = {"MSK", Last, Sun, Mar, 1, 180};
-Timezone       tzMSK(msk);
+Timezone       MSK(msk);
+
+// Turkey
+TimeChangeRule trt = {"TRT", Last, Sun, Mar, 1, 180};
+Timezone       TRT(trt);
 
 // Central European Time (Frankfurt, Paris)
 TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120}; // Central European Summer Time
@@ -66,14 +71,14 @@ TimeChangeRule usPST = {"PST", First, Sun, Nov, 2, -480};
 Timezone       usPT(usPDT, usPST);
 
 // build index of all timezones
-Timezone * timezones[] = {&ausET, &tzMSK, &CE, &UK, &UTC, &usET, &usCT, &usMT, &usAZ, &usPT};
+Timezone * timezones[] = {&ausET, &MSK, &CE, &UK, &UTC, &usET, &usCT, &usMT, &usAZ, &usPT, &TRT};
 
 void ICACHE_FLASH_ATTR NtpClient::Ntp(const char * server, time_t syncMins, uint8_t tz_index) {
     TimeServerName = strdup(server);
     syncInterval   = syncMins * 60; // convert to seconds
 
     // check for out of bounds
-    if (tz_index > NTP_TIMEZONE_MAX) {
+    if (tz_index >= NTP_TIMEZONE_MAX) {
         tz_index = NTP_TIMEZONE_DEFAULT;
     }
     tz = timezones[tz_index]; // set timezone
diff --git a/src/Ntp.h b/src/Ntp.h
index 03bb88946..92f5cf680 100644
--- a/src/Ntp.h
+++ b/src/Ntp.h
@@ -13,10 +13,10 @@
 #include "TimeLib.h" // customized version of the Time library
 #include "Timezone.h"
 
-#define NTP_PACKET_SIZE 48 // NTP time is in the first 48 bytes of message
+#define NTP_PACKET_SIZE 48 // NTP time is in the first 48 bytes of the message
 #define NTP_INTERVAL_DEFAULT 60 // every hour
 #define NTP_TIMEZONE_DEFAULT 2 // CE
-#define NTP_TIMEZONE_MAX 9
+#define NTP_TIMEZONE_MAX 11
 
 class NtpClient {
   public:
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index 963e79ce6..32d5a397d 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -408,6 +408,7 @@
                 <option value="7">US Mountain (Denver, Salt Lake City)</option>
                 <option value="8">Arizona (no DST)</option>
                 <option value="9">US Pacific (Las Vegas, Los Angeles)</option>
+                <option value="10">Turkey</option>
             </select>
         </span>
     </div>

From 9f146768b4a64fb8382847faa74e8c78a0a2e833 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 19:16:07 +0100
Subject: [PATCH 041/120] made all doubles to floats

---
 src/ds18.cpp      |  6 ++--
 src/ds18.h        |  2 +-
 src/ems-esp.cpp   | 86 +++++++++++++++++++++++------------------------
 src/ems.h         |  2 +-
 src/ems_utils.cpp |  2 +-
 5 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/ds18.cpp b/src/ds18.cpp
index 02d9d7139..fbaa1ed55 100644
--- a/src/ds18.cpp
+++ b/src/ds18.cpp
@@ -182,10 +182,10 @@ int16_t DS18::getRawValue(unsigned char index) {
     return raw;
 }
 
-// return real value as a double
+// return real value as a float
 // The raw temperature data is in units of sixteenths of a degree, so the value must be divided by 16 in order to convert it to degrees.
-double DS18::getValue(unsigned char index) {
-    double value = (float)getRawValue(index) / 16.0;
+float DS18::getValue(unsigned char index) {
+    float value = (float)getRawValue(index) / 16.0;
     return value;
 }
 
diff --git a/src/ds18.h b/src/ds18.h
index e6e97b300..3e2dd717e 100644
--- a/src/ds18.h
+++ b/src/ds18.h
@@ -39,7 +39,7 @@ class DS18 {
     uint8_t setup(uint8_t gpio, bool parasite);
     void    loop();
     char *  getDeviceString(char * s, unsigned char index);
-    double  getValue(unsigned char index);
+    float   getValue(unsigned char index);
     int16_t getRawValue(unsigned char index); // raw values, needs / 16
 
   protected:
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index c5773827f..3de31ab75 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -497,7 +497,7 @@ void publishSensorValues() {
     // see if the sensor values have changed, if so send it on
     for (uint8_t i = 0; i < EMSESP_Settings.dallas_sensors; i++) {
         // round to 2 decimal places. from https://arduinojson.org/v6/faq/how-to-configure-the-serialization-of-floats/
-        double sensorValue = (int)(ds18.getValue(i) * 100 + 0.5) / 100.0;
+        float sensorValue = (int)(ds18.getValue(i) * 100 + 0.5) / 100.0;
         if (sensorValue != DS18_DISCONNECTED && sensorValue != DS18_CRC_ERROR) {
             sprintf(label, PAYLOAD_EXTERNAL_SENSORS, (i + 1));
             sensors[label] = sensorValue;
@@ -572,21 +572,21 @@ void publishValues(bool force) {
         rootBoiler["wWCircPump"] = EMS_Boiler.wWCircPump;
 
     if (EMS_Boiler.extTemp != EMS_VALUE_SHORT_NOTSET)
-        rootBoiler["outdoorTemp"] = (double)EMS_Boiler.extTemp / 10;
+        rootBoiler["outdoorTemp"] = (float)EMS_Boiler.extTemp / 10;
     if (EMS_Boiler.wWCurTmp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["wWCurTmp"] = (double)EMS_Boiler.wWCurTmp / 10;
+        rootBoiler["wWCurTmp"] = (float)EMS_Boiler.wWCurTmp / 10;
     if (EMS_Boiler.wWCurFlow != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWCurFlow"] = (double)EMS_Boiler.wWCurFlow / 10;
+        rootBoiler["wWCurFlow"] = (float)EMS_Boiler.wWCurFlow / 10;
     if (EMS_Boiler.curFlowTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["curFlowTemp"] = (double)EMS_Boiler.curFlowTemp / 10;
+        rootBoiler["curFlowTemp"] = (float)EMS_Boiler.curFlowTemp / 10;
     if (EMS_Boiler.retTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["retTemp"] = (double)EMS_Boiler.retTemp / 10;
+        rootBoiler["retTemp"] = (float)EMS_Boiler.retTemp / 10;
     if (EMS_Boiler.switchTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["switchTemp"] = (double)EMS_Boiler.switchTemp / 10;
+        rootBoiler["switchTemp"] = (float)EMS_Boiler.switchTemp / 10;
     if (EMS_Boiler.sysPress != EMS_VALUE_INT_NOTSET)
-        rootBoiler["sysPress"] = (double)EMS_Boiler.sysPress / 10;
+        rootBoiler["sysPress"] = (float)EMS_Boiler.sysPress / 10;
     if (EMS_Boiler.boilTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["boilTemp"] = (double)EMS_Boiler.boilTemp / 10;
+        rootBoiler["boilTemp"] = (float)EMS_Boiler.boilTemp / 10;
 
     if (EMS_Boiler.wWActivated != EMS_VALUE_INT_NOTSET)
         rootBoiler["wWActivated"] = _bool_to_char(s, EMS_Boiler.wWActivated);
@@ -598,7 +598,7 @@ void publishValues(bool force) {
         rootBoiler["burnGas"] = _bool_to_char(s, EMS_Boiler.burnGas);
 
     if (EMS_Boiler.flameCurr != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["flameCurr"] = (double)(int16_t)EMS_Boiler.flameCurr / 10;
+        rootBoiler["flameCurr"] = (float)(int16_t)EMS_Boiler.flameCurr / 10;
 
     if (EMS_Boiler.heatPmp != EMS_VALUE_INT_NOTSET)
         rootBoiler["heatPmp"] = _bool_to_char(s, EMS_Boiler.heatPmp);
@@ -624,19 +624,19 @@ void publishValues(bool force) {
 
     // **** also add burnStarts, burnWorkMin, heatWorkMin
     if (abs(EMS_Boiler.wWStarts) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["wWStarts"] = (double)EMS_Boiler.wWStarts;
+        rootBoiler["wWStarts"] = (float)EMS_Boiler.wWStarts;
     if (abs(EMS_Boiler.wWWorkM) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["wWWorkM"] = (double)EMS_Boiler.wWWorkM;
+        rootBoiler["wWWorkM"] = (float)EMS_Boiler.wWWorkM;
     if (abs(EMS_Boiler.UBAuptime) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["UBAuptime"] = (double)EMS_Boiler.UBAuptime;
+        rootBoiler["UBAuptime"] = (float)EMS_Boiler.UBAuptime;
 
     // **** also add burnStarts, burnWorkMin, heatWorkMin
     if (abs(EMS_Boiler.burnStarts) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["burnStarts"] = (double)EMS_Boiler.burnStarts;
+        rootBoiler["burnStarts"] = (float)EMS_Boiler.burnStarts;
     if (abs(EMS_Boiler.burnWorkMin) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["burnWorkMin"] = (double)EMS_Boiler.burnWorkMin;
+        rootBoiler["burnWorkMin"] = (float)EMS_Boiler.burnWorkMin;
     if (abs(EMS_Boiler.heatWorkMin) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["heatWorkMin"] = (double)EMS_Boiler.heatWorkMin;
+        rootBoiler["heatWorkMin"] = (float)EMS_Boiler.heatWorkMin;
 
     if (EMS_Boiler.serviceCode != EMS_VALUE_USHORT_NOTSET) {
         rootBoiler["ServiceCode"]       = EMS_Boiler.serviceCodeChar;
@@ -691,27 +691,27 @@ void publishValues(bool force) {
                 // different logic depending on thermostat types
                 if (ems_getThermostatModel() == EMS_MODEL_EASY) {
                     if (thermostat->setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                        dataThermostat[THERMOSTAT_SELTEMP] = (double)thermostat->setpoint_roomTemp / 100;
+                        dataThermostat[THERMOSTAT_SELTEMP] = (float)thermostat->setpoint_roomTemp / 100;
                     if (thermostat->curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                        dataThermostat[THERMOSTAT_CURRTEMP] = (double)thermostat->curr_roomTemp / 100;
+                        dataThermostat[THERMOSTAT_CURRTEMP] = (float)thermostat->curr_roomTemp / 100;
                 } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FR50)
                            || (ems_getThermostatModel() == EMS_MODEL_FW100) || (ems_getThermostatModel() == EMS_MODEL_FW120)) {
                     if (thermostat->setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                        dataThermostat[THERMOSTAT_SELTEMP] = (double)thermostat->setpoint_roomTemp / 10;
+                        dataThermostat[THERMOSTAT_SELTEMP] = (float)thermostat->setpoint_roomTemp / 10;
                     if (thermostat->curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                        dataThermostat[THERMOSTAT_CURRTEMP] = (double)thermostat->curr_roomTemp / 10;
+                        dataThermostat[THERMOSTAT_CURRTEMP] = (float)thermostat->curr_roomTemp / 10;
                 } else {
                     if (thermostat->setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                        dataThermostat[THERMOSTAT_SELTEMP] = (double)thermostat->setpoint_roomTemp / 2;
+                        dataThermostat[THERMOSTAT_SELTEMP] = (float)thermostat->setpoint_roomTemp / 2;
                     if (thermostat->curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                        dataThermostat[THERMOSTAT_CURRTEMP] = (double)thermostat->curr_roomTemp / 10;
+                        dataThermostat[THERMOSTAT_CURRTEMP] = (float)thermostat->curr_roomTemp / 10;
 
                     if (thermostat->daytemp != EMS_VALUE_INT_NOTSET)
-                        dataThermostat[THERMOSTAT_DAYTEMP] = (double)thermostat->daytemp / 2;
+                        dataThermostat[THERMOSTAT_DAYTEMP] = (float)thermostat->daytemp / 2;
                     if (thermostat->nighttemp != EMS_VALUE_INT_NOTSET)
-                        dataThermostat[THERMOSTAT_NIGHTTEMP] = (double)thermostat->nighttemp / 2;
+                        dataThermostat[THERMOSTAT_NIGHTTEMP] = (float)thermostat->nighttemp / 2;
                     if (thermostat->holidaytemp != EMS_VALUE_INT_NOTSET)
-                        dataThermostat[THERMOSTAT_HOLIDAYTEMP] = (double)thermostat->holidaytemp / 2;
+                        dataThermostat[THERMOSTAT_HOLIDAYTEMP] = (float)thermostat->holidaytemp / 2;
 
                     if (thermostat->heatingtype != EMS_VALUE_INT_NOTSET)
                         dataThermostat[THERMOSTAT_HEATINGTYPE] = thermostat->heatingtype;
@@ -776,7 +776,7 @@ void publishValues(bool force) {
                 JsonObject dataMixing = rootMixing.createNestedObject(hc);
 
                 if (mixing->flowTemp != EMS_VALUE_SHORT_NOTSET)
-                    dataMixing["flowTemp"] = (double)mixing->flowTemp / 10;
+                    dataMixing["flowTemp"] = (float)mixing->flowTemp / 10;
                 if (mixing->pumpMod != EMS_VALUE_INT_NOTSET)
                     dataMixing["pumpMod"] = mixing->pumpMod;
                 if (mixing->valveStatus != EMS_VALUE_INT_NOTSET)
@@ -811,10 +811,10 @@ void publishValues(bool force) {
         JsonObject rootSM = doc.to<JsonObject>();
 
         if (EMS_SolarModule.collectorTemp != EMS_VALUE_SHORT_NOTSET)
-            rootSM[SM_COLLECTORTEMP] = (double)EMS_SolarModule.collectorTemp / 10;
+            rootSM[SM_COLLECTORTEMP] = (float)EMS_SolarModule.collectorTemp / 10;
 
         if (EMS_SolarModule.bottomTemp != EMS_VALUE_SHORT_NOTSET)
-            rootSM[SM_BOTTOMTEMP] = (double)EMS_SolarModule.bottomTemp / 10;
+            rootSM[SM_BOTTOMTEMP] = (float)EMS_SolarModule.bottomTemp / 10;
 
         if (EMS_SolarModule.pumpModulation != EMS_VALUE_INT_NOTSET)
             rootSM[SM_PUMPMODULATION] = EMS_SolarModule.pumpModulation;
@@ -824,17 +824,17 @@ void publishValues(bool force) {
         }
 
         if (EMS_SolarModule.pumpWorkMin != EMS_VALUE_LONG_NOTSET) {
-            rootSM[SM_PUMPWORKMIN] = (double)EMS_SolarModule.pumpWorkMin;
+            rootSM[SM_PUMPWORKMIN] = (float)EMS_SolarModule.pumpWorkMin;
         }
 
         if (EMS_SolarModule.EnergyLastHour != EMS_VALUE_USHORT_NOTSET)
-            rootSM[SM_ENERGYLASTHOUR] = (double)EMS_SolarModule.EnergyLastHour / 10;
+            rootSM[SM_ENERGYLASTHOUR] = (float)EMS_SolarModule.EnergyLastHour / 10;
 
         if (EMS_SolarModule.EnergyToday != EMS_VALUE_USHORT_NOTSET)
             rootSM[SM_ENERGYTODAY] = EMS_SolarModule.EnergyToday;
 
         if (EMS_SolarModule.EnergyTotal != EMS_VALUE_USHORT_NOTSET)
-            rootSM[SM_ENERGYTOTAL] = (double)EMS_SolarModule.EnergyTotal / 10;
+            rootSM[SM_ENERGYTOTAL] = (float)EMS_SolarModule.EnergyTotal / 10;
 
         data[0] = '\0'; // reset data for next package
         serializeJson(doc, data, sizeof(data));
@@ -1792,20 +1792,20 @@ void WebCallback(JsonObject root) {
         // Render Current & Setpoint Room Temperature
         if (ems_getThermostatModel() == EMS_MODEL_EASY) {
             if (EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                thermostat["ts"] = (double)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 100;
+                thermostat["ts"] = (float)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 100;
             if (EMS_Thermostat.hc[hc_num - 1].curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                thermostat["tc"] = (double)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 100;
+                thermostat["tc"] = (float)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 100;
         } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FR50) || (ems_getThermostatModel() == EMS_MODEL_FW100)
                    || (ems_getThermostatModel() == EMS_MODEL_FW120)) {
             if (EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                thermostat["ts"] = (double)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 10;
+                thermostat["ts"] = (float)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 10;
             if (EMS_Thermostat.hc[hc_num - 1].curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                thermostat["tc"] = (double)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 10;
+                thermostat["tc"] = (float)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 10;
         } else {
             if (EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                thermostat["ts"] = (double)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 2;
+                thermostat["ts"] = (float)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 2;
             if (EMS_Thermostat.hc[hc_num - 1].curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
-                thermostat["tc"] = (double)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 10;
+                thermostat["tc"] = (float)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 10;
         }
 
         // Render Termostat Mode, if we have a mode
@@ -1842,10 +1842,10 @@ void WebCallback(JsonObject root) {
             boiler["b4"] = EMS_Boiler.curFlowTemp / 10;
 
         if (EMS_Boiler.boilTemp != EMS_VALUE_USHORT_NOTSET)
-            boiler["b5"] = (double)EMS_Boiler.boilTemp / 10;
+            boiler["b5"] = (float)EMS_Boiler.boilTemp / 10;
 
         if (EMS_Boiler.retTemp != EMS_VALUE_USHORT_NOTSET)
-            boiler["b6"] = (double)EMS_Boiler.retTemp / 10;
+            boiler["b6"] = (float)EMS_Boiler.retTemp / 10;
 
     } else {
         boiler["ok"] = false;
@@ -1860,10 +1860,10 @@ void WebCallback(JsonObject root) {
         sm["sm"] = ems_getSolarModuleDescription(buffer, true);
 
         if (EMS_SolarModule.collectorTemp != EMS_VALUE_SHORT_NOTSET)
-            sm["sm1"] = (double)EMS_SolarModule.collectorTemp / 10; // Collector temperature oC
+            sm["sm1"] = (float)EMS_SolarModule.collectorTemp / 10; // Collector temperature oC
 
         if (EMS_SolarModule.bottomTemp != EMS_VALUE_SHORT_NOTSET)
-            sm["sm2"] = (double)EMS_SolarModule.bottomTemp / 10; // Bottom temperature oC
+            sm["sm2"] = (float)EMS_SolarModule.bottomTemp / 10; // Bottom temperature oC
 
         if (EMS_SolarModule.pumpModulation != EMS_VALUE_INT_NOTSET)
             sm["sm3"] = EMS_SolarModule.pumpModulation; // Pump modulation %
@@ -1874,13 +1874,13 @@ void WebCallback(JsonObject root) {
         }
 
         if (EMS_SolarModule.EnergyLastHour != EMS_VALUE_USHORT_NOTSET)
-            sm["sm5"] = (double)EMS_SolarModule.EnergyLastHour / 10; // Energy last hour Wh
+            sm["sm5"] = (float)EMS_SolarModule.EnergyLastHour / 10; // Energy last hour Wh
 
         if (EMS_SolarModule.EnergyToday != EMS_VALUE_USHORT_NOTSET) // Energy today Wh
             sm["sm6"] = EMS_SolarModule.EnergyToday;
 
         if (EMS_SolarModule.EnergyTotal != EMS_VALUE_USHORT_NOTSET) // Energy total KWh
-            sm["sm7"] = (double)EMS_SolarModule.EnergyTotal / 10;
+            sm["sm7"] = (float)EMS_SolarModule.EnergyTotal / 10;
     } else {
         sm["ok"] = false;
     }
diff --git a/src/ems.h b/src/ems.h
index 25dcac11b..a1946768a 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -159,7 +159,7 @@ typedef struct {
     uint8_t       length;       // full length of the complete telegram
     uint8_t       src;          // source ID
     uint8_t       dest;         // destination ID
-    uint16_t      type;         // type ID as a double byte to support EMS+
+    uint16_t      type;         // type ID as a 2-byte to support EMS+
     uint8_t       offset;       // offset
     uint8_t *     data;         // pointer to where telegram data starts
     bool          emsplus;      // true if ems+/ems 2.0
diff --git a/src/ems_utils.cpp b/src/ems_utils.cpp
index bc68a8436..b622aa253 100644
--- a/src/ems_utils.cpp
+++ b/src/ems_utils.cpp
@@ -270,7 +270,7 @@ uint8_t _readIntNumber() {
     return atoi(numTextPtr);
 }
 
-// used to read the next string from an input buffer and convert to a double
+// used to read the next string from an input buffer and convert to a float
 float _readFloatNumber() {
     char * numTextPtr = strtok(nullptr, ", \n");
     if (numTextPtr == nullptr) {

From 6b1e0d496c623af83e7cc65ad00657791acf7ea7 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 19:16:15 +0100
Subject: [PATCH 042/120] build optimizations

---
 platformio.ini                          | 14 ++++++----
 scripts/buildweb.py                     |  3 --
 scripts/checkcode.py                    | 26 -----------------
 scripts/main_script.py                  | 37 +++++++++++++++++++++++++
 scripts/{rename_fw.py => pre_script.py} | 32 +++++++++++++--------
 5 files changed, 66 insertions(+), 46 deletions(-)
 delete mode 100644 scripts/buildweb.py
 delete mode 100644 scripts/checkcode.py
 create mode 100644 scripts/main_script.py
 rename scripts/{rename_fw.py => pre_script.py} (55%)

diff --git a/platformio.ini b/platformio.ini
index fa7611ba8..35c255e10 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,8 +13,7 @@ default_envs = debug
 ; -DFORCE_SERIAL
 custom_flags =
 
-;general_flags = -DNO_GLOBAL_EEPROM -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -DBEARSSL_SSL_BASIC
-general_flags = -DNO_GLOBAL_EEPROM
+general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC -DVTABLES_IN_FLASH -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
 
 [env]
 framework = arduino
@@ -45,27 +44,32 @@ monitor_speed = 115200
 [env:travis]
 board = esp12e
 build_flags = ${common.general_flags}
+extra_scripts = scripts/main_script.py
 
 [env:esp12e]
 board = esp12e
 build_flags = ${common.general_flags}
+extra_scripts = scripts/main_script.py
 
 [env:d1_mini]
 board = d1_mini
 build_flags = ${common.general_flags}
+extra_scripts = scripts/main_script.py
 
 [env:nodemcuv2]
 board = nodemcuv2
 build_flags = ${common.general_flags}
+extra_scripts = scripts/main_script.py
 
 [env:nodemcu]
 board = nodemcu
 build_flags = ${common.general_flags}
+extra_scripts = scripts/main_script.py
 
 [env:debug]
 board = d1_mini
 build_type = debug
 build_flags = ${common.general_flags} ${common.custom_flags}
-extra_scripts =
-  pre:scripts/rename_fw.py
-  pre:scripts/buildweb.py
+extra_scripts = 
+  pre:scripts/pre_script.py
+  scripts/main_script.py
diff --git a/scripts/buildweb.py b/scripts/buildweb.py
deleted file mode 100644
index 96c41fa10..000000000
--- a/scripts/buildweb.py
+++ /dev/null
@@ -1,3 +0,0 @@
-Import("env")
-
-env.Execute("node ./tools/webfilesbuilder/node_modules/gulp/bin/gulp.js --silent --cwd ./tools/webfilesbuilder")
diff --git a/scripts/checkcode.py b/scripts/checkcode.py
deleted file mode 100644
index 53da63054..000000000
--- a/scripts/checkcode.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-from subprocess import call
-import os
-Import("env")
-
-def code_check(source, target, env):
-    print("\n** Starting cppcheck...")
-    call(["cppcheck", os.getcwd()+"/.", "--force", "--enable=all"])
-    print("\n** Finished cppcheck...\n")
-    print("\n** Starting cpplint...")
-    call(["cpplint", "--extensions=ino,cpp,h", "--filter=-legal/copyright,-build/include,-whitespace",
-          "--linelength=120", "--recursive", "src", "lib/myESP"])
-    print("\n** Finished cpplint...")
-
-#my_flags = env.ParseFlags(env['BUILD_FLAGS'])
-#defines = {k: v for (k, v) in my_flags.get("CPPDEFINES")}
-# print defines
-# print env.Dump()
-
-#  built in targets: (buildprog, size, upload, program, buildfs, uploadfs, uploadfsota)
-env.AddPreAction("buildprog", code_check)
-# env.AddPostAction(.....)
-
-# see http://docs.platformio.org/en/latest/projectconf/advanced_scripting.html#before-pre-and-after-post-actions
-# env.Replace(PROGNAME="firmware_%s" % defines.get("VERSION"))
-# env.Replace(PROGNAME="firmware_%s" % env['BOARD'])
diff --git a/scripts/main_script.py b/scripts/main_script.py
new file mode 100644
index 000000000..61b873da9
--- /dev/null
+++ b/scripts/main_script.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+Import("env")
+
+class Color(object):
+    BLACK = '\x1b[1;30m'
+    RED = '\x1b[1;31m'
+    GREEN = '\x1b[1;32m'
+    YELLOW = '\x1b[1;33m'
+    BLUE = '\x1b[1;34m'
+    MAGENTA = '\x1b[1;35m'
+    CYAN = '\x1b[1;36m'
+    WHITE = '\x1b[1;37m'
+    LIGHT_GREY = '\x1b[0;30m'
+    LIGHT_RED = '\x1b[0;31m'
+    LIGHT_GREEN = '\x1b[0;32m'
+    LIGHT_YELLOW = '\x1b[0;33m'
+    LIGHT_BLUE = '\x1b[0;34m'
+    LIGHT_MAGENTA = '\x1b[0;35m'
+    LIGHT_CYAN = '\x1b[0;36m'
+    LIGHT_WHITE = '\x1b[0;37m'
+
+
+def clr(color, text):
+    return color + str(text) + '\x1b[0m'
+
+def remove_float_support():
+    flags = " ".join(env['LINKFLAGS'])
+    print(clr(Color.BLUE, "** LINKFLAGS = %ss" % flags))
+    flags = flags.replace("-u _printf_float", "")
+    flags = flags.replace("-u _scanf_float", "")
+    newflags = flags.split()
+
+    env.Replace(
+        LINKFLAGS=newflags
+    )
+
+remove_float_support()
diff --git a/scripts/rename_fw.py b/scripts/pre_script.py
similarity index 55%
rename from scripts/rename_fw.py
rename to scripts/pre_script.py
index 594b6d4d4..ca9db79ba 100644
--- a/scripts/rename_fw.py
+++ b/scripts/pre_script.py
@@ -4,10 +4,25 @@ import os
 import re
 Import("env")
 
-def build_web(source, target, env):
-    print("\n** Build web...")
-    call(["gulp", "-f", os.getcwd()+"/tools/webfilesbuilder/gulpfile.js"])
+def build_web():
+    print("** Building web...")
+    env.Execute(
+        "node ./tools/webfilesbuilder/node_modules/gulp/bin/gulp.js --cwd ./tools/webfilesbuilder")
 
+def code_check(source, target, env):
+    print("** Starting cppcheck...")
+    call(["cppcheck", os.getcwd()+"/.", "--force", "--enable=all"])
+    print("\n** Finished cppcheck...\n")
+    print("\n** Starting cpplint...")
+    call(["cpplint", "--extensions=ino,cpp,h", "--filter=-legal/copyright,-build/include,-whitespace",
+          "--linelength=120", "--recursive", "src", "lib/myESP"])
+    print("\n** Finished cpplint...")
+
+
+# build web files
+build_web()
+
+# extract application details
 bag = {}
 exprs = [
     (re.compile(r'^#define APP_VERSION\s+"(\S+)"'), 'app_version'),
@@ -31,16 +46,9 @@ with open('./src/ems-esp.cpp', 'r') as f:
 app_version = bag.get('app_version')
 app_name = bag.get('app_name')
 app_hostname = bag.get('app_hostname')
-
 board = env['BOARD']
 branch = env['PIOENV']
 
-# build the web files
-env.AddPreAction("buildprog", build_web)
-
 # build filename, replacing . with _ for the version
-#env.Replace(PROGNAME="firmware_%s" % branch + "_" + app_version.replace(".", "_"))
-#env.Replace(PROGNAME=app_name + "-" + app_version.replace(".", "_") + "-" + board + "-" + branch)
-env.Replace(PROGNAME=app_name + "-" + app_version.replace(".", "_") + "-" + board)
-
-
+env.Replace(PROGNAME=app_name + "-" +
+            app_version.replace(".", "_") + "-" + board)

From fd847b588fd5a09da109f5a9f919192483107554 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 19:16:48 +0100
Subject: [PATCH 043/120] bump b6

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

diff --git a/src/version.h b/src/version.h
index a5099fc1b..bac5c250c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b5"
+#define APP_VERSION "1.9.4b6"

From 280bbf3c5648920a06716132c09c0f4c61373501 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 22:52:42 +0100
Subject: [PATCH 044/120] formatting

---
 src/Ntp.cpp       | 6 +++---
 src/Ntp.h         | 4 ++--
 src/ems_devices.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Ntp.cpp b/src/Ntp.cpp
index 4d7e8cea7..bb3154670 100644
--- a/src/Ntp.cpp
+++ b/src/Ntp.cpp
@@ -110,12 +110,12 @@ time_t ICACHE_FLASH_ATTR NtpClient::getNtpTime() {
             time_t        UnixUTCtime  = (highWord << 16 | lowWord) - 2208988800UL;
             time_t        adjustedtime = (*tz).toLocal(UnixUTCtime, &tcr);
 
-            myESP.myDebug("[NTP] UTC internet time is %d/%d %02d:%02d:%02d. System time set to local timezone which is %02d:%02d:%02d %s\n",
-                          to_day(UnixUTCtime),
-                          to_month(UnixUTCtime),
+            myESP.myDebug("[NTP] Internet time: %02d:%02d:%02d UTC on %d/%d. Local time: %02d:%02d:%02d %s",
                           to_hour(UnixUTCtime),
                           to_minute(UnixUTCtime),
                           to_second(UnixUTCtime),
+                          to_day(UnixUTCtime),
+                          to_month(UnixUTCtime),
                           to_hour(adjustedtime),
                           to_minute(adjustedtime),
                           to_second(adjustedtime),
diff --git a/src/Ntp.h b/src/Ntp.h
index 92f5cf680..078e04bc6 100644
--- a/src/Ntp.h
+++ b/src/Ntp.h
@@ -13,9 +13,9 @@
 #include "TimeLib.h" // customized version of the Time library
 #include "Timezone.h"
 
-#define NTP_PACKET_SIZE 48 // NTP time is in the first 48 bytes of the message
+#define NTP_PACKET_SIZE 48      // NTP time is in the first 48 bytes of the message
 #define NTP_INTERVAL_DEFAULT 60 // every hour
-#define NTP_TIMEZONE_DEFAULT 2 // CE
+#define NTP_TIMEZONE_DEFAULT 2  // CE
 #define NTP_TIMEZONE_MAX 11
 
 class NtpClient {
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 969a50eff..840256de2 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -34,7 +34,7 @@
 
 #define EMS_OFFSET_UBAParameterWW_wwtemp 2                  // WW Temperature
 #define EMS_OFFSET_UBAParameterWW_wwactivated 1             // WW Activated
-#define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00             // WW OneTime loading
+#define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00            // WW OneTime loading
 #define EMS_OFFSET_UBAParameterWW_wwComfort 9               // WW is in comfort or eco mode
 #define EMS_VALUE_UBAParameterWW_wwComfort_Hot 0x00         // the value for hot
 #define EMS_VALUE_UBAParameterWW_wwComfort_Eco 0xD8         // the value for eco

From b60ee1a182fda22b516b8272c995d69fc74ae3ba Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 22:58:44 +0100
Subject: [PATCH 045/120] minor changes to MQTT

---
 src/MyESP.cpp | 201 ++++++++++++++++++++++++++++++++------------------
 src/MyESP.h   |  38 +++++-----
 2 files changed, 151 insertions(+), 88 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 81897c5a7..b41512b29 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -205,6 +205,8 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
         WiFi.setSleepMode(WIFI_NONE_SLEEP); // added to possibly fix wifi dropouts in arduino core 2.5.0
 #endif
 
+        _wifi_connected = true;
+
         jw.enableAPFallback(false); // Disable AP mode after initial connect was successful - test for https://github.com/proddy/EMS-ESP/issues/187
 
         myDebug_P(PSTR("[WIFI] Connected to SSID %s (hostname: %s, IP: %s)"), WiFi.SSID().c_str(), _getESPhostname().c_str(), WiFi.localIP().toString().c_str());
@@ -238,9 +240,6 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
         }
         */
 
-        // MQTT Setup
-        _mqtt_setup();
-
         // if we don't want Serial anymore, turn it off
         if (!_general_serial) {
             myDebug_P(PSTR("[SYSTEM] Disabling serial port communication"));
@@ -260,8 +259,6 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
         if (_wifi_callback_f) {
             _wifi_callback_f();
         }
-
-        _wifi_connected = true;
     }
 
     if (code == MESSAGE_ACCESSPOINT_CREATED) {
@@ -354,7 +351,9 @@ void MyESP::_mqttOnMessage(char * topic, char * payload, size_t len) {
     char message[len + 1];
     strlcpy(message, (char *)payload, len + 1);
 
-    // myDebug_P(PSTR("[MQTT] Received %s => %s"), topic, message); // enable for debugging
+#ifdef MYESP_DEBUG
+    myDebug_P(PSTR("[MQTT] Received %s => %s"), topic, message);
+#endif
 
     // topics are in format MQTT_BASE/HOSTNAME/TOPIC
     char * topic_magnitude = strrchr(topic, '/'); // strip out everything until last /
@@ -385,7 +384,7 @@ bool MyESP::mqttSubscribe(const char * topic) {
 
         if (packet_id) {
             // add to mqtt log
-            _addMQTTLog(topic_s, "", 2); // type of 2 means Subscribe. Has an empty payload for now
+            _addMQTTLog(topic_s, "", MYESP_MQTTLOGTYPE_SUBSCRIBE); // Has an empty payload for now
             return true;
         } else {
             myDebug_P(PSTR("[MQTT] Error subscribing to %s, error %d"), _mqttTopic(topic), packet_id);
@@ -413,11 +412,13 @@ bool MyESP::mqttPublish(const char * topic, const char * payload) {
 // returns true if all good
 bool MyESP::mqttPublish(const char * topic, const char * payload, bool retain) {
     if (mqttClient.connected() && (strlen(topic) > 0)) {
-        //myDebug_P(PSTR("[MQTT] Sending publish to %s with payload %s"), _mqttTopic(topic), payload); // for debugging
+#ifdef MYESP_DEBUG
+        myDebug_P(PSTR("[MQTT] Sending publish to %s with payload %s"), _mqttTopic(topic), payload);
+#endif
         uint16_t packet_id = mqttClient.publish(_mqttTopic(topic), _mqtt_qos, retain, payload);
 
         if (packet_id) {
-            _addMQTTLog(topic, payload, 1); // add to the log, using type of 1 for Publish
+            _addMQTTLog(topic, payload, MYESP_MQTTLOGTYPE_PUBLISH); // add to the log
             return true;
         } else {
             myDebug_P(PSTR("[MQTT] Error publishing to %s with payload %s [error %d]"), _mqttTopic(topic), payload, packet_id);
@@ -429,9 +430,9 @@ bool MyESP::mqttPublish(const char * topic, const char * payload, bool retain) {
 
 // MQTT onConnect - when a connect is established
 void MyESP::_mqttOnConnect() {
-    myDebug_P(PSTR("[MQTT] MQTT connected established"));
-    _mqtt_reconnect_delay = MQTT_RECONNECT_DELAY_MIN;
+    myDebug_P(PSTR("[MQTT] MQTT connected"));
 
+    _mqtt_reconnect_delay = MQTT_RECONNECT_DELAY_MIN;
     _mqtt_last_connection = millis();
 
     // say we're alive to the Last Will topic
@@ -454,17 +455,11 @@ void MyESP::_mqttOnConnect() {
 
 // MQTT setup
 void MyESP::_mqtt_setup() {
-    if (!_mqtt_enabled) {
-        myDebug_P(PSTR("[MQTT] is disabled"));
-    }
-
     mqttClient.onConnect([this](bool sessionPresent) { _mqttOnConnect(); });
 
     mqttClient.onDisconnect([this](AsyncMqttClientDisconnectReason reason) {
         if (reason == AsyncMqttClientDisconnectReason::TCP_DISCONNECTED) {
             myDebug_P(PSTR("[MQTT] TCP Disconnected"));
-            _increaseSystemDropoutCounter();                             // +1 to number of disconnects
-            (_mqtt_callback_f)(MQTT_DISCONNECT_EVENT, nullptr, nullptr); // call callback with disconnect
         }
         if (reason == AsyncMqttClientDisconnectReason::MQTT_IDENTIFIER_REJECTED) {
             myDebug_P(PSTR("[MQTT] Identifier Rejected"));
@@ -482,6 +477,10 @@ void MyESP::_mqtt_setup() {
         // Reset reconnection delay
         _mqtt_last_connection = millis();
         _mqtt_connecting      = false;
+
+        _increaseSystemDropoutCounter(); // +1 to number of disconnects
+        myDebug_P(PSTR("[MQTT] Disconnected! (count %d)"), _getSystemDropoutCounter());
+        (_mqtt_callback_f)(MQTT_DISCONNECT_EVENT, nullptr, nullptr); // call callback with disconnect
     });
 
     //mqttClient.onSubscribe([this](uint16_t packetId, uint8_t qos) { myDebug_P(PSTR("[MQTT] Subscribe ACK for PID %d"), packetId); });
@@ -490,6 +489,26 @@ void MyESP::_mqtt_setup() {
     mqttClient.onMessage([this](char * topic, char * payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
         _mqttOnMessage(topic, payload, len);
     });
+
+    mqttClient.setServer(_mqtt_ip, _mqtt_port);
+    mqttClient.setClientId(_general_hostname);
+    mqttClient.setKeepAlive(_mqtt_keepalive);
+    mqttClient.setCleanSession(false);
+
+    // last will
+    if (_hasValue(_mqtt_will_topic)) {
+        //myDebug_P(PSTR("[MQTT] Setting last will topic %s"), _mqttTopic(_mqtt_will_topic));
+        mqttClient.setWill(_mqttTopic(_mqtt_will_topic), 1, true,
+                           _mqtt_will_offline_payload); // retain always true
+    }
+
+    // set credentials if we have them
+    if (_hasValue(_mqtt_user)) {
+        mqttClient.setCredentials(_mqtt_user, _mqtt_password);
+    }
+
+    _mqtt_connecting      = false;
+    _mqtt_last_connection = millis();
 }
 
 // WiFI setup
@@ -1407,8 +1426,9 @@ void MyESP::_heartbeatCheck(bool force = false) {
     if ((millis() - last_heartbeat > MYESP_HEARTBEAT_INTERVAL) || force) {
         last_heartbeat = millis();
 
-        // _printHeap("Heartbeat"); // for heartbeat debugging
-
+#ifdef MYESP_DEBUG
+        _printHeap("Heartbeat");
+#endif
         if (!isMQTTConnected() || !(_mqtt_heartbeat)) {
             return;
         }
@@ -1431,17 +1451,36 @@ void MyESP::_heartbeatCheck(bool force = false) {
         char data[300] = {0};
         serializeJson(doc, data, sizeof(data));
 
-        // myDebugLog("Publishing hearbeat via MQTT");
-
         (void)mqttPublish(MQTT_TOPIC_HEARTBEAT, data, false); // send to MQTT with retain off
     }
 }
 
+/*
+ * Print out heartbeat
+ */
+void MyESP::heartbeatPrint() {
+    static int i = 0;
+
+    uint32_t total_memory = _getInitialFreeHeap();
+    uint32_t free_memory  = ESP.getFreeHeap();
+
+    myDebug("[%d] uptime:%d bytesfree:%d (%2u%%), load:%d, dropouts:%d",
+            i++,
+            _getUptime(),
+            free_memory,
+            100 * free_memory / total_memory,
+            getSystemLoadAverage(),
+            _getSystemDropoutCounter()
+
+    );
+}
+
 // handler for Telnet
 void MyESP::_telnetHandle() {
     SerialAndTelnet.handle();
 
     static uint8_t charsRead = 0;
+
     // read asynchronously until full command input
     while (SerialAndTelnet.available()) {
         char c = SerialAndTelnet.read();
@@ -1524,26 +1563,8 @@ void MyESP::_mqttConnect() {
         _mqtt_reconnect_delay = MQTT_RECONNECT_DELAY_MAX;
     }
 
-    mqttClient.setServer(_mqtt_ip, _mqtt_port);
-    mqttClient.setClientId(_general_hostname);
-    mqttClient.setKeepAlive(_mqtt_keepalive);
-    mqttClient.setCleanSession(false);
-
-    // last will
-    if (_hasValue(_mqtt_will_topic)) {
-        //myDebug_P(PSTR("[MQTT] Setting last will topic %s"), _mqttTopic(_mqtt_will_topic));
-        mqttClient.setWill(_mqttTopic(_mqtt_will_topic), 1, true,
-                           _mqtt_will_offline_payload); // retain always true
-    }
-
-    if (_hasValue(_mqtt_user)) {
-        myDebug_P(PSTR("[MQTT] Connecting to MQTT using user %s..."), _mqtt_user);
-        mqttClient.setCredentials(_mqtt_user, _mqtt_password);
-    } else {
-        myDebug_P(PSTR("[MQTT] Connecting to MQTT..."));
-    }
-
     // Connect to the MQTT broker
+    myDebug_P(PSTR("[MQTT] Connecting to MQTT..."));
     mqttClient.connect();
 }
 
@@ -1578,7 +1599,9 @@ char * MyESP::_mqttTopic(const char * topic) {
 
 // validates a file in SPIFFS, loads it into the json buffer and returns true if ok
 size_t MyESP::_fs_validateConfigFile(const char * filename, size_t maxsize, JsonDocument & doc) {
-    // myDebug_P(PSTR("[FS] Checking file %s"), filename); // remove for debugging
+#ifdef MYESP_DEBUG
+    myDebug_P(PSTR("[FS] Checking file %s"), filename);
+#endif
 
     // see if we can open it
     File file = SPIFFS.open(filename, "r");
@@ -1619,7 +1642,9 @@ size_t MyESP::_fs_validateConfigFile(const char * filename, size_t maxsize, Json
         return 0;
     }
 
-    // serializeJsonPretty(doc, Serial); // enable for debugging
+#ifdef MYESP_DEBUG
+    serializeJsonPretty(doc, Serial);
+#endif
 
     file.close();
     delete[] buffer;
@@ -1644,7 +1669,9 @@ size_t MyESP::_fs_validateLogFile(const char * filename) {
     // check sizes
     size_t size    = eventlog.size();
     size_t maxsize = ESP.getFreeHeap() - 2000; // reserve some buffer
-    // myDebug_P(PSTR("[FS] Checking file %s (%d/%d bytes)"), filename, size, maxsize); // remove for debugging
+#ifdef MYESP_DEBUG
+    myDebug_P(PSTR("[FS] Checking file %s (%d/%d bytes)"), filename, size, maxsize);
+#endif
     if (size > maxsize) {
         eventlog.close();
         myDebug_P(PSTR("[FS] File %s size %d is too large"), filename, size);
@@ -1693,7 +1720,9 @@ size_t MyESP::_fs_validateLogFile(const char * filename) {
         // see if we have reached the end of the string
         if (c == '\0' || c == '\n') {
             char_buffer[char_count] = '\0'; // terminate and add it to the list
-            // Serial.printf("Got line: %s\n", char_buffer); // for debugging
+#ifdef MYESP_DEBUG
+            Serial.printf("Got line: %s\n", char_buffer);
+#endif
             // validate it by looking at JSON structure
             DeserializationError error = deserializeJson(doc, char_buffer);
             if (error) {
@@ -1967,7 +1996,9 @@ bool MyESP::fs_saveConfig(JsonObject root) {
             ok = true;
         }
 
-        // serializeJsonPretty(root, Serial); // for debugging
+#ifdef MYESP_DEBUG
+        serializeJsonPretty(root, Serial);
+#endif
     }
 
     if (_ota_post_callback_f) {
@@ -2056,7 +2087,7 @@ void MyESP::_fs_setup() {
             myDebug_P(PSTR("[FS] Failed to format file system"));
         }
     }
-    
+
     /*
     // fill event log with tests
     SPIFFS.remove(MYESP_EVENTLOG_FILE);
@@ -2074,11 +2105,13 @@ void MyESP::_fs_setup() {
     if (size) {
         myDebug_P(PSTR("[FS] Event log loaded (%d bytes)"), size);
     } else {
+#ifndef MYESP_DEBUG
         myDebug_P(PSTR("[FS] Resetting event log"));
         SPIFFS.remove(MYESP_EVENTLOG_FILE);
         if (_general_log_events) {
             _writeEvent("WARN", "system", "Event Log", "Log was erased due to probable file corruption");
         }
+#endif
     }
 
     // load the main system config file if we can. Otherwise create it and expect user to configure in web interface
@@ -2319,7 +2352,9 @@ void MyESP::_writeEvent(const char * type, const char * src, const char * desc,
     // this will also create the file if its doesn't exist
     File eventlog = SPIFFS.open(MYESP_EVENTLOG_FILE, "a");
     if (!eventlog) {
-        // Serial.println("[SYSTEM] Error opening event log for writing"); // for debugging
+#ifdef MYESP_DEBUG
+        Serial.println("[SYSTEM] Error opening event log for writing");
+#endif
         eventlog.close();
         return;
     }
@@ -2385,7 +2420,9 @@ void MyESP::_sendEventLog(uint8_t page) {
         // see if we have reached the end of the string
         if (c == '\0' || c == '\n') {
             char_buffer[char_count] = '\0'; // terminate and add it to the list
-            // Serial.printf("Got line %d: %s\n", line_count+1, char_buffer); // for debugging
+#ifdef MYESP_DEBUG
+            Serial.printf("Got line %d: %s\n", line_count + 1, char_buffer);
+#endif
             list.add(char_buffer);
             // increment line counter and check if we've reached 10 records, if so abort
             if (++line_count == 10) {
@@ -2419,8 +2456,10 @@ void MyESP::_sendEventLog(uint8_t page) {
     char   buffer[MYESP_JSON_MAXSIZE];
     size_t len = serializeJson(root, buffer);
 
-    //Serial.printf("\nEVENTLOG: page %d, length=%d\n", page, len); // turn on for debugging
-    //serializeJson(root, Serial);                                  // turn on for debugging
+#ifdef MYESP_DEBUG
+    Serial.printf("\nEVENTLOG: page %d, length=%d\n", page, len);
+    serializeJson(root, Serial);
+#endif
 
     _ws->textAll(buffer, len);
     _ws->textAll("{\"command\":\"result\",\"resultof\":\"eventlist\",\"result\": true}");
@@ -2482,7 +2521,9 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
     }
 
     const char * command = doc["command"];
-    // Serial.printf("*** Got command: %s\n", command); // turn on for debugging
+#ifdef MYESP_DEBUG
+    Serial.printf("*** Got command: %s\n", command);
+#endif
 
     // Check whatever the command is and act accordingly
     if (strcmp(command, "configfile") == 0) {
@@ -2556,7 +2597,10 @@ bool MyESP::_fs_sendConfig() {
     }
     configFile.close();
 
-    //Serial.printf("_fs_sendConfig() sending system (%d): %s\n", size, json); // turn on for debugging
+#ifdef MYESP_DEBUG
+    Serial.printf("_fs_sendConfig() sending system (%d): %s\n", size, json);
+#endif
+
     _ws->textAll(json, size);
 
     configFile = SPIFFS.open(MYESP_CUSTOMCONFIG_FILE, "r");
@@ -2574,7 +2618,10 @@ bool MyESP::_fs_sendConfig() {
     }
     configFile.close();
 
-    //Serial.printf("_fs_sendConfig() sending custom (%d): %s\n", size, json); // turn on for debugging
+#ifdef MYESP_DEBUG
+    Serial.printf("_fs_sendConfig() sending custom (%d): %s\n", size, json);
+#endif
+
     _ws->textAll(json, size);
 
     return true;
@@ -2601,7 +2648,10 @@ void MyESP::_sendCustomStatus() {
 
     char   buffer[MYESP_JSON_MAXSIZE];
     size_t len = serializeJson(root, buffer);
-    // Serial.printf("_sendCustomStatus() sending: %s\n", buffer); // turn on for debugging
+
+#ifdef MYESP_DEBUG
+    Serial.printf("_sendCustomStatus() sending: %s\n", buffer);
+#endif
 
     _ws->textAll(buffer, len);
 }
@@ -2753,17 +2803,23 @@ void MyESP::_webserver_setup() {
                        if (!index) {
                            ETS_UART_INTR_DISABLE(); // disable all UART interrupts to be safe
                            _writeEvent("INFO", "system", "Firmware update started", "");
-                           //Serial.printf("[SYSTEM] Firmware update started: %s\n", filename.c_str()); // enable for debugging
+#ifdef MYESP_DEBUG
+                           Serial.printf("[SYSTEM] Firmware update started: %s\n", filename.c_str());
+#endif
                            Update.runAsync(true);
                            if (!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)) {
                                _writeEvent("ERRO", "system", "Not enough space to update", "");
-                               //Update.printError(Serial); // enable for debugging
+#ifdef MYESP_DEBUG
+                               Update.printError(Serial);
+#endif
                            }
                        }
                        if (!Update.hasError()) {
                            if (Update.write(data, len) != len) {
                                _writeEvent("ERRO", "system", "Writing to flash failed", "");
-                               //Update.printError(Serial);  // enable for debugging
+#ifdef MYESP_DEBUG
+                               Update.printError(Serial);
+#endif
                            }
                        }
                        if (final) {
@@ -2772,7 +2828,9 @@ void MyESP::_webserver_setup() {
                                _shouldRestart = !Update.hasError();
                            } else {
                                _writeEvent("ERRO", "system", "Firmware update failed", "");
-                               //Update.printError(Serial); // enable for debugging
+#ifdef MYESP_DEBUG
+                               Update.printError(Serial);
+#endif
                            }
                        }
                    });
@@ -2847,8 +2905,13 @@ void MyESP::_printMQTTLog() {
     uint8_t i;
 
     for (i = 0; i < MYESP_MQTTLOG_MAX; i++) {
-        if ((MQTT_log[i].topic != nullptr) && (MQTT_log[i].type == 1)) {
-            myDebug_P(PSTR("  Topic:%s Payload:%s"), MQTT_log[i].topic, MQTT_log[i].payload);
+        if ((MQTT_log[i].topic != nullptr) && (MQTT_log[i].type == MYESP_MQTTLOGTYPE_PUBLISH)) {
+            myDebug_P(PSTR("  Timestamp:%02d:%02d:%02d Topic:%s Payload:%s"),
+                      to_hour(MQTT_log[i].timestamp),
+                      to_minute(MQTT_log[i].timestamp),
+                      to_second(MQTT_log[i].timestamp),
+                      MQTT_log[i].topic,
+                      MQTT_log[i].payload);
         }
     }
 
@@ -2856,12 +2919,8 @@ void MyESP::_printMQTTLog() {
     myDebug_P(PSTR("MQTT subscriptions:"));
 
     for (i = 0; i < MYESP_MQTTLOG_MAX; i++) {
-        if ((MQTT_log[i].topic != nullptr) && (MQTT_log[i].type == 2)) {
-            if (_hasValue(MQTT_log[i].payload)) {
-                myDebug_P(PSTR("  Topic:%s Last Payload:%s"), MQTT_log[i].topic, MQTT_log[i].payload);
-            } else {
-                myDebug_P(PSTR("  Topic:%s"), MQTT_log[i].topic);
-            }
+        if ((MQTT_log[i].topic != nullptr) && (MQTT_log[i].type == MYESP_MQTTLOGTYPE_SUBSCRIBE)) {
+            myDebug_P(PSTR("  Topic:%s"), MQTT_log[i].topic);
         }
     }
 
@@ -2869,13 +2928,14 @@ void MyESP::_printMQTTLog() {
 }
 
 // add an MQTT log entry to our buffer
-// type 0=none, 1=publish, 2=subscribe
-void MyESP::_addMQTTLog(const char * topic, const char * payload, const uint8_t type) {
+void MyESP::_addMQTTLog(const char * topic, const char * payload, const MYESP_MQTTLOGTYPE_t type) {
     static uint8_t logCount   = 0;
     uint8_t        logPointer = 0;
     bool           found      = false;
 
-    // myDebug("_addMQTTLog [#%d] %s (%d) [%s] (%d)", logCount, topic, strlen(topic), payload, strlen(payload)); // for debugging
+#ifdef MYESP_DEBUG
+    myDebug("_addMQTTLog [#%d] %s (%d) [%s] (%d)", logCount, topic, strlen(topic), payload, strlen(payload));
+#endif
 
     // find the topic
     // topics must be unique for either publish or subscribe
@@ -2904,7 +2964,7 @@ void MyESP::_addMQTTLog(const char * topic, const char * payload, const uint8_t
     }
 
     // and add new record
-    MQTT_log[logPointer].type      = type; // 0=none, 1=publish, 2=subscribe
+    MQTT_log[logPointer].type      = type;
     MQTT_log[logPointer].topic     = strdup(topic);
     MQTT_log[logPointer].payload   = strdup(payload);
     MQTT_log[logPointer].timestamp = now();
@@ -3010,6 +3070,7 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
     _eeprom_setup();       // set up EEPROM for storing crash data, if compiled with -DCRASH
     _fs_setup();           // SPIFFS setup, do this first to get values
     _wifi_setup();         // WIFI setup
+    _mqtt_setup();         // MQTT setup
     _ota_setup();          // init OTA
     _webserver_setup();    // init web server
 
diff --git a/src/MyESP.h b/src/MyESP.h
index be5ee1525..d7ea53dce 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -1,5 +1,5 @@
 /*
- * MyESP.h
+ * MyESP.h - does all the basics like WiFI/MQTT/NTP/Debug logs etc
  *
  * Paul Derbyshire - first version December 2018
  */
@@ -9,15 +9,14 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.14"
+#define MYESP_VERSION "1.2.16"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
-#include <AsyncMqttClient.h> // https://github.com/marvinroger/async-mqtt-client and for ESP32 see https://github.com/marvinroger/async-mqtt-client/issues/127
-#include <ESPAsyncUDP.h>
+#include <AsyncMqttClient.h>
 #include <ESPAsyncWebServer.h>
 #include <FS.h>
-#include <JustWifi.h> // https://github.com/xoseperez/justwifi
+#include <JustWifi.h>
 
 #include "Ntp.h"
 #include "TelnetSpy.h" // modified from https://github.com/yasheena/telnetspy
@@ -207,14 +206,16 @@ typedef struct {
     char description[100];
 } command_t;
 
-typedef enum { MYESP_FSACTION_SET, MYESP_FSACTION_LIST, MYESP_FSACTION_SAVE, MYESP_FSACTION_LOAD } MYESP_FSACTION;
+typedef enum { MYESP_FSACTION_SET, MYESP_FSACTION_LIST, MYESP_FSACTION_SAVE, MYESP_FSACTION_LOAD } MYESP_FSACTION_t;
 
 typedef enum {
     MYESP_BOOTSTATUS_POWERON     = 0,
     MYESP_BOOTSTATUS_BOOTED      = 1,
     MYESP_BOOTSTATUS_BOOTING     = 2,
     MYESP_BOOTSTATUS_RESETNEEDED = 3
-} MYESP_BOOTSTATUS; // boot messages
+} MYESP_BOOTSTATUS_t; // boot messages
+
+typedef enum { MYESP_MQTTLOGTYPE_NONE, MYESP_MQTTLOGTYPE_PUBLISH, MYESP_MQTTLOGTYPE_SUBSCRIBE } MYESP_MQTTLOGTYPE_t;
 
 // for storing all MQTT publish messages
 typedef struct {
@@ -222,16 +223,16 @@ typedef struct {
     char *  topic;
     char *  payload;
     time_t  timestamp;
-} _MQTT_Log;
+} _MQTT_Log_t;
 
-typedef std::function<void(unsigned int, const char *, const char *)>            mqtt_callback_f;
-typedef std::function<void()>                                                    wifi_callback_f;
-typedef std::function<void()>                                                    ota_callback_f;
-typedef std::function<void(uint8_t, const char *)>                               telnetcommand_callback_f;
-typedef std::function<void(uint8_t)>                                             telnet_callback_f;
-typedef std::function<bool(MYESP_FSACTION, JsonObject json)>                     fs_loadsave_callback_f;
-typedef std::function<bool(MYESP_FSACTION, uint8_t, const char *, const char *)> fs_setlist_callback_f;
-typedef std::function<void(JsonObject root)>                                     web_callback_f;
+typedef std::function<void(unsigned int, const char *, const char *)>              mqtt_callback_f;
+typedef std::function<void()>                                                      wifi_callback_f;
+typedef std::function<void()>                                                      ota_callback_f;
+typedef std::function<void(uint8_t, const char *)>                                 telnetcommand_callback_f;
+typedef std::function<void(uint8_t)>                                               telnet_callback_f;
+typedef std::function<bool(MYESP_FSACTION_t, JsonObject json)>                     fs_loadsave_callback_f;
+typedef std::function<bool(MYESP_FSACTION_t, uint8_t, const char *, const char *)> fs_setlist_callback_f;
+typedef std::function<void(JsonObject root)>                                       web_callback_f;
 
 // calculates size of an 2d array at compile time
 template <typename T, size_t N>
@@ -319,6 +320,7 @@ class MyESP {
     uint8_t       getSystemBootStatus();
     bool          _have_ntp_time;
     unsigned long getSystemTime();
+    void          heartbeatPrint();
 
   private:
     // mqtt
@@ -330,10 +332,10 @@ class MyESP {
     char * _mqttTopic(const char * topic);
 
     // mqtt log
-    _MQTT_Log MQTT_log[MYESP_MQTTLOG_MAX]; // log for publish and subscribe messages
+    _MQTT_Log_t MQTT_log[MYESP_MQTTLOG_MAX]; // log for publish and subscribe messages
 
     void _printMQTTLog();
-    void _addMQTTLog(const char * topic, const char * payload, const uint8_t type);
+    void _addMQTTLog(const char * topic, const char * payload, const MYESP_MQTTLOGTYPE_t type);
 
     AsyncMqttClient mqttClient; // the MQTT class
     uint32_t        _mqtt_reconnect_delay;

From fe4e38d33087c6f2bb566b7721551b5b38be975d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 22:59:18 +0100
Subject: [PATCH 046/120] added more gcc optimization flags

---
 platformio.ini | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 35c255e10..60755ddd7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,9 +11,11 @@ default_envs = debug
 ; -DTESTS
 ; -DCRASH
 ; -DFORCE_SERIAL
+; -DMYESP_DEBUG
 custom_flags =
 
-general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC -DVTABLES_IN_FLASH -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+;general_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC -DVTABLES_IN_FLASH 
 
 [env]
 framework = arduino
@@ -27,7 +29,6 @@ lib_deps =
   AsyncMqttClient@0.8.2
   EEPROM_Rotate@0.9.2
   ArduinoJson@6.12.0
-  ;https://github.com/bblanchon/ArduinoJson#v6.13.0
   ESPAsyncUDP
   ESPAsyncTCP@1.2.2
 upload_speed = 921600
@@ -37,9 +38,9 @@ monitor_speed = 115200
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
 
-; uncomment next 2 lines if using OTA
-;upload_protocol = espota
-;upload_port = ems-esp.local
+; comment out these next 2 lines if using OTA
+upload_protocol = espota
+upload_port = ems-esp.local
 
 [env:travis]
 board = esp12e

From 5ca137f0aedc5141468f31af2bc7754317be6128 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 23:06:28 +0100
Subject: [PATCH 047/120] text formatting

---
 src/ems-esp.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 3de31ab75..7ee5a8a50 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -219,16 +219,18 @@ void showInfo() {
         myDebug_P(PSTR("  System logging set to None"));
     }
 
-    myDebug_P(PSTR("  LED is %s, Listen mode is %s"), EMSESP_Settings.led ? "on" : "off", EMSESP_Settings.listen_mode ? "on" : "off");
+    myDebug_P(PSTR("  LED: %s, Listen mode: %s"), EMSESP_Settings.led ? "on" : "off", EMSESP_Settings.listen_mode ? "on" : "off");
     if (EMSESP_Settings.dallas_sensors > 0) {
         myDebug_P(PSTR("  %d external temperature sensor%s found"), EMSESP_Settings.dallas_sensors, (EMSESP_Settings.dallas_sensors == 1) ? "" : "s");
     }
 
-    myDebug_P(PSTR("  Boiler is %s, Thermostat is %s, Solar Module is %s, Mixing Module is %s, Shower Timer is %s, Shower Alert is %s"),
+    myDebug_P(PSTR("  Boiler: %s, Thermostat: %s, Solar Module: %s, Mixing Module: %s"),
               (ems_getBoilerEnabled() ? "enabled" : "disabled"),
               (ems_getThermostatEnabled() ? "enabled" : "disabled"),
               (ems_getSolarModuleEnabled() ? "enabled" : "disabled"),
-              (ems_getMixingDeviceEnabled() ? "enabled" : "disabled"),
+              (ems_getMixingDeviceEnabled() ? "enabled" : "disabled"));
+
+    myDebug_P(PSTR("  Shower Timer: %s, Shower Alert: %s"),
               ((EMSESP_Settings.shower_timer) ? "enabled" : "disabled"),
               ((EMSESP_Settings.shower_alert) ? "enabled" : "disabled"));
 
@@ -1018,7 +1020,7 @@ void runUnitTest(uint8_t test_num) {
 }
 
 // callback for loading/saving settings to the file system (SPIFFS)
-bool LoadSaveCallback(MYESP_FSACTION action, JsonObject settings) {
+bool LoadSaveCallback(MYESP_FSACTION_t action, JsonObject settings) {
     if (action == MYESP_FSACTION_LOAD) {
         // check for valid json
         if (settings.isNull()) {
@@ -1094,7 +1096,7 @@ bool do_publishShowerData() {
 // callback for custom settings when showing Stored Settings with the 'set' command
 // wc is number of arguments after the 'set' command
 // returns true if the setting was recognized and changed and should be saved back to SPIFFs
-bool SetListCallback(MYESP_FSACTION action, uint8_t wc, const char * setting, const char * value) {
+bool SetListCallback(MYESP_FSACTION_t action, uint8_t wc, const char * setting, const char * value) {
     bool ok = false;
 
     if (action == MYESP_FSACTION_SET) {

From c85ab271c9d0d7b16c068f7390651accdff7ed37 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 4 Nov 2019 23:06:39 +0100
Subject: [PATCH 048/120] more build params

---
 platformio.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 60755ddd7..decba5fad 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,8 +14,8 @@ default_envs = debug
 ; -DMYESP_DEBUG
 custom_flags =
 
-;general_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC -DVTABLES_IN_FLASH 
+;general_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -DVTABLES_IN_FLASH
+general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC 
 
 [env]
 framework = arduino

From b7835b2d39ee1a00c6712855015cefcab07157ea Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 5 Nov 2019 18:20:46 +0100
Subject: [PATCH 049/120] text change

---
 src/custom.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/custom.htm b/src/custom.htm
index e97ed54e6..21e871205 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -146,7 +146,7 @@
             <select class="form-control input-sm" id="tx_mode">
                 <option selected="selected" value="1">1 (EMS generic)</option>
                 <option value="2">2 (EMS+)</option>
-                <option value="3">3 (Junkers Heatronic)</option>
+                <option value="3">3 (Junkers Heatronic HT3)</option>
             </select>
         </span>
     </div>

From 26b8185f56336b5369453eb7b9accf155b5ca474 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 5 Nov 2019 18:21:13 +0100
Subject: [PATCH 050/120] keep thermostat generic, and remove HA's heat mode

---
 CHANGELOG.md                    |  1 +
 doc/home assistant/climate.yaml |  3 +-
 src/ems-esp.cpp                 | 74 ++++++++++++++++-----------------
 src/ems.cpp                     |  2 +-
 src/ems.h                       |  8 ++++
 5 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fad9e78a..ed84f0216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Debug log times show real internet time (if NTP enabled)
 - `system` shows local time instead of UTC
 - fixed version numbers of libraries in `platformio.ini`
+- Normalized Heating modes to `off`, `manual`, `auto`, `night` and `day` to keep generic and not Home Assistant specific (like `heat`)
 
 ### Removed
 
diff --git a/doc/home assistant/climate.yaml b/doc/home assistant/climate.yaml
index 80e2c0783..9e9554afe 100644
--- a/doc/home assistant/climate.yaml	
+++ b/doc/home assistant/climate.yaml	
@@ -11,7 +11,8 @@
   current_temperature_topic: "home/ems-esp/thermostat_data"
   temperature_state_topic: "home/ems-esp/thermostat_data"
 
-  mode_state_template: "{{ value_json.hc1.mode }}"
+  mode_state_template: "{% if value_json.hc1.mode == 'manual' %} heat {% else %} {{value_json.hc1.mode}} {% endif %}"
+
   current_temperature_template: "{{ value_json.hc1.currtemp }}"
   temperature_state_template: "{{ value_json.hc1.seltemp }}"
    
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 7ee5a8a50..8739ca654 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -153,44 +153,44 @@ void myDebugLog(const char * s) {
     }
 }
 
-// figures out the thermostat mode
-// returns 0xFF=unknown, 0=low, 1=manual, 2=auto, 3=night, 4=day
+// figures out the thermostat mode depending on the thermostat type
+// returns {EMS_THERMOSTAT_MODE_UNKNOWN, EMS_THERMOSTAT_MODE_OFF, EMS_THERMOSTAT_MODE_MANUAL, EMS_THERMOSTAT_MODE_AUTO, EMS_THERMOSTAT_MODE_NIGHT, EMS_THERMOSTAT_MODE_DAY}
 // hc_num is 1 to 4
-uint8_t _getThermostatMode(uint8_t hc_num) {
-    int     thermoMode = EMS_VALUE_INT_NOTSET;
-    uint8_t model      = ems_getThermostatModel();
+_EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
+    _EMS_THERMOSTAT_MODE thermoMode = EMS_THERMOSTAT_MODE_UNKNOWN;
+    uint8_t              model      = ems_getThermostatModel();
 
     uint8_t mode = EMS_Thermostat.hc[hc_num - 1].mode;
 
     if (model == EMS_MODEL_RC20) {
         if (mode == 0) {
-            thermoMode = 0; // low
+            thermoMode = EMS_THERMOSTAT_MODE_OFF;
         } else if (mode == 1) {
-            thermoMode = 1; // manual
+            thermoMode = EMS_THERMOSTAT_MODE_MANUAL;
         } else if (mode == 2) {
-            thermoMode = 2; // auto
+            thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
     } else if (model == EMS_MODEL_RC300) {
         if (mode == 0) {
-            thermoMode = 1; // manual
+            thermoMode = EMS_THERMOSTAT_MODE_MANUAL;
         } else if (mode == 1) {
-            thermoMode = 2; // auto
+            thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
     } else if (model == EMS_MODEL_FW100 || model == EMS_MODEL_FW120) {
         if (mode == 3) {
-            thermoMode = 4;
+            thermoMode = EMS_THERMOSTAT_MODE_DAY;
         } else if (mode == 2) {
-            thermoMode = 3;
+            thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
         } else if (mode == 1) {
-            thermoMode = 0;
+            thermoMode = EMS_THERMOSTAT_MODE_OFF;
         }
     } else { // default for all other thermostats
         if (mode == 0) {
-            thermoMode = 3; // night
+            thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
         } else if (mode == 1) {
-            thermoMode = 4; // day
+            thermoMode = EMS_THERMOSTAT_MODE_DAY;
         } else if (mode == 2) {
-            thermoMode = 2; // auto
+            thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
     }
 
@@ -428,16 +428,16 @@ void showInfo() {
                 }
 
                 // Render Termostat Mode, if we have a mode
-                uint8_t thermoMode = _getThermostatMode(hc_num); // 0xFF=unknown, 0=off, 1=manual, 2=auto, 3=night, 4=day
-                if (thermoMode == 0) {
+                _EMS_THERMOSTAT_MODE thermoMode = _getThermostatMode(hc_num);
+                if (thermoMode == EMS_THERMOSTAT_MODE_OFF) {
                     myDebug_P(PSTR("   Mode is set to off"));
-                } else if (thermoMode == 1) {
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_MANUAL) {
                     myDebug_P(PSTR("   Mode is set to manual"));
-                } else if (thermoMode == 2) {
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
                     myDebug_P(PSTR("   Mode is set to auto"));
-                } else if (thermoMode == 3) {
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
                     myDebug_P(PSTR("   Mode is set to night"));
-                } else if (thermoMode == 4) {
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
                     myDebug_P(PSTR("   Mode is set to day"));
                 } else {
                     myDebug_P(PSTR("   Mode is unknown"));
@@ -722,19 +722,19 @@ void publishValues(bool force) {
                         dataThermostat[THERMOSTAT_CIRCUITCALCTEMP] = thermostat->circuitcalctemp;
                 }
 
-                uint8_t thermoMode = _getThermostatMode(hc_v); // 0xFF=unknown, 0=low, 1=manual, 2=auto, 3=night, 4=day
+                _EMS_THERMOSTAT_MODE thermoMode = _getThermostatMode(hc_v);
 
                 // Termostat Mode
-                if (thermoMode == 0) {
+                if (thermoMode == EMS_THERMOSTAT_MODE_OFF) {
                     dataThermostat[THERMOSTAT_MODE] = "off";
-                } else if (thermoMode == 1) {
-                    dataThermostat[THERMOSTAT_MODE] = "heat";
-                } else if (thermoMode == 2) {
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_MANUAL) {
+                    dataThermostat[THERMOSTAT_MODE] = "manual";
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
                     dataThermostat[THERMOSTAT_MODE] = "auto";
-                } else if (thermoMode == 3) {
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
                     dataThermostat[THERMOSTAT_MODE] = "off"; // for night
-                } else if (thermoMode == 4) {
-                    dataThermostat[THERMOSTAT_MODE] = "heat"; // for day
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
+                    dataThermostat[THERMOSTAT_MODE] = "manual"; // for day
                 } else {
                     dataThermostat[THERMOSTAT_MODE] = "auto"; // default to auto so HA doesn't complain
                 }
@@ -1811,16 +1811,16 @@ void WebCallback(JsonObject root) {
         }
 
         // Render Termostat Mode, if we have a mode
-        uint8_t thermoMode = _getThermostatMode(hc_num); // 0xFF=unknown, 0=off, 1=manual, 2=auto, 3=night, 4=day
-        if (thermoMode == 0) {
+        _EMS_THERMOSTAT_MODE thermoMode = _getThermostatMode(hc_num);
+        if (thermoMode == EMS_THERMOSTAT_MODE_OFF) {
             thermostat["tmode"] = "off";
-        } else if (thermoMode == 1) {
-            thermostat["tmode"] = "heat";
-        } else if (thermoMode == 2) {
+        } else if (thermoMode == EMS_THERMOSTAT_MODE_MANUAL) {
+            thermostat["tmode"] = "manual";
+        } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
             thermostat["tmode"] = "auto";
-        } else if (thermoMode == 3) {
+        } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
             thermostat["tmode"] = "night";
-        } else if (thermoMode == 4) {
+        } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
             thermostat["tmode"] = "day";
         }
     } else {
diff --git a/src/ems.cpp b/src/ems.cpp
index c11e39b17..4aea577b6 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -2962,7 +2962,7 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
     // RC300/1000/3000 have different settings
     if (model_id == EMS_MODEL_RC300) {
         if (mode == 1) {
-            set_mode = 0; // manual/heat
+            set_mode = 0; // manual
         } else {
             set_mode = 0xFF; // auto
         }
diff --git a/src/ems.h b/src/ems.h
index a1946768a..87f53a936 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -48,6 +48,14 @@
 #define EMS_THERMOSTAT_DEFAULTHC 1 // default heating circuit is 1
 #define EMS_THERMOSTAT_WRITE_YES true
 #define EMS_THERMOSTAT_WRITE_NO false
+typedef enum {
+    EMS_THERMOSTAT_MODE_UNKNOWN,
+    EMS_THERMOSTAT_MODE_OFF,
+    EMS_THERMOSTAT_MODE_MANUAL,
+    EMS_THERMOSTAT_MODE_AUTO,
+    EMS_THERMOSTAT_MODE_NIGHT,
+    EMS_THERMOSTAT_MODE_DAY
+} _EMS_THERMOSTAT_MODE;
 
 // trigger settings to determine if hot tap water or the heating is active
 #define EMS_BOILER_BURNPOWER_TAPWATER 100

From f2682bfe04afd39faf4459e26bd2336c8165667a Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 5 Nov 2019 22:42:51 +0100
Subject: [PATCH 051/120] separate thermostat mode manual/auto with day/night -
 https://github.com/proddy/EMS-ESP/issues/224

---
 CHANGELOG.md      |  1 +
 src/ems-esp.cpp   | 66 ++++++++++++++++++++++++++---------------------
 src/ems.cpp       | 21 +++++++--------
 src/ems_devices.h |  9 ++++---
 src/version.h     |  2 +-
 5 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed84f0216..069336543 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `system` shows local time instead of UTC
 - fixed version numbers of libraries in `platformio.ini`
 - Normalized Heating modes to `off`, `manual`, `auto`, `night` and `day` to keep generic and not Home Assistant specific (like `heat`)
+- Keeping Thermostat day/night modes separate from off/auto/manual, and setting this for the Junkers FR50
 
 ### Removed
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 8739ca654..f5890e4bd 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -131,7 +131,7 @@ static const command_t project_cmds[] PROGMEM = {
     {false, "send XX ...", "send raw telegram data to EMS bus (XX are hex values)"},
     {false, "thermostat read <type ID>", "send read request to the thermostat for heating circuit hc 1-4"},
     {false, "thermostat temp [hc] <degrees>", "set current thermostat temperature"},
-    {false, "thermostat mode [hc] <mode>", "set mode (0=low/night, 1=manual/day, 2=auto) for heating circuit hc 1-4"},
+    {false, "thermostat mode [hc] <mode>", "set mode (0=off, 1=manual, 2=auto) for heating circuit hc 1-4"},
     {false, "thermostat scan <type ID>", "probe thermostat on all type id responses"},
     {false, "boiler read <type ID>", "send read request to boiler"},
     {false, "boiler wwtemp <degrees>", "set boiler warm water temperature"},
@@ -153,7 +153,7 @@ void myDebugLog(const char * s) {
     }
 }
 
-// figures out the thermostat mode depending on the thermostat type
+// figures out the thermostat mode (manual/auto) depending on the thermostat type
 // returns {EMS_THERMOSTAT_MODE_UNKNOWN, EMS_THERMOSTAT_MODE_OFF, EMS_THERMOSTAT_MODE_MANUAL, EMS_THERMOSTAT_MODE_AUTO, EMS_THERMOSTAT_MODE_NIGHT, EMS_THERMOSTAT_MODE_DAY}
 // hc_num is 1 to 4
 _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
@@ -176,28 +176,44 @@ _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
         } else if (mode == 1) {
             thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
-    } else if (model == EMS_MODEL_FW100 || model == EMS_MODEL_FW120) {
+    }
+
+    return thermoMode;
+}
+
+// figures out the thermostat day/night mode depending on the thermostat type
+// returns {EMS_THERMOSTAT_MODE_UNKNOWN, EMS_THERMOSTAT_MODE_OFF, EMS_THERMOSTAT_MODE_MANUAL, EMS_THERMOSTAT_MODE_AUTO, EMS_THERMOSTAT_MODE_NIGHT, EMS_THERMOSTAT_MODE_DAY}
+// hc_num is 1 to 4
+_EMS_THERMOSTAT_MODE _getThermostatDayMode(uint8_t hc_num) {
+    _EMS_THERMOSTAT_MODE thermoMode = EMS_THERMOSTAT_MODE_UNKNOWN;
+    uint8_t              model      = ems_getThermostatModel();
+
+    uint8_t mode = EMS_Thermostat.hc[hc_num - 1].day_mode;
+
+    if (model == EMS_MODEL_FW100 || model == EMS_MODEL_FW120 || model == EMS_MODEL_FR10 || model == EMS_MODEL_FR100 || model == EMS_MODEL_FR50) {
         if (mode == 3) {
             thermoMode = EMS_THERMOSTAT_MODE_DAY;
         } else if (mode == 2) {
             thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
-        } else if (mode == 1) {
-            thermoMode = EMS_THERMOSTAT_MODE_OFF;
         }
-    } else { // default for all other thermostats
+    } else if (model == EMS_MODEL_RC35 || model == EMS_MODEL_ES73) {
+        if (mode == 0) {
+            thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
+        } else if (mode == 1) {
+            thermoMode = EMS_THERMOSTAT_MODE_DAY;
+        }
+    } else if (model == EMS_MODEL_RC100 || model == EMS_MODEL_RC300) {
         if (mode == 0) {
             thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
         } else if (mode == 1) {
             thermoMode = EMS_THERMOSTAT_MODE_DAY;
-        } else if (mode == 2) {
-            thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
     }
 
     return thermoMode;
 }
 
-// Show command - display stats on an 's' command
+// Info - display stats on an 'info' command
 void showInfo() {
     // General stats from EMS bus
 
@@ -427,20 +443,23 @@ void showInfo() {
                     _renderIntValue(" Vacation temperature", "C", EMS_Thermostat.hc[hc_num - 1].holidaytemp, 2); // convert to a single byte * 2
                 }
 
-                // Render Termostat Mode, if we have a mode
-                _EMS_THERMOSTAT_MODE thermoMode = _getThermostatMode(hc_num);
+                // Render Thermostat Mode
+                _EMS_THERMOSTAT_MODE thermoMode;
+                thermoMode = _getThermostatMode(hc_num);
                 if (thermoMode == EMS_THERMOSTAT_MODE_OFF) {
                     myDebug_P(PSTR("   Mode is set to off"));
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_MANUAL) {
                     myDebug_P(PSTR("   Mode is set to manual"));
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
                     myDebug_P(PSTR("   Mode is set to auto"));
-                } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
-                    myDebug_P(PSTR("   Mode is set to night"));
+                }
+
+                // Render Thermostat Day Mode
+                thermoMode = _getThermostatDayMode(hc_num);
+                if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
+                    myDebug_P(PSTR("   Day Mode is set to night"));
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
-                    myDebug_P(PSTR("   Mode is set to day"));
-                } else {
-                    myDebug_P(PSTR("   Mode is unknown"));
+                    myDebug_P(PSTR("   Day Mode is set to day"));
                 }
             }
         }
@@ -722,21 +741,14 @@ void publishValues(bool force) {
                         dataThermostat[THERMOSTAT_CIRCUITCALCTEMP] = thermostat->circuitcalctemp;
                 }
 
+                // Thermostat Mode
                 _EMS_THERMOSTAT_MODE thermoMode = _getThermostatMode(hc_v);
-
-                // Termostat Mode
                 if (thermoMode == EMS_THERMOSTAT_MODE_OFF) {
                     dataThermostat[THERMOSTAT_MODE] = "off";
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_MANUAL) {
                     dataThermostat[THERMOSTAT_MODE] = "manual";
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
                     dataThermostat[THERMOSTAT_MODE] = "auto";
-                } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
-                    dataThermostat[THERMOSTAT_MODE] = "off"; // for night
-                } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
-                    dataThermostat[THERMOSTAT_MODE] = "manual"; // for day
-                } else {
-                    dataThermostat[THERMOSTAT_MODE] = "auto"; // default to auto so HA doesn't complain
                 }
             }
         }
@@ -1810,7 +1822,7 @@ void WebCallback(JsonObject root) {
                 thermostat["tc"] = (float)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 10;
         }
 
-        // Render Termostat Mode, if we have a mode
+        // Render Thermostat Mode
         _EMS_THERMOSTAT_MODE thermoMode = _getThermostatMode(hc_num);
         if (thermoMode == EMS_THERMOSTAT_MODE_OFF) {
             thermostat["tmode"] = "off";
@@ -1818,10 +1830,6 @@ void WebCallback(JsonObject root) {
             thermostat["tmode"] = "manual";
         } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
             thermostat["tmode"] = "auto";
-        } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
-            thermostat["tmode"] = "night";
-        } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
-            thermostat["tmode"] = "day";
         }
     } else {
         thermostat["ok"] = false;
diff --git a/src/ems.cpp b/src/ems.cpp
index 4aea577b6..574d574fb 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -93,7 +93,7 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
 void _process_RCPLUSSetMessage(_EMS_RxTelegram * EMS_RxTelegram);
 void _process_RCPLUSStatusMode(_EMS_RxTelegram * EMS_RxTelegram);
 
-// Junkers FR10 & FW100
+// Junkers FR10, FR50, FW100
 void _process_JunkersStatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
 
 // Mixers MM100
@@ -258,7 +258,7 @@ void ems_init() {
     for (uint8_t i = 0; i < EMS_THERMOSTAT_MAXHC; i++) {
         EMS_Thermostat.hc[i].hc                = i + 1;
         EMS_Thermostat.hc[i].active            = false;
-        EMS_Thermostat.hc[i].mode              = EMS_VALUE_INT_NOTSET; // night, day, auto
+        EMS_Thermostat.hc[i].mode              = EMS_VALUE_INT_NOTSET;
         EMS_Thermostat.hc[i].day_mode          = EMS_VALUE_INT_NOTSET;
         EMS_Thermostat.hc[i].summer_mode       = EMS_VALUE_INT_NOTSET;
         EMS_Thermostat.hc[i].holiday_mode      = EMS_VALUE_INT_NOTSET;
@@ -1576,7 +1576,7 @@ void _process_RCPLUSStatusMode(_EMS_RxTelegram * EMS_RxTelegram) {
 }
 
 /**
- * FR10 Junkers - type x006F
+ * FR10/FR50/FR100 Junkers - type x006F
  */
 void _process_JunkersStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     if (EMS_RxTelegram->offset == 0 && EMS_RxTelegram->data_length > 1) {
@@ -1588,8 +1588,11 @@ void _process_JunkersStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 
         EMS_Thermostat.hc[hc].curr_roomTemp     = _toShort(EMS_OFFSET_JunkersStatusMessage_curr);     // value is * 10
         EMS_Thermostat.hc[hc].setpoint_roomTemp = _toShort(EMS_OFFSET_JunkersStatusMessage_setpoint); // value is * 10
-        EMS_Thermostat.hc[hc].mode              = _toByte(EMS_OFFSET_JunkersStatusMessage_mode);
-        EMS_Sys_Status.emsRefreshed             = true; // triggers a send the values back via MQTT
+
+        EMS_Thermostat.hc[hc].day_mode = _toByte(EMS_OFFSET_JunkersStatusMessage_daymode); // 3 = day, 2 = night
+        EMS_Thermostat.hc[hc].mode     = _toByte(EMS_OFFSET_JunkersStatusMessage_mode);    // 1 = manual, 2 = auto
+
+        EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
     }
 }
 
@@ -2935,7 +2938,7 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
 
 /**
  * Set the thermostat working mode
- *  (0=low/night, 1=manual/day, 2=auto/clock),  0xA8 on a RC20 and 0xA7 on RC30
+ *  0xA8 on a RC20 and 0xA7 on RC30
  *  0x01B9 for EMS+ 300/1000/3000, Auto=0xFF Manual=0x00. See https://github.com/proddy/EMS-ESP/wiki/RC3xx-Thermostats
  *  hc_num is 1 to 4
  */
@@ -2970,17 +2973,13 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
         set_mode = mode;
     }
 
-    // 0=off, 1=manual, 2=auto, 3=night, 4=day
+    // 0=off, 1=manual, 2=auto
     if (mode == 0) {
         myDebug_P(PSTR("Setting thermostat mode to off for heating circuit %d"), hc_num);
     } else if (set_mode == 1) {
         myDebug_P(PSTR("Setting thermostat mode to manual for heating circuit %d"), hc_num);
     } else if (set_mode == 2) {
         myDebug_P(PSTR("Setting thermostat mode to auto for heating circuit %d"), hc_num);
-    } else if (set_mode == 3) {
-        myDebug_P(PSTR("Setting thermostat mode to night for heating circuit %d"), hc_num);
-    } else if (set_mode == 4) {
-        myDebug_P(PSTR("Setting thermostat mode to day for heating circuit %d"), hc_num);
     }
 
     _EMS_TxTelegram EMS_TxTelegram = EMS_TX_TELEGRAM_NEW; // create new Tx
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 840256de2..e072bc931 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -139,9 +139,10 @@
 #define EMS_OFFSET_RCPLUSSet_temp_setpoint 8    // temp setpoint, when changing of templevel (in auto) value is reset and set to FF
 #define EMS_OFFSET_RCPLUSSet_manual_setpoint 10 // manual setpoint
 
-// Junkers FR10, FW100 (EMS Plus)
+// Junkers FR10, FR50, FW100 (EMS Plus)
 #define EMS_TYPE_JunkersStatusMessage 0x6F         // is an automatic thermostat broadcast giving us temps
-#define EMS_OFFSET_JunkersStatusMessage_mode 0     // current mode
+#define EMS_OFFSET_JunkersStatusMessage_daymode 0  // 3 = day, 2 = night
+#define EMS_OFFSET_JunkersStatusMessage_mode 1     // current mode, 1 = manual, 2 = auto
 #define EMS_OFFSET_JunkersStatusMessage_setpoint 2 // setpoint temp
 #define EMS_OFFSET_JunkersStatusMessage_curr 4     // current temp
 
@@ -175,7 +176,7 @@ typedef enum {
     EMS_MODEL_EASY,
     EMS_MODEL_RC300,
     EMS_MODEL_CW100,
-    EMS_MODEL_1010,
+    EMS_MODEL_RC100,
     EMS_MODEL_OT,
     EMS_MODEL_FW100,
     EMS_MODEL_FR10,
@@ -290,7 +291,7 @@ const _Thermostat_Device Thermostat_Devices[] = {
     {EMS_MODEL_RC30, 78, 0x10, "RC30/Moduline 400", EMS_THERMOSTAT_WRITE_YES},
     {EMS_MODEL_RC35, 86, 0x10, "RC35", EMS_THERMOSTAT_WRITE_YES},
     {EMS_MODEL_RC300, 158, 0x10, "RC300/RC310/Moduline 3000/Bosch CW400", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_1010, 165, 0x18, "RC100/Moduline 1010", EMS_THERMOSTAT_WRITE_NO},
+    {EMS_MODEL_RC100, 165, 0x18, "RC100/Moduline 1010", EMS_THERMOSTAT_WRITE_NO},
 
     // Sieger
     {EMS_MODEL_ES73, 76, 0x10, "Sieger ES73", EMS_THERMOSTAT_WRITE_YES},
diff --git a/src/version.h b/src/version.h
index bac5c250c..46284f4ef 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b6"
+#define APP_VERSION "1.9.4b7"

From 1df8a3d92011193aba999fb77645d11a8b1d8813 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 5 Nov 2019 23:57:48 +0100
Subject: [PATCH 052/120] lower Wifi tx strength to see if it helps with
 connectivity

---
 src/MyESP.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index b41512b29..89930b269 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -201,10 +201,6 @@ uint32_t MyESP::_getInitialFreeHeap() {
 // called when WiFi is connected, and used to start OTA, MQTT
 void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
     if (code == MESSAGE_CONNECTED) {
-#if defined(ESP8266)
-        WiFi.setSleepMode(WIFI_NONE_SLEEP); // added to possibly fix wifi dropouts in arduino core 2.5.0
-#endif
-
         _wifi_connected = true;
 
         jw.enableAPFallback(false); // Disable AP mode after initial connect was successful - test for https://github.com/proddy/EMS-ESP/issues/187
@@ -514,10 +510,19 @@ void MyESP::_mqtt_setup() {
 // WiFI setup
 void MyESP::_wifi_setup() {
     jw.setHostname(_general_hostname); // Set WIFI hostname
-    jw.subscribe([this](justwifi_messages_t code, char * parameter) { _wifiCallback(code, parameter); });
     jw.setConnectTimeout(MYESP_WIFI_CONNECT_TIMEOUT);
     jw.setReconnectTimeout(MYESP_WIFI_RECONNECT_INTERVAL);
 
+#if defined(ESP8266)
+    WiFi.setSleepMode(WIFI_NONE_SLEEP); // added to possibly fix wifi dropouts in arduino core 2.5.0
+    // ref: https://github.com/esp8266/Arduino/issues/6471
+    // ref: https://github.com/esp8266/Arduino/issues/6366
+    // high tx power causing weird behavior, slighly lowering from 20.5 to 20.0 may help stability
+    WiFi.setOutputPower(20.0); // in DBM
+#endif
+
+    jw.subscribe([this](justwifi_messages_t code, char * parameter) { _wifiCallback(code, parameter); });
+
     /// wmode 1 is AP, 0 is client
     if (_network_wmode == 1) {
         jw.enableAP(true);

From 65fb01ac5bf120248ea669988f165cb7ddf7dd9e Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 6 Nov 2019 20:33:23 +0100
Subject: [PATCH 053/120] quick fix for FR50 -
 https://github.com/proddy/EMS-ESP/issues/224

---
 src/ems-esp.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index f5890e4bd..9f0767c44 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -176,6 +176,12 @@ _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
         } else if (mode == 1) {
             thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
+    } else if (model == EMS_MODEL_FR10 || model == EMS_MODEL_FR50 || model == EMS_MODEL_FR100) {
+        if (mode == 1) {
+            thermoMode = EMS_THERMOSTAT_MODE_MANUAL;
+        } else if (mode == 2) {
+            thermoMode = EMS_THERMOSTAT_MODE_AUTO;
+        }
     }
 
     return thermoMode;

From 0f7382a15b775e5fb5f8b3e5315b5249cf669a7a Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 09:46:02 +0100
Subject: [PATCH 054/120] default is release, with debug info

---
 platformio.ini | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index decba5fad..a851b9b71 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -3,7 +3,7 @@
 ;
 
 [platformio]
-default_envs = debug
+default_envs = release
 
 [common]
 ; custom build options are:
@@ -74,3 +74,10 @@ build_flags = ${common.general_flags} ${common.custom_flags}
 extra_scripts = 
   pre:scripts/pre_script.py
   scripts/main_script.py
+
+[env:release]
+board = d1_mini
+build_flags = ${common.general_flags} ${common.custom_flags}
+extra_scripts = 
+  pre:scripts/pre_script.py
+  scripts/main_script.py
\ No newline at end of file

From 804ed62d67d11725eb5534ef0e19adc8f12f8bf8 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 09:46:21 +0100
Subject: [PATCH 055/120] update to 1.9.4b7

---
 CHANGELOG.md  | 4 ++++
 src/version.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 069336543..f79a9ab5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Stability for some Wemos clones by decreasing wifi Tx strength and adding small delay
+
 ### Changed
 
 - Debug log times show real internet time (if NTP enabled)
@@ -29,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- thermostat scan and autodetect deep functions
+
 ## [1.9.3] 2019-10-26
 
 ### Added
diff --git a/src/version.h b/src/version.h
index 46284f4ef..89a25f01c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b7"
+#define APP_VERSION "1.9.4b8"

From f8e3261033eedb82ea50466da53033ee3bdfb94f Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 09:46:55 +0100
Subject: [PATCH 056/120] added delay for wifi stability on ESP8266 clones

---
 src/MyESP.cpp | 4 ++++
 src/MyESP.h   | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 89930b269..d26329099 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -3129,6 +3129,10 @@ void MyESP::loop() {
         ESP.restart();
     }
 
+    if (MYESP_DELAY) {
+        delay(MYESP_DELAY); // some time to WiFi and everything else to catch up, and prevent overheating
+    }
+
     yield(); // ... and breath.
 }
 
diff --git a/src/MyESP.h b/src/MyESP.h
index d7ea53dce..3e78588fb 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.16"
+#define MYESP_VERSION "1.2.17"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -66,6 +66,10 @@ extern struct rst_info resetInfo;
 #define MYESP_WIFI_CONNECT_TIMEOUT 20000     // Connecting timeout for WIFI in ms (20 seconds)
 #define MYESP_WIFI_RECONNECT_INTERVAL 600000 // If could not connect to WIFI, retry after this time in ms. 10 minutes
 
+// set to value >0 if the ESP is overheating or there are timing issues. Recommend a value of 1.
+// initially set to 0 for no delay. Change to 1 if getting WDT resets from wifi
+#define MYESP_DELAY 1
+
 // MQTT
 #define MQTT_PORT 1883                  // MQTT port
 #define MQTT_RECONNECT_DELAY_MIN 2000   // Try to reconnect in 3 seconds upon disconnection

From 750198827cdddb0ba207252b41eef2a1ec81a149 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 09:47:10 +0100
Subject: [PATCH 057/120] exclude release target from auto builds

---
 scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index e0a868710..f8492d9af 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -134,7 +134,7 @@ fi
 travis=$(list_envs | grep travis | sort)
 
 # get all taregts, excluding travis and debug
-available=$(list_envs | grep -Ev -- 'travis|debug' | sort)
+available=$(list_envs | grep -Ev -- 'travis|debug|release' | sort)
 
 export PLATFORMIO_BUILD_FLAGS="${PLATFORMIO_BUILD_FLAGS}"
 

From 449dc229f52a5d35285043bf6e60be97a42506f0 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 09:47:33 +0100
Subject: [PATCH 058/120] mode support for all HCs -
 https://github.com/proddy/EMS-ESP/issues/206

---
 src/ems.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/ems.cpp b/src/ems.cpp
index 574d574fb..4254a406d 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -2887,7 +2887,6 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
             EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC4;
         }
 
-        // EMS_TxTelegram.type_validate = EMS_TYPE_RCPLUSStatusMessage; // validate by reading from a different telegram
         EMS_TxTelegram.type_validate = EMS_ID_NONE; // validate by reading from a different telegram
 
     } else if ((model_id == EMS_MODEL_RC35) || (model_id == EMS_MODEL_ES73)) {
@@ -3022,12 +3021,23 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
         EMS_TxTelegram.type_validate = EMS_TxTelegram.type;
 
     } else if (model_id == EMS_MODEL_RC300) {
-        EMS_TxTelegram.type   = EMS_TYPE_RCPLUSSet; // for 3000 and 1010, e.g. 48 10 FF 00 01 B9 00 for manual
         EMS_TxTelegram.offset = EMS_OFFSET_RCPLUSSet_mode;
 
-        // EMS_TxTelegram.type_validate = EMS_TYPE_RCPLUSStatusMessage_HC1; // validate by reading from a different telegram
-        EMS_TxTelegram.type_validate      = EMS_ID_NONE;                                   // don't validate after the write
-        EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC1 + hc_num - 1; // after write, do a full fetch of all values
+        if (hc_num == 1) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet;
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC1;
+        } else if (hc_num == 2) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet + 1;
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC2;
+        } else if (hc_num == 3) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet + 2;
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC3;
+        } else if (hc_num == 4) {
+            EMS_TxTelegram.type               = EMS_TYPE_RCPLUSSet + 3;
+            EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RCPLUSStatusMessage_HC4;
+        }
+
+        EMS_TxTelegram.type_validate = EMS_ID_NONE; // don't validate after the write
     }
 
     EMS_TxTelegram.comparisonOffset = EMS_TxTelegram.offset;

From 1bb5afce5bc0ec1b868cddf453e0fb9222fb83ee Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 09:47:51 +0100
Subject: [PATCH 059/120] removed thermostat scan and autodetect deep

---
 src/ems-esp.cpp | 90 ++-----------------------------------------------
 1 file changed, 3 insertions(+), 87 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 9f0767c44..52323fdb9 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -33,9 +33,6 @@ DS18 ds18;
 #define APP_URL "https://github.com/proddy/EMS-ESP"
 #define APP_URL_API "https://api.github.com/repos/proddy/EMS-ESP"
 
-// set to value >0 if the ESP is overheating or there are timing issues. Recommend a value of 1.
-#define EMSESP_DELAY 0 // initially set to 0 for no delay. Change to 1 if getting WDT resets from wifi
-
 // timers, all values are in seconds
 #define DEFAULT_PUBLISHTIME 120 // every 2 minutes publish MQTT values, including Dallas sensors
 Ticker publishValuesTimer;
@@ -50,16 +47,6 @@ Ticker regularUpdatesTimer;
 #define LEDCHECK_TIME 500 // every 1/2 second blink the heartbeat LED
 Ticker ledcheckTimer;
 
-// thermostat scan - for debugging
-Ticker scanThermostat;
-#define SCANTHERMOSTAT_TIME 1
-uint8_t scanThermostat_count = 0;
-
-// ems bus scan
-Ticker scanDevices;
-#define SCANDEVICES_TIME 350 // ms
-uint8_t scanDevices_count;
-
 Ticker showerColdShotStopTimer;
 
 // if using the shower timer, change these settings
@@ -127,12 +114,11 @@ static const command_t project_cmds[] PROGMEM = {
     {false, "refresh", "fetch values from the EMS devices"},
     {false, "devices [all]", "list all supported and detected EMS devices"},
     {false, "queue", "show current Tx queue"},
-    {false, "autodetect [quick | deep]", "detect EMS devices and attempt to automatically set boiler and thermostat types"},
+    {false, "autodetect [quick]", "detect EMS devices and attempt to automatically set boiler and thermostat types"},
     {false, "send XX ...", "send raw telegram data to EMS bus (XX are hex values)"},
     {false, "thermostat read <type ID>", "send read request to the thermostat for heating circuit hc 1-4"},
     {false, "thermostat temp [hc] <degrees>", "set current thermostat temperature"},
     {false, "thermostat mode [hc] <mode>", "set mode (0=off, 1=manual, 2=auto) for heating circuit hc 1-4"},
-    {false, "thermostat scan <type ID>", "probe thermostat on all type id responses"},
     {false, "boiler read <type ID>", "send read request to boiler"},
     {false, "boiler wwtemp <degrees>", "set boiler warm water temperature"},
     {false, "boiler tapwater <on | off>", "set boiler warm tap water on/off"},
@@ -928,15 +914,6 @@ void do_ledcheck() {
     }
 }
 
-// Thermostat scan
-void do_scanThermostat() {
-    if (ems_getBusConnected()) {
-        myDebug_P(PSTR("> Scanning thermostat message type #0x%02X..."), scanThermostat_count);
-        ems_doReadCommand(scanThermostat_count, EMS_Thermostat.device_id);
-        scanThermostat_count++;
-    }
-}
-
 // do a system health check every now and then to see if we all connections
 void do_systemCheck() {
     if (!ems_getBusConnected() && !myESP.getUseSerial()) {
@@ -955,57 +932,6 @@ void do_regularUpdates() {
     }
 }
 
-// stop devices scan and restart all other timers
-void stopDeviceScan() {
-    publishValuesTimer.attach(EMSESP_Settings.publish_time, do_publishValues);             // post MQTT EMS values
-    publishSensorValuesTimer.attach(EMSESP_Settings.publish_time, do_publishSensorValues); // post MQTT sensor values
-    regularUpdatesTimer.attach(REGULARUPDATES_TIME, do_regularUpdates);                    // regular reads from the EMS
-    systemCheckTimer.attach(SYSTEMCHECK_TIME, do_systemCheck);                             // check if Boiler is online
-    scanThermostat_count = 0;
-    scanThermostat.detach();
-}
-
-// EMS device scan
-void do_scanDevices() {
-    if (scanDevices_count == 0) {
-        // we're at the finish line
-        myDebug_P(PSTR("Finished the deep EMS device scan."));
-        stopDeviceScan();
-        ems_printDevices();
-        ems_setLogging(EMS_SYS_LOGGING_NONE);
-        return;
-    }
-
-    if (ems_getBusConnected()) {
-        ems_doReadCommand(EMS_TYPE_Version, scanDevices_count++); // ask for version
-    }
-}
-
-// initiate a force scan by sending a version command to all type ids
-void startDeviceScan() {
-    publishValuesTimer.detach();
-    systemCheckTimer.detach();
-    regularUpdatesTimer.detach();
-    publishSensorValuesTimer.detach();
-    scanDevices_count = 1; // starts at 1
-    ems_clearDeviceList(); // empty the current list
-    ems_setLogging(EMS_SYS_LOGGING_NONE);
-    myDebug_P(PSTR("Starting a deep EMS device scan. This can take up to 2 minutes. Please wait..."));
-    scanThermostat.attach_ms(SCANDEVICES_TIME, do_scanDevices);
-}
-
-// initiate a force scan by sending type read requests from 0 to FF to the thermostat
-// used to analyze responses for debugging
-void startThermostatScan(uint8_t start) {
-    ems_setLogging(EMS_SYS_LOGGING_THERMOSTAT);
-    publishValuesTimer.detach();
-    systemCheckTimer.detach();
-    regularUpdatesTimer.detach();
-    scanThermostat_count = start;
-    myDebug_P(PSTR("Starting a deep message scan on thermostat"));
-    scanThermostat.attach(SCANTHERMOSTAT_TIME, do_scanThermostat);
-}
-
 // turn back on the hot water for the shower
 void _showerColdShotStop() {
     if (EMSESP_Shower.doingColdShot) {
@@ -1342,10 +1268,7 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
     if (strcmp(first_cmd, "autodetect") == 0) {
         if (wc == 2) {
             char * second_cmd = _readWord();
-            if (strcmp(second_cmd, "deep") == 0) {
-                startDeviceScan();
-                ok = true;
-            } else if (strcmp(second_cmd, "quick") == 0) {
+            if (strcmp(second_cmd, "quick") == 0) {
                 ems_clearDeviceList();
                 ems_doReadCommand(EMS_TYPE_UBADevices, EMS_Boiler.device_id);
                 ok = true;
@@ -1403,9 +1326,6 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
         } else if (strcmp(second_cmd, "read") == 0) {
             ems_doReadCommand(_readHexNumber(), EMS_Thermostat.device_id);
             ok = true;
-        } else if (strcmp(second_cmd, "scan") == 0) {
-            startThermostatScan(_readIntNumber());
-            ok = true;
         }
     }
 
@@ -2086,7 +2006,7 @@ void loop() {
 
     // publish all the values to MQTT, only if the values have changed
     // although we don't want to publish when doing a deep scan of the thermostat
-    if (ems_getEmsRefreshed() && (scanThermostat_count == 0)) {
+    if (ems_getEmsRefreshed()) {
         publishValues(false);
         do_publishSensorValues();
         ems_setEmsRefreshed(false); // reset
@@ -2096,8 +2016,4 @@ void loop() {
     if (EMSESP_Settings.shower_timer) {
         showerCheck();
     }
-
-    if (EMSESP_DELAY) {
-        delay(EMSESP_DELAY); // some time to WiFi and everything else to catch up, and prevent overheating
-    }
 }

From 2157004c102efdb4674d3b1c721cd860b1e7260f Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 11:48:49 +0100
Subject: [PATCH 060/120] using never instead of default for webhook

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a1633459..fc4d9ac79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,6 @@ notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/57e15f7798656d888194
-    on_success: change # options: [always|never|change] default: always
-    on_failure: never # options: [always|never|change] default: always
-    on_start: false # default: false
+    on_success: always
+    on_failure: never
+    on_start: never

From 1a8692a9658b5237fc998538994a743f42c8a0f5 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 12:02:17 +0100
Subject: [PATCH 061/120] fix for RC35 modes (auto, day, night)

---
 src/ems-esp.cpp | 12 ++++++++++++
 src/version.h   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 52323fdb9..bf27bc164 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -168,6 +168,14 @@ _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
         } else if (mode == 2) {
             thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
+    } else { // default for all other thermostats
+        if (mode == 0) {
+            thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
+        } else if (mode == 1) {
+            thermoMode = EMS_THERMOSTAT_MODE_DAY;
+        } else if (mode == 2) {
+            thermoMode = EMS_THERMOSTAT_MODE_AUTO;
+        }
     }
 
     return thermoMode;
@@ -444,6 +452,10 @@ void showInfo() {
                     myDebug_P(PSTR("   Mode is set to manual"));
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
                     myDebug_P(PSTR("   Mode is set to auto"));
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
+                    myDebug_P(PSTR("   Mode is set to night"));
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
+                    myDebug_P(PSTR("   Mode is set to day"));
                 }
 
                 // Render Thermostat Day Mode
diff --git a/src/version.h b/src/version.h
index 89a25f01c..99a0cd1d7 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b8"
+#define APP_VERSION "1.9.4b9"

From b2bd389795fd5c311ef469476498b5649c7fffb8 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 21:46:56 +0100
Subject: [PATCH 062/120] sync ntp clock every 12 hrs instead of 1

---
 src/Ntp.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Ntp.h b/src/Ntp.h
index 078e04bc6..05a55b530 100644
--- a/src/Ntp.h
+++ b/src/Ntp.h
@@ -13,9 +13,9 @@
 #include "TimeLib.h" // customized version of the Time library
 #include "Timezone.h"
 
-#define NTP_PACKET_SIZE 48      // NTP time is in the first 48 bytes of the message
-#define NTP_INTERVAL_DEFAULT 60 // every hour
-#define NTP_TIMEZONE_DEFAULT 2  // CE
+#define NTP_PACKET_SIZE 48       // NTP time is in the first 48 bytes of the message
+#define NTP_INTERVAL_DEFAULT 720 // every 12 hours
+#define NTP_TIMEZONE_DEFAULT 2   // CE
 #define NTP_TIMEZONE_MAX 11
 
 class NtpClient {

From 44ebdd4774fc008b797fe9ce1f6d0ea2889610db Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Fri, 8 Nov 2019 21:50:31 +0100
Subject: [PATCH 063/120] text changes

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

diff --git a/src/ems_devices.h b/src/ems_devices.h
index e072bc931..19948c23e 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -195,7 +195,7 @@ typedef enum {
 const _Boiler_Device Boiler_Devices[] = {
 
     {72, "MC10 Module"},
-    {123, "Buderus GBx72/Nefit Trendline/Junkers Cerapur/Worcester Greenstar Si"},
+    {123, "Buderus GBx72/Nefit Trendline/Junkers Cerapur/Worcester Greenstar Si/27i"},
     {133, "Buderus GB125/Logamatic MC110"},
     {115, "Nefit Topline/Buderus GB162"},
     {203, "Buderus Logamax U122/Junkers Cerapur"},
@@ -250,7 +250,7 @@ const _Other_Device Other_Devices[] = {
     {114, 0x09, "BC10 Base Controller"},
     {125, 0x09, "BC25 Base Controller"},
     {169, 0x09, "BC40 Base Controller"},
-    {152, 0x09, "Junkers Controller"},
+    {152, 0x09, "Controller"},
     {95, 0x09, "HT3 Controller"},
     {230, 0x09, "BC Base Controller"},
 

From 4450b50aae5d67d687979de435408db77bf0cfe9 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 11:59:43 +0100
Subject: [PATCH 064/120] removed publish_always, change how publish_time works

---
 CHANGELOG.md                |   6 +-
 src/custom.htm              |  19 +-----
 src/custom.js               |  12 +---
 src/ems-esp.cpp             | 113 ++++++++++++++++++++----------------
 src/ems.cpp                 |   5 +-
 tools/wsemulator/wserver.js |   3 +-
 6 files changed, 74 insertions(+), 84 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f79a9ab5e..e7ce26930 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.9.4 beta]
 
+There are breaking changes in this release. See `publish_time` below and make sure you set this value to 0.
+
 ### Added
 
 - Added `publish_always` forcing MQTT topics to be always sent regardless if the data hasn't changed
@@ -28,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fixed version numbers of libraries in `platformio.ini`
 - Normalized Heating modes to `off`, `manual`, `auto`, `night` and `day` to keep generic and not Home Assistant specific (like `heat`)
 - Keeping Thermostat day/night modes separate from off/auto/manual, and setting this for the Junkers FR50
+- Removed `publish_always` and use `publish_time`. For automatic mode you will need to change `publish_time` to 0 which will send MQTT every time data has changed (every 10 seconds).
+- Changed NTP interval from 1 hour to 12 hours
 
 ### Removed
 
@@ -201,7 +205,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - publish dallas external temp sensors to MQTT (thanks @JewelZB)
 - shower timer and shower alert options available via set commands
 - added support for warm water modes Hot, Comfort and Intelligent [(issue 67)](https://github.com/proddy/EMS-ESP/issues/67)
-- added `set publish_time` to set how often to publish MQTT
+- added `set publish_time` to set how often to force a publish of MQTT
 - support for SM10 Solar Module including MQTT [(issue 77)](https://github.com/proddy/EMS-ESP/issues/77)
 - `refresh` command to force a fetch of all known data from the connected EMS devices
 
diff --git a/src/custom.htm b/src/custom.htm
index 21e871205..0f4d2abdf 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -114,29 +114,14 @@
     <div class="row form-group">
         <label class="col-xs-3">Publish Time<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="How often to send MQTT topics with stats (in seconds)"></i></label>
+                data-content="How often to send MQTT topics with stats. 0 is automatic. (in seconds)"></i></label>
         <span class="col-xs-9">
-            <input class="form-control input-sm" placeholder="120" value="" style="display:inline;max-width:185px"
+            <input class="form-control input-sm" placeholder="0" value="" style="display:inline;max-width:185px"
                 id="publish_time" type="text">
         </span>
         <br>
     </div>
 
-    <div class="row form-group">
-        <label class="col-xs-3">Publish Always<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
-                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="Always send MQTT topics, regardless if the payload hasn't changed"></i></label>
-        <span class="col-xs-9">
-            <form>
-                <label class="radio-inline">
-                    <input type="radio" value="1" name="publish_always">Enabled</label>
-                <label class="radio-inline">
-                    <input type="radio" value="0" name="publish_always" checked>Disabled</label>
-            </form>
-        </span>
-        <br>
-    </div>
-
     <div class="row form-group">
         <label class="col-xs-3">Tx mode<i style="margin-left: 10px;"
                 class="glyphicon glyphicon-exclamation-sign text-danger" aria-hidden="true" data-toggle="popover"
diff --git a/src/custom.js b/src/custom.js
index 416c7a13e..18f64b74c 100644
--- a/src/custom.js
+++ b/src/custom.js
@@ -8,8 +8,7 @@ var custom_config = {
         "listen_mode": false,
         "shower_timer": false,
         "shower_alert": false,
-        "publish_time": 120,
-        "publish_always": false,
+        "publish_time": 0,
         "tx_mode": 1
     }
 };
@@ -40,10 +39,6 @@ function listcustom() {
     if (custom_config.settings.shower_alert) {
         $("input[name=\"shower_alert\"][value=\"1\"]").prop("checked", true);
     }
-
-    if (custom_config.settings.publish_always) {
-        $("input[name=\"publish_always\"][value=\"1\"]").prop("checked", true);
-    }
 }
 
 function savecustom() {
@@ -75,11 +70,6 @@ function savecustom() {
         custom_config.settings.led = true;
     }
 
-    custom_config.settings.publish_always = false;
-    if (parseInt($("input[name=\"publish_always\"]:checked").val()) === 1) {
-        custom_config.settings.publish_always = true;
-    }
-
     custom_config.settings.publish_time = parseInt(document.getElementById("publish_time").value);
     custom_config.settings.tx_mode = parseInt(document.getElementById("tx_mode").value);
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index bf27bc164..154ff2ae9 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -34,10 +34,12 @@ DS18 ds18;
 #define APP_URL_API "https://api.github.com/repos/proddy/EMS-ESP"
 
 // timers, all values are in seconds
-#define DEFAULT_PUBLISHTIME 120 // every 2 minutes publish MQTT values, including Dallas sensors
+#define DEFAULT_PUBLISHTIME 0
 Ticker publishValuesTimer;
 Ticker publishSensorValuesTimer;
 
+bool _need_first_publish = true; // this ensures on boot we always send out MQTT messages
+
 #define SYSTEMCHECK_TIME 30 // every 30 seconds check if EMS can be reached
 Ticker systemCheckTimer;
 
@@ -74,7 +76,6 @@ typedef struct {
     bool     led;             // LED on/off
     bool     listen_mode;     // stop automatic Tx on/off
     uint16_t publish_time;    // frequency of MQTT publish in seconds
-    bool     publish_always;  // true if publish MQTT regardless if data has changed
     uint8_t  led_gpio;        // pin for LED
     uint8_t  dallas_gpio;     // pin for attaching external dallas temperature sensors
     bool     dallas_parasite; // on/off is using parasite
@@ -98,9 +99,7 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "listen_mode <on | off>", "when set to on all automatic Tx are disabled"},
     {true, "shower_timer <on | off>", "send MQTT notification on all shower durations"},
     {true, "shower_alert <on | off>", "stop hot water to send 3 cold burst warnings after max shower time is exceeded"},
-    {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"},
-    {true, "publish_always <on | off>", "set to on to skip payload comparison since last publish"},
-
+    {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=automatic)"},
     {true, "tx_mode <n>", "changes Tx logic. 1=EMS generic, 2=EMS+, 3=HT3"},
 
     {false, "info", "show current captured on the devices"},
@@ -507,12 +506,16 @@ void showInfo() {
 }
 
 // send all dallas sensor values as a JSON package to MQTT
-void publishSensorValues() {
+void publishSensorValues(bool force) {
     // don't send if MQTT is connected
     if (!myESP.isMQTTConnected()) {
         return;
     }
 
+    if (!EMSESP_Settings.dallas_sensors) {
+        return; // no sensors attached
+    }
+
     StaticJsonDocument<200> doc;
     JsonObject              sensors = doc.to<JsonObject>();
 
@@ -530,11 +533,29 @@ void publishSensorValues() {
         }
     }
 
-    if (hasdata) {
-        char data[200] = {0};
-        serializeJson(doc, data, sizeof(data));
-        myDebugLog("Publishing external sensor data via MQTT");
-        myESP.mqttPublish(TOPIC_EXTERNAL_SENSORS, data);
+    if (!hasdata) {
+        return; // nothing to send
+    }
+
+    CRC32    crc;
+    uint32_t fchecksum;
+
+    char data[200] = {0};
+    serializeJson(doc, data, sizeof(data));
+
+    size_t jsonSize = measureJson(doc);
+    if (hasdata && (jsonSize > 2)) {
+        // calculate hash and send values if something has changed, to save unnecessary wifi traffic
+        for (uint8_t i = 0; i < (jsonSize - 1); i++) {
+            crc.update(data[i]);
+        }
+        fchecksum = crc.finalize();
+        static uint32_t previousSensorPublishCRC; // CRC check for new values
+        if ((previousSensorPublishCRC != fchecksum) || force) {
+            previousSensorPublishCRC = fchecksum;
+            myDebugLog("Publishing external sensor data via MQTT");
+            myESP.mqttPublish(TOPIC_EXTERNAL_SENSORS, data);
+        }
     }
 }
 
@@ -542,19 +563,18 @@ void publishSensorValues() {
 // a json object is created for the boiler and one for the thermostat
 // CRC check is done to see if there are changes in the values since the last send to avoid too much wifi traffic
 // a check is done against the previous values and if there are changes only then they are published. Unless force=true
-void publishValues(bool force) {
+void publishEMSValues(bool force) {
     // don't send if MQTT is not connected
     if (!myESP.isMQTTConnected()) {
         return;
     }
 
-    // don't publish is publish time is set to 0
-    if (EMSESP_Settings.publish_time == 0) {
-        return;
+    if (!ems_getBusConnected()) {
+        return; // EMS bus is not connected
     }
 
-    // override force
-    if (EMSESP_Settings.publish_always) {
+    // override force id not on automatic mode. Always send values is there is a publish_time set
+    if (EMSESP_Settings.publish_time != 0) {
         force = true;
     }
 
@@ -900,17 +920,12 @@ void publishValues(bool force) {
 
 // publish external dallas sensor temperature values to MQTT
 void do_publishSensorValues() {
-    if ((EMSESP_Settings.dallas_sensors) && (EMSESP_Settings.publish_time)) {
-        publishSensorValues();
-    }
+    publishSensorValues(true); // force publish
 }
 
 // call PublishValues without forcing, so using CRC to see if we really need to publish
 void do_publishValues() {
-    // don't publish if we're not connected to the EMS bus
-    if ((ems_getBusConnected()) && myESP.isMQTTConnected() && EMSESP_Settings.publish_time) {
-        publishValues(true); // force publish
-    }
+    publishEMSValues(true); // force publish
 }
 
 // callback to light up the LED, called via Ticker every second
@@ -993,7 +1008,6 @@ bool LoadSaveCallback(MYESP_FSACTION_t action, JsonObject settings) {
         EMSESP_Settings.shower_timer    = settings["shower_timer"];
         EMSESP_Settings.shower_alert    = settings["shower_alert"];
         EMSESP_Settings.publish_time    = settings["publish_time"] | DEFAULT_PUBLISHTIME;
-        EMSESP_Settings.publish_always  = settings["publish_always"];
 
         EMSESP_Settings.listen_mode = settings["listen_mode"];
         ems_setTxDisabled(EMSESP_Settings.listen_mode);
@@ -1013,7 +1027,6 @@ bool LoadSaveCallback(MYESP_FSACTION_t action, JsonObject settings) {
         settings["shower_timer"]    = EMSESP_Settings.shower_timer;
         settings["shower_alert"]    = EMSESP_Settings.shower_alert;
         settings["publish_time"]    = EMSESP_Settings.publish_time;
-        settings["publish_always"]  = EMSESP_Settings.publish_always;
         settings["tx_mode"]         = EMSESP_Settings.tx_mode;
 
         return true;
@@ -1148,19 +1161,6 @@ bool SetListCallback(MYESP_FSACTION_t action, uint8_t wc, const char * setting,
             ok                           = true;
         }
 
-        // publish_always
-        if ((strcmp(setting, "publish_always") == 0) && (wc == 2)) {
-            if (strcmp(value, "on") == 0) {
-                EMSESP_Settings.publish_always = true;
-                ok                             = true;
-            } else if (strcmp(value, "off") == 0) {
-                EMSESP_Settings.publish_always = false;
-                ok                             = true;
-            } else {
-                myDebug_P(PSTR("Error. Usage: set publish_always <on | off>"));
-            }
-        }
-
         // tx_mode
         if ((strcmp(setting, "tx_mode") == 0) && (wc == 2)) {
             uint8_t mode = atoi(value);
@@ -1184,7 +1184,6 @@ bool SetListCallback(MYESP_FSACTION_t action, uint8_t wc, const char * setting,
         myDebug_P(PSTR("  shower_timer=%s"), EMSESP_Settings.shower_timer ? "on" : "off");
         myDebug_P(PSTR("  shower_alert=%s"), EMSESP_Settings.shower_alert ? "on" : "off");
         myDebug_P(PSTR("  publish_time=%d"), EMSESP_Settings.publish_time);
-        myDebug_P(PSTR("  publish_always=%s"), EMSESP_Settings.publish_always ? "on" : "off");
     }
 
     return ok;
@@ -1589,7 +1588,7 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
     if (strcmp(topic, TOPIC_BOILER_CMD_WWTEMP) == 0) {
         uint8_t t = atoi((char *)message);
         ems_setWarmWaterTemp(t);
-        publishValues(true);
+        publishEMSValues(true);
         return;
     }
 
@@ -1599,7 +1598,7 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
     if (hc) {
         float f = strtof((char *)message, 0);
         ems_setThermostatTemp(f, hc);
-        publishValues(true); // publish back immediately
+        publishEMSValues(true); // publish back immediately
         return;
     }
 
@@ -1632,7 +1631,7 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
         if (hc) {
             float f = doc["data"];
             ems_setThermostatTemp(f, hc);
-            publishValues(true); // publish back immediately
+            publishEMSValues(true); // publish back immediately
             return;
         }
 
@@ -1862,7 +1861,6 @@ void initEMSESP() {
     EMSESP_Settings.led            = true; // LED is on by default
     EMSESP_Settings.listen_mode    = false;
     EMSESP_Settings.publish_time   = DEFAULT_PUBLISHTIME;
-    EMSESP_Settings.publish_always = false;
     EMSESP_Settings.dallas_sensors = 0;
     EMSESP_Settings.led_gpio       = EMSESP_LED_GPIO;
     EMSESP_Settings.dallas_gpio    = EMSESP_DALLAS_GPIO;
@@ -1985,6 +1983,7 @@ void setup() {
     }
 
     // set timers for MQTT publish
+    // only if publish_time is not 0 (automatic mode)
     if (EMSESP_Settings.publish_time) {
         publishValuesTimer.attach(EMSESP_Settings.publish_time, do_publishValues);             // post MQTT EMS values
         publishSensorValuesTimer.attach(EMSESP_Settings.publish_time, do_publishSensorValues); // post MQTT dallas sensor values
@@ -2007,8 +2006,7 @@ void setup() {
 // Main loop
 //
 void loop() {
-    // the main loop
-    myESP.loop();
+    myESP.loop(); // handle telnet, mqtt, wifi etc
 
     // check Dallas sensors, using same schedule as publish_time (default 2 mins)
     // these values are published to MQTT separately via the timer publishSensorValuesTimer
@@ -2016,12 +2014,25 @@ void loop() {
         ds18.loop();
     }
 
-    // publish all the values to MQTT, only if the values have changed
-    // although we don't want to publish when doing a deep scan of the thermostat
+    // check if we have data from the EMS bus
     if (ems_getEmsRefreshed()) {
-        publishValues(false);
-        do_publishSensorValues();
-        ems_setEmsRefreshed(false); // reset
+        // if we have an EMS connect go and fetch some data and publish it (by force)
+        if (_need_first_publish) {
+            do_regularUpdates();
+            publishEMSValues(true);
+            publishSensorValues(true);
+            _need_first_publish = false; // reset flag
+        }
+
+        // publish all the values to MQTT
+        // but only if the values have changed and publish_time is on automatic mode
+        // always publish when we get the first results, regardless of any publish_time setting
+        if (EMSESP_Settings.publish_time == 0) {
+            publishEMSValues(false);
+            publishSensorValues(false);
+        }
+
+        ems_setEmsRefreshed(false); // reset flag
     }
 
     // do shower logic, if enabled
diff --git a/src/ems.cpp b/src/ems.cpp
index 4254a406d..185493cba 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -2287,6 +2287,7 @@ void ems_printTxQueue() {
 
 /**
  * Generic function to return various settings from the thermostat
+ * This is called manually to fetch values which don't come from broadcast messages
  */
 void ems_getThermostatValues() {
     if (!ems_getThermostatEnabled()) {
@@ -2994,13 +2995,13 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
     if (model_id == EMS_MODEL_RC20) {
         EMS_TxTelegram.type               = EMS_TYPE_RC20Set;
         EMS_TxTelegram.offset             = EMS_OFFSET_RC20Set_mode;
-        EMS_TxTelegram.type_validate      = EMS_TxTelegram.type;
+        EMS_TxTelegram.type_validate      = EMS_TYPE_RC20Set;
         EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC20StatusMessage;
 
     } else if (model_id == EMS_MODEL_RC30) {
         EMS_TxTelegram.type               = EMS_TYPE_RC30Set;
         EMS_TxTelegram.offset             = EMS_OFFSET_RC30Set_mode;
-        EMS_TxTelegram.type_validate      = EMS_TxTelegram.type;
+        EMS_TxTelegram.type_validate      = EMS_TYPE_RC30Set;
         EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC30StatusMessage;
 
     } else if ((model_id == EMS_MODEL_RC35) || (model_id == EMS_MODEL_ES73)) {
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index d4f9976cb..c96477ab8 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -103,8 +103,7 @@ var custom_configfile = {
         "listen_mode": false,
         "shower_timer": true,
         "shower_alert": false,
-        "publish_time": 120,
-        "publish_always": false,
+        "publish_time": 0,
         "tx_mode": 1
     }
 };

From daddca2a339af58e9e822b8a7960448dbd065cb8 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 12:00:09 +0100
Subject: [PATCH 065/120] ntp interval time from byte to short

---
 src/MyESP.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/MyESP.h b/src/MyESP.h
index 3e78588fb..b2738bcd2 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.17"
+#define MYESP_VERSION "1.2.18"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -488,10 +488,10 @@ class MyESP {
     void _webResetAllPage();
 
     // ntp
-    char *  _ntp_server;
-    uint8_t _ntp_interval;
-    bool    _ntp_enabled;
-    uint8_t _ntp_timezone;
+    char *   _ntp_server;
+    uint16_t _ntp_interval;
+    bool     _ntp_enabled;
+    uint8_t  _ntp_timezone;
 };
 
 extern MyESP myESP;

From 2303d06549f134f4edfca156c0ad76daea9ece46 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 12:00:22 +0100
Subject: [PATCH 066/120] text changes

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

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index d26329099..c32617c89 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -735,14 +735,14 @@ void MyESP::_printSetCommands() {
     myDebug_P(PSTR("  set <wifi_ssid | wifi_password> [value]"));
     myDebug_P(PSTR("  set mqtt_enabled <on | off>"));
     myDebug_P(PSTR("  set <mqtt_ip | mqtt_username | mqtt_password> [value]"));
-    myDebug_P(PSTR("  set mqtt_heartbeat <on | off>"));
+    myDebug_P(PSTR("  set mqtt_heartbeat <on | off> (every 2 mins)"));
     myDebug_P(PSTR("  set mqtt_base [string]"));
     myDebug_P(PSTR("  set mqtt_port [number]"));
-    myDebug_P(PSTR("  set mqtt_qos [0,1,2,3]"));
+    myDebug_P(PSTR("  set mqtt_qos [0-3]"));
     myDebug_P(PSTR("  set mqtt_keepalive [seconds]"));
     myDebug_P(PSTR("  set mqtt_retain [on | off]"));
     myDebug_P(PSTR("  set ntp_enabled <on | off>"));
-    myDebug_P(PSTR("  set ntp_interval [n]"));
+    myDebug_P(PSTR("  set ntp_interval [minutes]"));
     myDebug_P(PSTR("  set ntp_timezone [n]"));
     myDebug_P(PSTR("  set serial <on | off>"));
     myDebug_P(PSTR("  set log_events <on | off>"));
@@ -3129,11 +3129,7 @@ void MyESP::loop() {
         ESP.restart();
     }
 
-    if (MYESP_DELAY) {
-        delay(MYESP_DELAY); // some time to WiFi and everything else to catch up, and prevent overheating
-    }
-
-    yield(); // ... and breath.
+    delay(MYESP_DELAY); // some time to WiFi and everything else to catch up, and prevent overheating
 }
 
 MyESP myESP;

From 0f9874e9bd9e7b5a798adc5fe3e7ac1d791d4b8f Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 12:40:41 +0100
Subject: [PATCH 067/120] upgrade bootstrap to 3.4.1

---
 src/websrc/3rdparty/css/bootstrap-3.3.7.min.css | 6 ------
 src/websrc/3rdparty/css/bootstrap-3.4.1.min.css | 6 ++++++
 src/websrc/3rdparty/js/bootstrap-3.3.7.min.js   | 7 -------
 src/websrc/3rdparty/js/bootstrap-3.4.1.min.js   | 6 ++++++
 tools/webfilesbuilder/gulpfile.js               | 4 ++--
 5 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 src/websrc/3rdparty/css/bootstrap-3.3.7.min.css
 create mode 100644 src/websrc/3rdparty/css/bootstrap-3.4.1.min.css
 delete mode 100644 src/websrc/3rdparty/js/bootstrap-3.3.7.min.js
 create mode 100644 src/websrc/3rdparty/js/bootstrap-3.4.1.min.js

diff --git a/src/websrc/3rdparty/css/bootstrap-3.3.7.min.css b/src/websrc/3rdparty/css/bootstrap-3.3.7.min.css
deleted file mode 100644
index ed3905e0e..000000000
--- a/src/websrc/3rdparty/css/bootstrap-3.3.7.min.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/src/websrc/3rdparty/css/bootstrap-3.4.1.min.css b/src/websrc/3rdparty/css/bootstrap-3.4.1.min.css
new file mode 100644
index 000000000..5b96335ff
--- /dev/null
+++ b/src/websrc/3rdparty/css/bootstrap-3.4.1.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.4.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;-moz-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:"Glyphicons Halflings";src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format("embedded-opentype"),url(../fonts/glyphicons-halflings-regular.woff2) format("woff2"),url(../fonts/glyphicons-halflings-regular.woff) format("woff"),url(../fonts/glyphicons-halflings-regular.ttf) format("truetype"),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format("svg")}.glyphicon{position:relative;top:1px;display:inline-block;font-family:"Glyphicons Halflings";font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:"\2014 \00A0"}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:""}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:"\00A0 \2014"}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.row-no-gutters{margin-right:0;margin-left:0}.row-no-gutters [class*=col-]{padding-right:0;padding-left:0}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;appearance:none}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s,-webkit-box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],.input-group-sm input[type=time],input[type=date].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm,input[type=time].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],.input-group-lg input[type=time],input[type=date].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg,input[type=time].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);opacity:.65;-webkit-box-shadow:none;box-shadow:none}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;background-image:none;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;background-image:none;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;background-image:none;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;background-image:none;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;background-image:none;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;background-image:none;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-right:15px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-right:-15px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0%;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out,-o-transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;line-break:auto;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;font-size:12px;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;line-break:auto;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;font-size:14px;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover>.arrow{border-width:11px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;transition:transform .6s ease-in-out,-webkit-transform .6s ease-in-out,-o-transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);left:0}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);left:0}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);left:0}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;outline:0;filter:alpha(opacity=90);opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:"\2039"}.carousel-control .icon-next:before{content:"\203a"}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
+/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/src/websrc/3rdparty/js/bootstrap-3.3.7.min.js b/src/websrc/3rdparty/js/bootstrap-3.3.7.min.js
deleted file mode 100644
index 9bcd2fcca..000000000
--- a/src/websrc/3rdparty/js/bootstrap-3.3.7.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under the MIT license
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){if(a(b.target).is(this))return b.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.7",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a("#"===f?[]:f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.7",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c).prop(c,!0)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c).prop(c,!1))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target).closest(".btn");b.call(d,"toggle"),a(c.target).is('input[type="radio"], input[type="checkbox"]')||(c.preventDefault(),d.is("input,button")?d.trigger("focus"):d.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(a>this.$items.length-1||a<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.7",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.7",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){document===a.target||this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);if(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),!c.isInStateTrue())return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);if(this.$element.trigger(g),!g.isDefaultPrevented())return f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=window.SVGElement&&c instanceof window.SVGElement,g=d?{top:0,left:0}:f?null:b.offset(),h={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},i=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,h,i,g)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null,a.$element=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.7",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.7",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){
-this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e<c&&"top";if("bottom"==this.affixed)return null!=c?!(e+this.unpin<=f.top)&&"bottom":!(e+g<=a-d)&&"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&e<=c?"top":null!=d&&i+j>=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/src/websrc/3rdparty/js/bootstrap-3.4.1.min.js b/src/websrc/3rdparty/js/bootstrap-3.4.1.min.js
new file mode 100644
index 000000000..eb0a8b410
--- /dev/null
+++ b/src/websrc/3rdparty/js/bootstrap-3.4.1.min.js
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.4.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");!function(t){"use strict";var e=jQuery.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||3<e[0])throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(),function(n){"use strict";n.fn.emulateTransitionEnd=function(t){var e=!1,i=this;n(this).one("bsTransitionEnd",function(){e=!0});return setTimeout(function(){e||n(i).trigger(n.support.transition.end)},t),this},n(function(){n.support.transition=function o(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(t.style[i]!==undefined)return{end:e[i]};return!1}(),n.support.transition&&(n.event.special.bsTransitionEnd={bindType:n.support.transition.end,delegateType:n.support.transition.end,handle:function(t){if(n(t.target).is(this))return t.handleObj.handler.apply(this,arguments)}})})}(jQuery),function(s){"use strict";var e='[data-dismiss="alert"]',a=function(t){s(t).on("click",e,this.close)};a.VERSION="3.4.1",a.TRANSITION_DURATION=150,a.prototype.close=function(t){var e=s(this),i=e.attr("data-target");i||(i=(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]*$)/,"")),i="#"===i?[]:i;var o=s(document).find(i);function n(){o.detach().trigger("closed.bs.alert").remove()}t&&t.preventDefault(),o.length||(o=e.closest(".alert")),o.trigger(t=s.Event("close.bs.alert")),t.isDefaultPrevented()||(o.removeClass("in"),s.support.transition&&o.hasClass("fade")?o.one("bsTransitionEnd",n).emulateTransitionEnd(a.TRANSITION_DURATION):n())};var t=s.fn.alert;s.fn.alert=function o(i){return this.each(function(){var t=s(this),e=t.data("bs.alert");e||t.data("bs.alert",e=new a(this)),"string"==typeof i&&e[i].call(t)})},s.fn.alert.Constructor=a,s.fn.alert.noConflict=function(){return s.fn.alert=t,this},s(document).on("click.bs.alert.data-api",e,a.prototype.close)}(jQuery),function(s){"use strict";var n=function(t,e){this.$element=s(t),this.options=s.extend({},n.DEFAULTS,e),this.isLoading=!1};function i(o){return this.each(function(){var t=s(this),e=t.data("bs.button"),i="object"==typeof o&&o;e||t.data("bs.button",e=new n(this,i)),"toggle"==o?e.toggle():o&&e.setState(o)})}n.VERSION="3.4.1",n.DEFAULTS={loadingText:"loading..."},n.prototype.setState=function(t){var e="disabled",i=this.$element,o=i.is("input")?"val":"html",n=i.data();t+="Text",null==n.resetText&&i.data("resetText",i[o]()),setTimeout(s.proxy(function(){i[o](null==n[t]?this.options[t]:n[t]),"loadingText"==t?(this.isLoading=!0,i.addClass(e).attr(e,e).prop(e,!0)):this.isLoading&&(this.isLoading=!1,i.removeClass(e).removeAttr(e).prop(e,!1))},this),0)},n.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var t=s.fn.button;s.fn.button=i,s.fn.button.Constructor=n,s.fn.button.noConflict=function(){return s.fn.button=t,this},s(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(t){var e=s(t.target).closest(".btn");i.call(e,"toggle"),s(t.target).is('input[type="radio"], input[type="checkbox"]')||(t.preventDefault(),e.is("input,button")?e.trigger("focus"):e.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(t){s(t.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(t.type))})}(jQuery),function(p){"use strict";var c=function(t,e){this.$element=p(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=e,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",p.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",p.proxy(this.pause,this)).on("mouseleave.bs.carousel",p.proxy(this.cycle,this))};function r(n){return this.each(function(){var t=p(this),e=t.data("bs.carousel"),i=p.extend({},c.DEFAULTS,t.data(),"object"==typeof n&&n),o="string"==typeof n?n:i.slide;e||t.data("bs.carousel",e=new c(this,i)),"number"==typeof n?e.to(n):o?e[o]():i.interval&&e.pause().cycle()})}c.VERSION="3.4.1",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()}},c.prototype.cycle=function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(p.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},c.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e);if(("prev"==t&&0===i||"next"==t&&i==this.$items.length-1)&&!this.options.wrap)return e;var o=(i+("prev"==t?-1:1))%this.$items.length;return this.$items.eq(o)},c.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(t>this.$items.length-1||t<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(i<t?"next":"prev",this.$items.eq(t))},c.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&p.support.transition&&(this.$element.trigger(p.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(t,e){var i=this.$element.find(".item.active"),o=e||this.getItemForDirection(t,i),n=this.interval,s="next"==t?"left":"right",a=this;if(o.hasClass("active"))return this.sliding=!1;var r=o[0],l=p.Event("slide.bs.carousel",{relatedTarget:r,direction:s});if(this.$element.trigger(l),!l.isDefaultPrevented()){if(this.sliding=!0,n&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var h=p(this.$indicators.children()[this.getItemIndex(o)]);h&&h.addClass("active")}var d=p.Event("slid.bs.carousel",{relatedTarget:r,direction:s});return p.support.transition&&this.$element.hasClass("slide")?(o.addClass(t),"object"==typeof o&&o.length&&o[0].offsetWidth,i.addClass(s),o.addClass(s),i.one("bsTransitionEnd",function(){o.removeClass([t,s].join(" ")).addClass("active"),i.removeClass(["active",s].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger(d)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(i.removeClass("active"),o.addClass("active"),this.sliding=!1,this.$element.trigger(d)),n&&this.cycle(),this}};var t=p.fn.carousel;p.fn.carousel=r,p.fn.carousel.Constructor=c,p.fn.carousel.noConflict=function(){return p.fn.carousel=t,this};var e=function(t){var e=p(this),i=e.attr("href");i&&(i=i.replace(/.*(?=#[^\s]+$)/,""));var o=e.attr("data-target")||i,n=p(document).find(o);if(n.hasClass("carousel")){var s=p.extend({},n.data(),e.data()),a=e.attr("data-slide-to");a&&(s.interval=!1),r.call(n,s),a&&n.data("bs.carousel").to(a),t.preventDefault()}};p(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),p(window).on("load",function(){p('[data-ride="carousel"]').each(function(){var t=p(this);r.call(t,t.data())})})}(jQuery),function(a){"use strict";var r=function(t,e){this.$element=a(t),this.options=a.extend({},r.DEFAULTS,e),this.$trigger=a('[data-toggle="collapse"][href="#'+t.id+'"],[data-toggle="collapse"][data-target="#'+t.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};function n(t){var e,i=t.attr("data-target")||(e=t.attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"");return a(document).find(i)}function l(o){return this.each(function(){var t=a(this),e=t.data("bs.collapse"),i=a.extend({},r.DEFAULTS,t.data(),"object"==typeof o&&o);!e&&i.toggle&&/show|hide/.test(o)&&(i.toggle=!1),e||t.data("bs.collapse",e=new r(this,i)),"string"==typeof o&&e[o]()})}r.VERSION="3.4.1",r.TRANSITION_DURATION=350,r.DEFAULTS={toggle:!0},r.prototype.dimension=function(){return this.$element.hasClass("width")?"width":"height"},r.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var t,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(t=e.data("bs.collapse"))&&t.transitioning)){var i=a.Event("show.bs.collapse");if(this.$element.trigger(i),!i.isDefaultPrevented()){e&&e.length&&(l.call(e,"hide"),t||e.data("bs.collapse",null));var o=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[o](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var n=function(){this.$element.removeClass("collapsing").addClass("collapse in")[o](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return n.call(this);var s=a.camelCase(["scroll",o].join("-"));this.$element.one("bsTransitionEnd",a.proxy(n,this)).emulateTransitionEnd(r.TRANSITION_DURATION)[o](this.$element[0][s])}}}},r.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var t=a.Event("hide.bs.collapse");if(this.$element.trigger(t),!t.isDefaultPrevented()){var e=this.dimension();this.$element[e](this.$element[e]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var i=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};if(!a.support.transition)return i.call(this);this.$element[e](0).one("bsTransitionEnd",a.proxy(i,this)).emulateTransitionEnd(r.TRANSITION_DURATION)}}},r.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},r.prototype.getParent=function(){return a(document).find(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(t,e){var i=a(e);this.addAriaAndCollapsedClass(n(i),i)},this)).end()},r.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in");t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)};var t=a.fn.collapse;a.fn.collapse=l,a.fn.collapse.Constructor=r,a.fn.collapse.noConflict=function(){return a.fn.collapse=t,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(t){var e=a(this);e.attr("data-target")||t.preventDefault();var i=n(e),o=i.data("bs.collapse")?"toggle":e.data();l.call(i,o)})}(jQuery),function(a){"use strict";var r='[data-toggle="dropdown"]',o=function(t){a(t).on("click.bs.dropdown",this.toggle)};function l(t){var e=t.attr("data-target");e||(e=(e=t.attr("href"))&&/#[A-Za-z]/.test(e)&&e.replace(/.*(?=#[^\s]*$)/,""));var i="#"!==e?a(document).find(e):null;return i&&i.length?i:t.parent()}function s(o){o&&3===o.which||(a(".dropdown-backdrop").remove(),a(r).each(function(){var t=a(this),e=l(t),i={relatedTarget:this};e.hasClass("open")&&(o&&"click"==o.type&&/input|textarea/i.test(o.target.tagName)&&a.contains(e[0],o.target)||(e.trigger(o=a.Event("hide.bs.dropdown",i)),o.isDefaultPrevented()||(t.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",i)))))}))}o.VERSION="3.4.1",o.prototype.toggle=function(t){var e=a(this);if(!e.is(".disabled, :disabled")){var i=l(e),o=i.hasClass("open");if(s(),!o){"ontouchstart"in document.documentElement&&!i.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",s);var n={relatedTarget:this};if(i.trigger(t=a.Event("show.bs.dropdown",n)),t.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),i.toggleClass("open").trigger(a.Event("shown.bs.dropdown",n))}return!1}},o.prototype.keydown=function(t){if(/(38|40|27|32)/.test(t.which)&&!/input|textarea/i.test(t.target.tagName)){var e=a(this);if(t.preventDefault(),t.stopPropagation(),!e.is(".disabled, :disabled")){var i=l(e),o=i.hasClass("open");if(!o&&27!=t.which||o&&27==t.which)return 27==t.which&&i.find(r).trigger("focus"),e.trigger("click");var n=i.find(".dropdown-menu li:not(.disabled):visible a");if(n.length){var s=n.index(t.target);38==t.which&&0<s&&s--,40==t.which&&s<n.length-1&&s++,~s||(s=0),n.eq(s).trigger("focus")}}}};var t=a.fn.dropdown;a.fn.dropdown=function e(i){return this.each(function(){var t=a(this),e=t.data("bs.dropdown");e||t.data("bs.dropdown",e=new o(this)),"string"==typeof i&&e[i].call(t)})},a.fn.dropdown.Constructor=o,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=t,this},a(document).on("click.bs.dropdown.data-api",s).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",r,o.prototype.toggle).on("keydown.bs.dropdown.data-api",r,o.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",o.prototype.keydown)}(jQuery),function(a){"use strict";var s=function(t,e){this.options=e,this.$body=a(document.body),this.$element=a(t),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.fixedContent=".navbar-fixed-top, .navbar-fixed-bottom",this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};function r(o,n){return this.each(function(){var t=a(this),e=t.data("bs.modal"),i=a.extend({},s.DEFAULTS,t.data(),"object"==typeof o&&o);e||t.data("bs.modal",e=new s(this,i)),"string"==typeof o?e[o](n):i.show&&e.show(n)})}s.VERSION="3.4.1",s.TRANSITION_DURATION=300,s.BACKDROP_TRANSITION_DURATION=150,s.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},s.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},s.prototype.show=function(i){var o=this,t=a.Event("show.bs.modal",{relatedTarget:i});this.$element.trigger(t),this.isShown||t.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){o.$element.one("mouseup.dismiss.bs.modal",function(t){a(t.target).is(o.$element)&&(o.ignoreBackdropClick=!0)})}),this.backdrop(function(){var t=a.support.transition&&o.$element.hasClass("fade");o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),o.adjustDialog(),t&&o.$element[0].offsetWidth,o.$element.addClass("in"),o.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:i});t?o.$dialog.one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(e)}).emulateTransitionEnd(s.TRANSITION_DURATION):o.$element.trigger("focus").trigger(e)}))},s.prototype.hide=function(t){t&&t.preventDefault(),t=a.Event("hide.bs.modal"),this.$element.trigger(t),this.isShown&&!t.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(s.TRANSITION_DURATION):this.hideModal())},s.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(t){document===t.target||this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},s.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},s.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},s.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetAdjustments(),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},s.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},s.prototype.backdrop=function(t){var e=this,i=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var o=a.support.transition&&i;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+i).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(t){this.ignoreBackdropClick?this.ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide())},this)),o&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!t)return;o?this.$backdrop.one("bsTransitionEnd",t).emulateTransitionEnd(s.BACKDROP_TRANSITION_DURATION):t()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var n=function(){e.removeBackdrop(),t&&t()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",n).emulateTransitionEnd(s.BACKDROP_TRANSITION_DURATION):n()}else t&&t()},s.prototype.handleUpdate=function(){this.adjustDialog()},s.prototype.adjustDialog=function(){var t=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},s.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},s.prototype.checkScrollbar=function(){var t=window.innerWidth;if(!t){var e=document.documentElement.getBoundingClientRect();t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth<t,this.scrollbarWidth=this.measureScrollbar()},s.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"";var n=this.scrollbarWidth;this.bodyIsOverflowing&&(this.$body.css("padding-right",t+n),a(this.fixedContent).each(function(t,e){var i=e.style.paddingRight,o=a(e).css("padding-right");a(e).data("padding-right",i).css("padding-right",parseFloat(o)+n+"px")}))},s.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad),a(this.fixedContent).each(function(t,e){var i=a(e).data("padding-right");a(e).removeData("padding-right"),e.style.paddingRight=i||""})},s.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var t=a.fn.modal;a.fn.modal=r,a.fn.modal.Constructor=s,a.fn.modal.noConflict=function(){return a.fn.modal=t,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var e=a(this),i=e.attr("href"),o=e.attr("data-target")||i&&i.replace(/.*(?=#[^\s]+$)/,""),n=a(document).find(o),s=n.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(i)&&i},n.data(),e.data());e.is("a")&&t.preventDefault(),n.one("show.bs.modal",function(t){t.isDefaultPrevented()||n.one("hidden.bs.modal",function(){e.is(":visible")&&e.trigger("focus")})}),r.call(n,s,this)})}(jQuery),function(g){"use strict";var o=["sanitize","whiteList","sanitizeFn"],a=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],t={"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},r=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,l=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function u(t,e){var i=t.nodeName.toLowerCase();if(-1!==g.inArray(i,e))return-1===g.inArray(i,a)||Boolean(t.nodeValue.match(r)||t.nodeValue.match(l));for(var o=g(e).filter(function(t,e){return e instanceof RegExp}),n=0,s=o.length;n<s;n++)if(i.match(o[n]))return!0;return!1}function n(t,e,i){if(0===t.length)return t;if(i&&"function"==typeof i)return i(t);if(!document.implementation||!document.implementation.createHTMLDocument)return t;var o=document.implementation.createHTMLDocument("sanitization");o.body.innerHTML=t;for(var n=g.map(e,function(t,e){return e}),s=g(o.body).find("*"),a=0,r=s.length;a<r;a++){var l=s[a],h=l.nodeName.toLowerCase();if(-1!==g.inArray(h,n))for(var d=g.map(l.attributes,function(t){return t}),p=[].concat(e["*"]||[],e[h]||[]),c=0,f=d.length;c<f;c++)u(d[c],p)||l.removeAttribute(d[c].nodeName);else l.parentNode.removeChild(l)}return o.body.innerHTML}var m=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",t,e)};m.VERSION="3.4.1",m.TRANSITION_DURATION=150,m.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0},sanitize:!0,sanitizeFn:null,whiteList:t},m.prototype.init=function(t,e,i){if(this.enabled=!0,this.type=t,this.$element=g(e),this.options=this.getOptions(i),this.$viewport=this.options.viewport&&g(document).find(g.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var o=this.options.trigger.split(" "),n=o.length;n--;){var s=o[n];if("click"==s)this.$element.on("click."+this.type,this.options.selector,g.proxy(this.toggle,this));else if("manual"!=s){var a="hover"==s?"mouseenter":"focusin",r="hover"==s?"mouseleave":"focusout";this.$element.on(a+"."+this.type,this.options.selector,g.proxy(this.enter,this)),this.$element.on(r+"."+this.type,this.options.selector,g.proxy(this.leave,this))}}this.options.selector?this._options=g.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},m.prototype.getDefaults=function(){return m.DEFAULTS},m.prototype.getOptions=function(t){var e=this.$element.data();for(var i in e)e.hasOwnProperty(i)&&-1!==g.inArray(i,o)&&delete e[i];return(t=g.extend({},this.getDefaults(),e,t)).delay&&"number"==typeof t.delay&&(t.delay={show:t.delay,hide:t.delay}),t.sanitize&&(t.template=n(t.template,t.whiteList,t.sanitizeFn)),t},m.prototype.getDelegateOptions=function(){var i={},o=this.getDefaults();return this._options&&g.each(this._options,function(t,e){o[t]!=e&&(i[t]=e)}),i},m.prototype.enter=function(t){var e=t instanceof this.constructor?t:g(t.currentTarget).data("bs."+this.type);if(e||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e)),t instanceof g.Event&&(e.inState["focusin"==t.type?"focus":"hover"]=!0),e.tip().hasClass("in")||"in"==e.hoverState)e.hoverState="in";else{if(clearTimeout(e.timeout),e.hoverState="in",!e.options.delay||!e.options.delay.show)return e.show();e.timeout=setTimeout(function(){"in"==e.hoverState&&e.show()},e.options.delay.show)}},m.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0;return!1},m.prototype.leave=function(t){var e=t instanceof this.constructor?t:g(t.currentTarget).data("bs."+this.type);if(e||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e)),t instanceof g.Event&&(e.inState["focusout"==t.type?"focus":"hover"]=!1),!e.isInStateTrue()){if(clearTimeout(e.timeout),e.hoverState="out",!e.options.delay||!e.options.delay.hide)return e.hide();e.timeout=setTimeout(function(){"out"==e.hoverState&&e.hide()},e.options.delay.hide)}},m.prototype.show=function(){var t=g.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);var e=g.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(t.isDefaultPrevented()||!e)return;var i=this,o=this.tip(),n=this.getUID(this.type);this.setContent(),o.attr("id",n),this.$element.attr("aria-describedby",n),this.options.animation&&o.addClass("fade");var s="function"==typeof this.options.placement?this.options.placement.call(this,o[0],this.$element[0]):this.options.placement,a=/\s?auto?\s?/i,r=a.test(s);r&&(s=s.replace(a,"")||"top"),o.detach().css({top:0,left:0,display:"block"}).addClass(s).data("bs."+this.type,this),this.options.container?o.appendTo(g(document).find(this.options.container)):o.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var l=this.getPosition(),h=o[0].offsetWidth,d=o[0].offsetHeight;if(r){var p=s,c=this.getPosition(this.$viewport);s="bottom"==s&&l.bottom+d>c.bottom?"top":"top"==s&&l.top-d<c.top?"bottom":"right"==s&&l.right+h>c.width?"left":"left"==s&&l.left-h<c.left?"right":s,o.removeClass(p).addClass(s)}var f=this.getCalculatedOffset(s,l,h,d);this.applyPlacement(f,s);var u=function(){var t=i.hoverState;i.$element.trigger("shown.bs."+i.type),i.hoverState=null,"out"==t&&i.leave(i)};g.support.transition&&this.$tip.hasClass("fade")?o.one("bsTransitionEnd",u).emulateTransitionEnd(m.TRANSITION_DURATION):u()}},m.prototype.applyPlacement=function(t,e){var i=this.tip(),o=i[0].offsetWidth,n=i[0].offsetHeight,s=parseInt(i.css("margin-top"),10),a=parseInt(i.css("margin-left"),10);isNaN(s)&&(s=0),isNaN(a)&&(a=0),t.top+=s,t.left+=a,g.offset.setOffset(i[0],g.extend({using:function(t){i.css({top:Math.round(t.top),left:Math.round(t.left)})}},t),0),i.addClass("in");var r=i[0].offsetWidth,l=i[0].offsetHeight;"top"==e&&l!=n&&(t.top=t.top+n-l);var h=this.getViewportAdjustedDelta(e,t,r,l);h.left?t.left+=h.left:t.top+=h.top;var d=/top|bottom/.test(e),p=d?2*h.left-o+r:2*h.top-n+l,c=d?"offsetWidth":"offsetHeight";i.offset(t),this.replaceArrow(p,i[0][c],d)},m.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},m.prototype.setContent=function(){var t=this.tip(),e=this.getTitle();this.options.html?(this.options.sanitize&&(e=n(e,this.options.whiteList,this.options.sanitizeFn)),t.find(".tooltip-inner").html(e)):t.find(".tooltip-inner").text(e),t.removeClass("fade in top bottom left right")},m.prototype.hide=function(t){var e=this,i=g(this.$tip),o=g.Event("hide.bs."+this.type);function n(){"in"!=e.hoverState&&i.detach(),e.$element&&e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),t&&t()}if(this.$element.trigger(o),!o.isDefaultPrevented())return i.removeClass("in"),g.support.transition&&i.hasClass("fade")?i.one("bsTransitionEnd",n).emulateTransitionEnd(m.TRANSITION_DURATION):n(),this.hoverState=null,this},m.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},m.prototype.hasContent=function(){return this.getTitle()},m.prototype.getPosition=function(t){var e=(t=t||this.$element)[0],i="BODY"==e.tagName,o=e.getBoundingClientRect();null==o.width&&(o=g.extend({},o,{width:o.right-o.left,height:o.bottom-o.top}));var n=window.SVGElement&&e instanceof window.SVGElement,s=i?{top:0,left:0}:n?null:t.offset(),a={scroll:i?document.documentElement.scrollTop||document.body.scrollTop:t.scrollTop()},r=i?{width:g(window).width(),height:g(window).height()}:null;return g.extend({},o,a,r,s)},m.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},m.prototype.getViewportAdjustedDelta=function(t,e,i,o){var n={top:0,left:0};if(!this.$viewport)return n;var s=this.options.viewport&&this.options.viewport.padding||0,a=this.getPosition(this.$viewport);if(/right|left/.test(t)){var r=e.top-s-a.scroll,l=e.top+s-a.scroll+o;r<a.top?n.top=a.top-r:l>a.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i;h<a.left?n.left=a.left-h:d>a.right&&(n.left=a.left+a.width-d)}return n},m.prototype.getTitle=function(){var t=this.$element,e=this.options;return t.attr("data-original-title")||("function"==typeof e.title?e.title.call(t[0]):e.title)},m.prototype.getUID=function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},m.prototype.tip=function(){if(!this.$tip&&(this.$tip=g(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},m.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},m.prototype.enable=function(){this.enabled=!0},m.prototype.disable=function(){this.enabled=!1},m.prototype.toggleEnabled=function(){this.enabled=!this.enabled},m.prototype.toggle=function(t){var e=this;t&&((e=g(t.currentTarget).data("bs."+this.type))||(e=new this.constructor(t.currentTarget,this.getDelegateOptions()),g(t.currentTarget).data("bs."+this.type,e))),t?(e.inState.click=!e.inState.click,e.isInStateTrue()?e.enter(e):e.leave(e)):e.tip().hasClass("in")?e.leave(e):e.enter(e)},m.prototype.destroy=function(){var t=this;clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})},m.prototype.sanitizeHtml=function(t){return n(t,this.options.whiteList,this.options.sanitizeFn)};var e=g.fn.tooltip;g.fn.tooltip=function i(o){return this.each(function(){var t=g(this),e=t.data("bs.tooltip"),i="object"==typeof o&&o;!e&&/destroy|hide/.test(o)||(e||t.data("bs.tooltip",e=new m(this,i)),"string"==typeof o&&e[o]())})},g.fn.tooltip.Constructor=m,g.fn.tooltip.noConflict=function(){return g.fn.tooltip=e,this}}(jQuery),function(n){"use strict";var s=function(t,e){this.init("popover",t,e)};if(!n.fn.tooltip)throw new Error("Popover requires tooltip.js");s.VERSION="3.4.1",s.DEFAULTS=n.extend({},n.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),((s.prototype=n.extend({},n.fn.tooltip.Constructor.prototype)).constructor=s).prototype.getDefaults=function(){return s.DEFAULTS},s.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();if(this.options.html){var o=typeof i;this.options.sanitize&&(e=this.sanitizeHtml(e),"string"===o&&(i=this.sanitizeHtml(i))),t.find(".popover-title").html(e),t.find(".popover-content").children().detach().end()["string"===o?"html":"append"](i)}else t.find(".popover-title").text(e),t.find(".popover-content").children().detach().end().text(i);t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},s.prototype.hasContent=function(){return this.getTitle()||this.getContent()},s.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},s.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var t=n.fn.popover;n.fn.popover=function e(o){return this.each(function(){var t=n(this),e=t.data("bs.popover"),i="object"==typeof o&&o;!e&&/destroy|hide/.test(o)||(e||t.data("bs.popover",e=new s(this,i)),"string"==typeof o&&e[o]())})},n.fn.popover.Constructor=s,n.fn.popover.noConflict=function(){return n.fn.popover=t,this}}(jQuery),function(s){"use strict";function n(t,e){this.$body=s(document.body),this.$scrollElement=s(t).is(document.body)?s(window):s(t),this.options=s.extend({},n.DEFAULTS,e),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",s.proxy(this.process,this)),this.refresh(),this.process()}function e(o){return this.each(function(){var t=s(this),e=t.data("bs.scrollspy"),i="object"==typeof o&&o;e||t.data("bs.scrollspy",e=new n(this,i)),"string"==typeof o&&e[o]()})}n.VERSION="3.4.1",n.DEFAULTS={offset:10},n.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},n.prototype.refresh=function(){var t=this,o="offset",n=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),s.isWindow(this.$scrollElement[0])||(o="position",n=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var t=s(this),e=t.data("target")||t.attr("href"),i=/^#./.test(e)&&s(e);return i&&i.length&&i.is(":visible")&&[[i[o]().top+n,e]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},n.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),o<=e)return a!=(t=s[s.length-1])&&this.activate(t);if(a&&e<n[0])return this.activeTarget=null,this.clear();for(t=n.length;t--;)a!=s[t]&&e>=n[t]&&(n[t+1]===undefined||e<n[t+1])&&this.activate(s[t])},n.prototype.activate=function(t){this.activeTarget=t,this.clear();var e=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',i=s(e).parents("li").addClass("active");i.parent(".dropdown-menu").length&&(i=i.closest("li.dropdown").addClass("active")),i.trigger("activate.bs.scrollspy")},n.prototype.clear=function(){s(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var t=s.fn.scrollspy;s.fn.scrollspy=e,s.fn.scrollspy.Constructor=n,s.fn.scrollspy.noConflict=function(){return s.fn.scrollspy=t,this},s(window).on("load.bs.scrollspy.data-api",function(){s('[data-spy="scroll"]').each(function(){var t=s(this);e.call(t,t.data())})})}(jQuery),function(r){"use strict";var a=function(t){this.element=r(t)};function e(i){return this.each(function(){var t=r(this),e=t.data("bs.tab");e||t.data("bs.tab",e=new a(this)),"string"==typeof i&&e[i]()})}a.VERSION="3.4.1",a.TRANSITION_DURATION=150,a.prototype.show=function(){var t=this.element,e=t.closest("ul:not(.dropdown-menu)"),i=t.data("target");if(i||(i=(i=t.attr("href"))&&i.replace(/.*(?=#[^\s]*$)/,"")),!t.parent("li").hasClass("active")){var o=e.find(".active:last a"),n=r.Event("hide.bs.tab",{relatedTarget:t[0]}),s=r.Event("show.bs.tab",{relatedTarget:o[0]});if(o.trigger(n),t.trigger(s),!s.isDefaultPrevented()&&!n.isDefaultPrevented()){var a=r(document).find(i);this.activate(t.closest("li"),e),this.activate(a,a.parent(),function(){o.trigger({type:"hidden.bs.tab",relatedTarget:t[0]}),t.trigger({type:"shown.bs.tab",relatedTarget:o[0]})})}}},a.prototype.activate=function(t,e,i){var o=e.find("> .active"),n=i&&r.support.transition&&(o.length&&o.hasClass("fade")||!!e.find("> .fade").length);function s(){o.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),t.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),n?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu").length&&t.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),i&&i()}o.length&&n?o.one("bsTransitionEnd",s).emulateTransitionEnd(a.TRANSITION_DURATION):s(),o.removeClass("in")};var t=r.fn.tab;r.fn.tab=e,r.fn.tab.Constructor=a,r.fn.tab.noConflict=function(){return r.fn.tab=t,this};var i=function(t){t.preventDefault(),e.call(r(this),"show")};r(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',i).on("click.bs.tab.data-api",'[data-toggle="pill"]',i)}(jQuery),function(l){"use strict";var h=function(t,e){this.options=l.extend({},h.DEFAULTS,e);var i=this.options.target===h.DEFAULTS.target?l(this.options.target):l(document).find(this.options.target);this.$target=i.on("scroll.bs.affix.data-api",l.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",l.proxy(this.checkPositionWithEventLoop,this)),this.$element=l(t),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};function i(o){return this.each(function(){var t=l(this),e=t.data("bs.affix"),i="object"==typeof o&&o;e||t.data("bs.affix",e=new h(this,i)),"string"==typeof o&&e[o]()})}h.VERSION="3.4.1",h.RESET="affix affix-top affix-bottom",h.DEFAULTS={offset:0,target:window},h.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height();if(null!=i&&"top"==this.affixed)return n<i&&"top";if("bottom"==this.affixed)return null!=i?!(n+this.unpin<=s.top)&&"bottom":!(n+a<=t-o)&&"bottom";var r=null==this.affixed,l=r?n:s.top;return null!=i&&n<=i?"top":null!=o&&t-o<=l+(r?a:e)&&"bottom"},h.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(h.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},h.prototype.checkPositionWithEventLoop=function(){setTimeout(l.proxy(this.checkPosition,this),1)},h.prototype.checkPosition=function(){if(this.$element.is(":visible")){var t=this.$element.height(),e=this.options.offset,i=e.top,o=e.bottom,n=Math.max(l(document).height(),l(document.body).height());"object"!=typeof e&&(o=i=e),"function"==typeof i&&(i=e.top(this.$element)),"function"==typeof o&&(o=e.bottom(this.$element));var s=this.getState(n,t,i,o);if(this.affixed!=s){null!=this.unpin&&this.$element.css("top","");var a="affix"+(s?"-"+s:""),r=l.Event(a+".bs.affix");if(this.$element.trigger(r),r.isDefaultPrevented())return;this.affixed=s,this.unpin="bottom"==s?this.getPinnedOffset():null,this.$element.removeClass(h.RESET).addClass(a).trigger(a.replace("affix","affixed")+".bs.affix")}"bottom"==s&&this.$element.offset({top:n-t-o})}};var t=l.fn.affix;l.fn.affix=i,l.fn.affix.Constructor=h,l.fn.affix.noConflict=function(){return l.fn.affix=t,this},l(window).on("load",function(){l('[data-spy="affix"]').each(function(){var t=l(this),e=t.data();e.offset=e.offset||{},null!=e.offsetBottom&&(e.offset.bottom=e.offsetBottom),null!=e.offsetTop&&(e.offset.top=e.offsetTop),i.call(t,e)})})}(jQuery);
\ No newline at end of file
diff --git a/tools/webfilesbuilder/gulpfile.js b/tools/webfilesbuilder/gulpfile.js
index 24212b30a..883411742 100644
--- a/tools/webfilesbuilder/gulpfile.js
+++ b/tools/webfilesbuilder/gulpfile.js
@@ -100,7 +100,7 @@ gulp.task('myespjs', function () {
 });
 
 gulp.task('requiredjs', function () {
-    return gulp.src(['../../src/websrc/3rdparty/js/jquery-1.12.4.min.js', '../../src/websrc/3rdparty/js/bootstrap-3.3.7.min.js', '../../src/websrc/3rdparty/js/footable-3.1.6.min.js'])
+    return gulp.src(['../../src/websrc/3rdparty/js/jquery-1.12.4.min.js', '../../src/websrc/3rdparty/js/bootstrap-3.4.1.min.js', '../../src/websrc/3rdparty/js/footable-3.1.6.min.js'])
         .pipe(concat({
             path: 'required.js',
             stat: {
@@ -117,7 +117,7 @@ gulp.task('requiredjs', function () {
 
 
 gulp.task('requiredcss', function () {
-    return gulp.src(['../../src/websrc/3rdparty/css/bootstrap-3.3.7.min.css', '../../src/websrc/3rdparty/css/footable.bootstrap-3.1.6.min.css', '../../src/websrc/3rdparty/css/sidebar.css'])
+    return gulp.src(['../../src/websrc/3rdparty/css/bootstrap-3.4.1.min.css', '../../src/websrc/3rdparty/css/footable.bootstrap-3.1.6.min.css', '../../src/websrc/3rdparty/css/sidebar.css'])
         .pipe(concat({
             path: 'required.css',
             stat: {

From 26b84b12815e2a5f55a5d3621fac3510c41c839a Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 15:18:39 +0100
Subject: [PATCH 068/120] text change

---
 platformio.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index a851b9b71..b89693979 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,12 +23,12 @@ platform = espressif8266
 lib_deps =
   https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
-  https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
+  https://github.com/me-no-dev/ESPAsyncWebServer
   https://github.com/bakercp/CRC32
   JustWifi@2.0.2
   AsyncMqttClient@0.8.2
   EEPROM_Rotate@0.9.2
-  ArduinoJson@6.12.0
+  ArduinoJson@6.13.0
   ESPAsyncUDP
   ESPAsyncTCP@1.2.2
 upload_speed = 921600
@@ -38,7 +38,7 @@ monitor_speed = 115200
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
 
-; comment out these next 2 lines if using OTA
+; comment out these next 2 lines if not using OTA and going direct via USB
 upload_protocol = espota
 upload_port = ems-esp.local
 

From 135d844a57c42d21fb74f24e27984da8ec31af5b Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 15:19:48 +0100
Subject: [PATCH 069/120] added static IP support -
 https://github.com/proddy/EMS-ESP/issues/231

---
 CHANGELOG.md                |  1 +
 src/MyESP.cpp               | 56 ++++++++++++++++++++++++++++---------
 src/MyESP.h                 |  6 +++-
 src/custom.htm              |  2 +-
 src/version.h               |  2 +-
 src/websrc/myesp.htm        | 55 ++++++++++++++++++++++++++++--------
 src/websrc/myesp.js         | 51 +++++++++------------------------
 tools/wsemulator/wserver.js | 13 ++++++---
 8 files changed, 117 insertions(+), 69 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7ce26930..366310c8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ There are breaking changes in this release. See `publish_time` below and make su
 - Added build scripts for automated CI with TravisCI
 - Implemented timezone support and automatic adjustment, also taking daylight saving times into account
 - Added `kick` command to reset core services like NTP, Web, Web Sockets
+- Added WiFi static IP (setting done in WebUI only)
 
 ### Fixed
 
diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index c32617c89..e1ee69d81 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -77,9 +77,13 @@ MyESP::MyESP() {
     _mqtt_will_offline_payload = strdup(MQTT_WILL_OFFLINE_PAYLOAD);
 
     // network
-    _network_password = nullptr;
-    _network_ssid     = nullptr;
-    _network_wmode    = 1; // default AP
+    _network_password  = nullptr;
+    _network_ssid      = nullptr;
+    _network_wmode     = 1; // default AP
+    _network_staticip  = nullptr;
+    _network_gatewayip = nullptr;
+    _network_nmask     = nullptr;
+    _network_dnsip     = nullptr;
 
     _wifi_callback_f = nullptr;
     _wifi_connected  = false;
@@ -530,11 +534,19 @@ void MyESP::_wifi_setup() {
         jw.enableAP(false);
     }
 
-    jw.enableAPFallback(true);                       // AP mode only as fallback
-    jw.enableSTA(true);                              // Enable STA mode (connecting to a router)
-    jw.enableScan(false);                            // Configure it to not scan available networks and connect in order of dBm
-    jw.cleanNetworks();                              // Clean existing network configuration
-    jw.addNetwork(_network_ssid, _network_password); // Add a network
+    jw.enableAPFallback(true); // AP mode only as fallback
+    jw.enableSTA(true);        // Enable STA mode (connecting to a router)
+    jw.enableScan(false);      // Configure it to not scan available networks and connect in order of dBm
+    jw.cleanNetworks();        // Clean existing network configuration
+
+    if (_hasValue(_network_staticip)) {
+#if MYESP_DEBUG
+        myDebug_P(PSTR("[WIFI] Using fixed IP"));
+#endif
+        jw.addNetwork(_network_ssid, _network_password, _network_staticip, _network_gatewayip, _network_nmask, _network_dnsip); // fixed IP
+    } else {
+        jw.addNetwork(_network_ssid, _network_password); // use DHCP
+    }
 }
 
 // set the callback function for the OTA onstart
@@ -698,7 +710,7 @@ void MyESP::_consoleShowHelp() {
     myDebug_P(PSTR("*"));
     myDebug_P(PSTR("* Commands:"));
     myDebug_P(PSTR("*  ?/help=show commands, CTRL-D/quit=close telnet session"));
-    myDebug_P(PSTR("*  set, system, restart, mqttlog, kick"));
+    myDebug_P(PSTR("*  set, system, restart, mqttlog, kick, save"));
 
 #ifdef CRASH
     myDebug_P(PSTR("*  crash <dump | clear | test [n]>"));
@@ -772,6 +784,9 @@ void MyESP::_printSetCommands() {
         }
     }
     myDebug_P(PSTR(""));
+    if (_hasValue(_network_staticip)) {
+        myDebug_P(PSTR("  wifi_staticip=%s"), _network_staticip);
+    }
     myDebug_P(PSTR("  mqtt_enabled=%s"), (_mqtt_enabled) ? "on" : "off");
     if (_hasValue(_mqtt_ip)) {
         myDebug_P(PSTR("  mqtt_ip=%s"), _mqtt_ip);
@@ -1025,6 +1040,13 @@ void MyESP::_telnetCommand(char * commandLine) {
         return;
     }
 
+    // save everything
+    if ((strcmp(ptrToCommandName, "save") == 0) && (wc == 1)) {
+        _fs_writeConfig();
+        _fs_createCustomConfig();
+        return;
+    }
+
     // show system stats
     if ((strcmp(ptrToCommandName, "quit") == 0) && (wc == 1)) {
         myDebug_P(PSTR("[TELNET] exiting telnet session"));
@@ -1793,6 +1815,10 @@ bool MyESP::_fs_loadConfig() {
     _network_ssid      = strdup(network["ssid"] | "");
     _network_password  = strdup(network["password"] | "");
     _network_wmode     = network["wmode"]; // 0 is client, 1 is AP
+    _network_staticip  = strdup(network["staticip"] | "");
+    _network_gatewayip = strdup(network["gatewayip"] | "");
+    _network_nmask     = strdup(network["nmask"] | "");
+    _network_dnsip     = strdup(network["dnsip"] | "");
 
     JsonObject general = doc["general"];
     _general_password  = strdup(general["password"] | MYESP_HTTP_PASSWORD);
@@ -2020,10 +2046,14 @@ bool MyESP::_fs_writeConfig() {
 
     root["command"] = "configfile"; // header, important!
 
-    JsonObject network  = doc.createNestedObject("network");
-    network["ssid"]     = _network_ssid;
-    network["password"] = _network_password;
-    network["wmode"]    = _network_wmode;
+    JsonObject network   = doc.createNestedObject("network");
+    network["ssid"]      = _network_ssid;
+    network["password"]  = _network_password;
+    network["wmode"]     = _network_wmode;
+    network["staticip"]  = _network_staticip;
+    network["gatewayip"] = _network_gatewayip;
+    network["nmask"]     = _network_nmask;
+    network["dnsip"]     = _network_dnsip;
 
     JsonObject general    = doc.createNestedObject("general");
     general["password"]   = _general_password;
diff --git a/src/MyESP.h b/src/MyESP.h
index b2738bcd2..c014b4c7f 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.18"
+#define MYESP_VERSION "1.2.19"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -367,6 +367,10 @@ class MyESP {
     char *          _network_ssid;
     char *          _network_password;
     uint8_t         _network_wmode;
+    char *          _network_staticip;
+    char *          _network_gatewayip;
+    char *          _network_nmask;
+    char *          _network_dnsip;
     bool            _wifi_connected;
     String          _getESPhostname();
 
diff --git a/src/custom.htm b/src/custom.htm
index 0f4d2abdf..5bef5d84f 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -257,6 +257,6 @@
         </div>
     </div>
     <div class="row form-group" style="text-align: center;">
-        <button onclick="refreshEMS()" class="btn btn-info">Refresh</button>
+        <button onclick="refreshCustomStatus()" class="btn btn-info">Refresh</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/version.h b/src/version.h
index 99a0cd1d7..5ede72e09 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b9"
+#define APP_VERSION "1.9.4b10"
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index 32d5a397d..33617f7f0 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -308,10 +308,10 @@
             </form>
         </div>
     </div>
-    <div class="row form-group" style="display:none" id="hidessid">
+    <div class="row form-group" style="display:none" id="hideclient">
         <label class="col-xs-3">SSID<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="wifi Network Name"></i></label>
+                data-content="WiFi Network Name"></i></label>
         <span class="col-xs-7 col-md-5">
             <input class="form-control input-sm" id="inputtohide" type="text" name="ap_ssid">
             <select class="form-control input-sm" style="display:none;" id="ssid" onchange="listBSSID();"></select>
@@ -320,16 +320,51 @@
             <button id="scanb" type="button" class="btn btn-info btn-xs" style="display:none;"
                 onclick="scanWifi()">Scan...</button>
         </span>
-    </div>
-    <div class="row form-group" style="display:none" id="hidepasswd">
+
+        <br><br>
         <label class="col-xs-3">Password<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="wifi Password"></i></label>
+                data-content="WiFi Password"></i></label>
         <span class="col-xs-9 col-md-5">
             <input id="wifipass" class="form-control input-sm" name="ap_passwd" type="password">
         </span>
+
+        <br><br>
+        <h6 style="margin-left: 10px;" class="text-muted">If you're not using DHCP and want a fixed IP address enter the values below:</h6>
+
+        <br>
+        <label class="col-xs-3">Static IP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                data-content="static IP address"></i></label>
+        <span class="col-xs-9 col-md-5">
+            <input type="text" class="form-control input-sm" id="staticip" placeholder="">
+        </span>
+
+        <br><br>
+        <label class="col-xs-3">Gateway IP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                data-content="gateway IP address"></i></label>
+        <span class="col-xs-9 col-md-5">
+            <input type="text" class="form-control input-sm" id="gatewayip" placeholder="">
+        </span>
+
+        <br><br>
+        <label class="col-xs-3">Network Mask<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                data-content="network mask"></i></label>
+        <span class="col-xs-9 col-md-5">
+            <input type="text" class="form-control input-sm" id="nmask" placeholder="255.255.255.0">
+        </span>
+
+        <br><br>
+        <label class="col-xs-3">DNS IP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                data-content="DNS IP address"></i></label>
+        <span class="col-xs-9 col-md-5">
+            <input type="text" class="form-control input-sm" id="dnsip" placeholder="">
+        </span>
     </div>
-    <br>
+    <br><br>
     <div class="col-xs-9 col-md-8">
         <button onclick="savenetwork()" class="btn btn-primary btn-sm pull-right">Save</button>
     </div>
@@ -338,7 +373,8 @@
 <div id="ntpcontent">
     <br>
     <legend>Time Settings</legend>
-    <h6 class="text-muted">With Network Time Protocol (NTP) enabled, all times are adjusted to the local timezone and
+    <h6 class="text-muted">With Network Time Protocol (NTP) enabled, all times are adjusted to the local timezone
+        and
         respect daylight saving time (DST)</h6>
     <br>
     <div class="row form-group">
@@ -354,10 +390,7 @@
         <label class="col-xs-3">Browser Time</label>
         <span id="rtc" class="col-xs-9 col-md-5"></span>
         <div class="col-xs-3">
-            <button onclick="syncBrowserTime()" class="btn btn-info btn-sm">Sync Browser Time to Device</button><i
-                style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true"
-                data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="Use your browser time. Useful when the system does not have an internet connection."></i>
+            <button onclick="syncBrowserTime()" class="btn btn-info btn-sm">Sync Browser Time to Device</button>
         </div>
     </div>
 
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index d46061e6d..2fddb5394 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -26,39 +26,7 @@ var formData = new FormData();
 
 var nextIsNotJson = false;
 
-var config = {
-    "command": "configfile",
-    "network": {
-        "ssid": "",
-        "wmode": 1,
-        "password": ""
-    },
-    "general": {
-        "hostname": "",
-        "serial": false,
-        "password": "admin",
-        "log_events": true,
-        "version": "1.0.0"
-    },
-    "mqtt": {
-        "enabled": false,
-        "ip": "",
-        "port": 1883,
-        "qos": 1,
-        "keepalive": 60,
-        "retain": true,
-        "base": "",
-        "user": "",
-        "password": "",
-        "heartbeat": false
-    },
-    "ntp": {
-        "server": "pool.ntp.org",
-        "interval": 60,
-        "timezone": 2,
-        "enabled": true
-    }
-};
+var config = {};
 
 function browserTime() {
     var d = new Date(0); // The 0 there is the key, which sets the date to the epoch
@@ -217,6 +185,10 @@ function savenetwork() {
 
     config.network.wmode = wmode;
     config.network.password = document.getElementById("wifipass").value;
+    config.network.staticip = document.getElementById("staticip").value;
+    config.network.gatewayip = document.getElementById("gatewayip").value;
+    config.network.nmask = document.getElementById("nmask").value;
+    config.network.dnsip = document.getElementById("dnsip").value;
 
     saveconfig();
 }
@@ -293,15 +265,13 @@ function inProgressUpload() {
 
 function handleSTA() {
     document.getElementById("scanb").style.display = "block";
-    document.getElementById("hidessid").style.display = "block";
-    document.getElementById("hidepasswd").style.display = "block";
+    document.getElementById("hideclient").style.display = "block";
 }
 
 function handleAP() {
     document.getElementById("ssid").style.display = "none";
     document.getElementById("scanb").style.display = "none";
-    document.getElementById("hidessid").style.display = "none";
-    document.getElementById("hidepasswd").style.display = "none";
+    document.getElementById("hideclient").style.display = "none";
 
     document.getElementById("inputtohide").style.display = "block";
 }
@@ -317,6 +287,11 @@ function listnetwork() {
         handleSTA();
     }
 
+    document.getElementById("staticip").value = config.network.staticip;
+    document.getElementById("gatewayip").value = config.network.gatewayip;
+    document.getElementById("nmask").value = config.network.nmask;
+    document.getElementById("dnsip").value = config.network.dnsip;
+
 }
 
 function listgeneral() {
@@ -985,7 +960,7 @@ function start() {
     });
 }
 
-function refreshEMS() {
+function refreshCustomStatus() {
     websock.send("{\"command\":\"custom_status\"}");
 }
 
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index c96477ab8..968ab9d3c 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -64,13 +64,18 @@ var configfile = {
     "network": {
         "ssid": "myssid",
         "wmode": 0,
-        "password": "password"
+        "password": "password",
+        "password": "",
+        "staticip": "",
+        "gatewayip": "",
+        "nmask": "",
+        "dnsip": ""
     },
     "general": {
-        "hostname": "myesp",
+        "hostname": "ems-esp",
         "password": "admin",
         "serial": true,
-        "version": "1.9.1",
+        "version": "1.0.0",
         "log_events": true
     },
     "mqtt": {
@@ -87,7 +92,7 @@ var configfile = {
     },
     "ntp": {
         "server": "pool.ntp.org",
-        "interval": 60,
+        "interval": 720,
         "timezone": 2,
         "enabled": true
     }

From beef1290ceae3924f2379aaab479b9fb5c178efe Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 18:12:47 +0100
Subject: [PATCH 070/120] refactor hc

---
 src/ems.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/ems.cpp b/src/ems.cpp
index 185493cba..ebea04632 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1471,7 +1471,7 @@ void _process_RC35StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
         return;
     }
 
-    uint8_t hc_num = _getHeatingCircuit(EMS_RxTelegram) - 1; // which HC is it, 0-3
+    uint8_t hc_num = _getHeatingCircuit(EMS_RxTelegram); // which HC is it, 0-3
 
     // ignore if the value is 0 (see https://github.com/proddy/EMS-ESP/commit/ccc30738c00f12ae6c89177113bd15af9826b836)
     if (EMS_RxTelegram->data[EMS_OFFSET_RC35StatusMessage_setpoint] != 0x00) {
@@ -1664,7 +1664,7 @@ void _process_RC30Set(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Thermostat.hc[hc].mode   = _toByte(EMS_OFFSET_RC30Set_mode); // fixed for HC1
 }
 
-// return which heating circuit it is, 1-4
+// return which heating circuit it is, 0-3 for HC1 to HC4
 // based on type 0x3E (HC1), 0x48 (HC2), 0x52 (HC3), 0x5C (HC4)
 uint8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc_num;
@@ -1688,7 +1688,9 @@ uint8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram) {
         break;
     }
 
-    EMS_Thermostat.hc[hc_num - 1].active = true;
+    hc_num--;
+
+    EMS_Thermostat.hc[hc_num].active = true;
 
     return (hc_num);
 }
@@ -1710,11 +1712,11 @@ void _process_RC35Set(_EMS_RxTelegram * EMS_RxTelegram) {
 
     uint8_t hc_num = _getHeatingCircuit(EMS_RxTelegram); // which HC is it?
 
-    EMS_Thermostat.hc[hc_num - 1].mode        = _toByte(EMS_OFFSET_RC35Set_mode);         // night, day, auto
-    EMS_Thermostat.hc[hc_num - 1].daytemp     = _toByte(EMS_OFFSET_RC35Set_temp_day);     // is * 2
-    EMS_Thermostat.hc[hc_num - 1].nighttemp   = _toByte(EMS_OFFSET_RC35Set_temp_night);   // is * 2
-    EMS_Thermostat.hc[hc_num - 1].holidaytemp = _toByte(EMS_OFFSET_RC35Set_temp_holiday); // is * 2
-    EMS_Thermostat.hc[hc_num - 1].heatingtype = _toByte(EMS_OFFSET_RC35Set_heatingtype);  // byte 0 bit floor heating = 3
+    EMS_Thermostat.hc[hc_num].mode        = _toByte(EMS_OFFSET_RC35Set_mode);         // night, day, auto
+    EMS_Thermostat.hc[hc_num].daytemp     = _toByte(EMS_OFFSET_RC35Set_temp_day);     // is * 2
+    EMS_Thermostat.hc[hc_num].nighttemp   = _toByte(EMS_OFFSET_RC35Set_temp_night);   // is * 2
+    EMS_Thermostat.hc[hc_num].holidaytemp = _toByte(EMS_OFFSET_RC35Set_temp_holiday); // is * 2
+    EMS_Thermostat.hc[hc_num].heatingtype = _toByte(EMS_OFFSET_RC35Set_heatingtype);  // byte 0 bit floor heating = 3
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }

From 8e66fa81e37b1efefe42279c1cac98fa243e9938 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 9 Nov 2019 18:13:08 +0100
Subject: [PATCH 071/120] publish any thermostat mode to MQTT

---
 src/ems-esp.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 154ff2ae9..b7f70d5d5 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -773,6 +773,10 @@ void publishEMSValues(bool force) {
                     dataThermostat[THERMOSTAT_MODE] = "manual";
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
                     dataThermostat[THERMOSTAT_MODE] = "auto";
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
+                    dataThermostat[THERMOSTAT_MODE] = "day";
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
+                    dataThermostat[THERMOSTAT_MODE] = "night";
                 }
             }
         }

From f10999be89f5e8c84c751e8278e5bba6c72a7b2f Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 10 Nov 2019 10:19:45 +0100
Subject: [PATCH 072/120] map RC35 thermostat modes nicely for HA

---
 doc/home assistant/climate.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/home assistant/climate.yaml b/doc/home assistant/climate.yaml
index 9e9554afe..87c75a220 100644
--- a/doc/home assistant/climate.yaml	
+++ b/doc/home assistant/climate.yaml	
@@ -11,7 +11,7 @@
   current_temperature_topic: "home/ems-esp/thermostat_data"
   temperature_state_topic: "home/ems-esp/thermostat_data"
 
-  mode_state_template: "{% if value_json.hc1.mode == 'manual' %} heat {% else %} {{value_json.hc1.mode}} {% endif %}"
+  mode_state_template: "{% if value_json_hc1.mode in ['manual', 'day'] %}heat{% elif value_json_hc1.mode in ['night', 'off'] %}off{% else %}auto{% endif %}"
 
   current_temperature_template: "{{ value_json.hc1.currtemp }}"
   temperature_state_template: "{{ value_json.hc1.seltemp }}"

From c3f57e3a48e8f8aca53823b066cd3c24ee4b2ec4 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 10 Nov 2019 13:51:41 +0100
Subject: [PATCH 073/120] fix json for thermostat

---
 doc/home assistant/climate.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/home assistant/climate.yaml b/doc/home assistant/climate.yaml
index 87c75a220..b070f06b2 100644
--- a/doc/home assistant/climate.yaml	
+++ b/doc/home assistant/climate.yaml	
@@ -4,14 +4,15 @@
     - "auto"
     - "heat"
     - "off"
+    
   mode_command_topic: "home/ems-esp/thermostat_cmd_mode1"
   temperature_command_topic: "home/ems-esp/thermostat_cmd_temp1"
    
   mode_state_topic: "home/ems-esp/thermostat_data"
   current_temperature_topic: "home/ems-esp/thermostat_data"
   temperature_state_topic: "home/ems-esp/thermostat_data"
-
-  mode_state_template: "{% if value_json_hc1.mode in ['manual', 'day'] %}heat{% elif value_json_hc1.mode in ['night', 'off'] %}off{% else %}auto{% endif %}"
+  
+  mode_state_template: "{% if value_json.hc1.mode in ['manual', 'day'] %} heat {% elif value_json.hc1.mode in ['night', 'off'] %} off {% else %} auto {% endif %}"
 
   current_temperature_template: "{{ value_json.hc1.currtemp }}"
   temperature_state_template: "{{ value_json.hc1.seltemp }}"

From 9e3f5700e16c95541863c4e81b5adfa3344deea7 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 11 Nov 2019 23:54:59 +0100
Subject: [PATCH 074/120] code optimizations on EMS device library

---
 CHANGELOG.md      |   1 +
 src/ems-esp.cpp   |  93 +++--
 src/ems.cpp       | 894 ++++++++++++++--------------------------------
 src/ems.h         | 186 ++++++----
 src/ems_devices.h | 209 +++++------
 src/version.h     |   2 +-
 6 files changed, 501 insertions(+), 884 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 366310c8f..c7f7a1675 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ There are breaking changes in this release. See `publish_time` below and make su
 - Keeping Thermostat day/night modes separate from off/auto/manual, and setting this for the Junkers FR50
 - Removed `publish_always` and use `publish_time`. For automatic mode you will need to change `publish_time` to 0 which will send MQTT every time data has changed (every 10 seconds).
 - Changed NTP interval from 1 hour to 12 hours
+- Refactored EMS device library to make it support multi-EMS devices easier (e.g. multiple thermostats)
 
 ### Removed
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index b7f70d5d5..a3e37ff7e 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -102,7 +102,7 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=automatic)"},
     {true, "tx_mode <n>", "changes Tx logic. 1=EMS generic, 2=EMS+, 3=HT3"},
 
-    {false, "info", "show current captured on the devices"},
+    {false, "info", "show current values deciphered from the EMS messages"},
     {false, "log <n | b | t | s | r | j | v>", "set logging mode to none, basic, thermostat only, solar module only, raw, jabber or verbose"},
 
 #ifdef TESTS
@@ -111,7 +111,7 @@ static const command_t project_cmds[] PROGMEM = {
 
     {false, "publish", "publish all values to MQTT"},
     {false, "refresh", "fetch values from the EMS devices"},
-    {false, "devices [all]", "list all supported and detected EMS devices"},
+    {false, "devices", "list detected EMS devices"},
     {false, "queue", "show current Tx queue"},
     {false, "autodetect [quick]", "detect EMS devices and attempt to automatically set boiler and thermostat types"},
     {false, "send XX ...", "send raw telegram data to EMS bus (XX are hex values)"},
@@ -143,11 +143,11 @@ void myDebugLog(const char * s) {
 // hc_num is 1 to 4
 _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
     _EMS_THERMOSTAT_MODE thermoMode = EMS_THERMOSTAT_MODE_UNKNOWN;
-    uint8_t              model      = ems_getThermostatModel();
 
-    uint8_t mode = EMS_Thermostat.hc[hc_num - 1].mode;
+    uint8_t mode  = EMS_Thermostat.hc[hc_num - 1].mode;
+    uint8_t model = ems_getThermostatModel();
 
-    if (model == EMS_MODEL_RC20) {
+    if (model == EMS_DEVICE_FLAG_RC20) {
         if (mode == 0) {
             thermoMode = EMS_THERMOSTAT_MODE_OFF;
         } else if (mode == 1) {
@@ -155,13 +155,13 @@ _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
         } else if (mode == 2) {
             thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
-    } else if (model == EMS_MODEL_RC300) {
+    } else if (model == EMS_DEVICE_FLAG_RC300) {
         if (mode == 0) {
             thermoMode = EMS_THERMOSTAT_MODE_MANUAL;
         } else if (mode == 1) {
             thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
-    } else if (model == EMS_MODEL_FR10 || model == EMS_MODEL_FR50 || model == EMS_MODEL_FR100) {
+    } else if (model == EMS_DEVICE_FLAG_JUNKERS) {
         if (mode == 1) {
             thermoMode = EMS_THERMOSTAT_MODE_MANUAL;
         } else if (mode == 2) {
@@ -181,7 +181,7 @@ _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
 }
 
 // figures out the thermostat day/night mode depending on the thermostat type
-// returns {EMS_THERMOSTAT_MODE_UNKNOWN, EMS_THERMOSTAT_MODE_OFF, EMS_THERMOSTAT_MODE_MANUAL, EMS_THERMOSTAT_MODE_AUTO, EMS_THERMOSTAT_MODE_NIGHT, EMS_THERMOSTAT_MODE_DAY}
+// returns {EMS_THERMOSTAT_MODE_NIGHT, EMS_THERMOSTAT_MODE_DAY}
 // hc_num is 1 to 4
 _EMS_THERMOSTAT_MODE _getThermostatDayMode(uint8_t hc_num) {
     _EMS_THERMOSTAT_MODE thermoMode = EMS_THERMOSTAT_MODE_UNKNOWN;
@@ -189,19 +189,19 @@ _EMS_THERMOSTAT_MODE _getThermostatDayMode(uint8_t hc_num) {
 
     uint8_t mode = EMS_Thermostat.hc[hc_num - 1].day_mode;
 
-    if (model == EMS_MODEL_FW100 || model == EMS_MODEL_FW120 || model == EMS_MODEL_FR10 || model == EMS_MODEL_FR100 || model == EMS_MODEL_FR50) {
+    if (model == EMS_DEVICE_FLAG_JUNKERS) {
         if (mode == 3) {
             thermoMode = EMS_THERMOSTAT_MODE_DAY;
         } else if (mode == 2) {
             thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
         }
-    } else if (model == EMS_MODEL_RC35 || model == EMS_MODEL_ES73) {
+    } else if (model == EMS_DEVICE_FLAG_RC35) {
         if (mode == 0) {
             thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
         } else if (mode == 1) {
             thermoMode = EMS_THERMOSTAT_MODE_DAY;
         }
-    } else if (model == EMS_MODEL_RC100 || model == EMS_MODEL_RC300) {
+    } else if (model == EMS_DEVICE_FLAG_RC300) {
         if (mode == 0) {
             thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
         } else if (mode == 1) {
@@ -271,7 +271,7 @@ void showInfo() {
     myDebug_P(PSTR("%sBoiler stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
 
     // version details
-    myDebug_P(PSTR("  Boiler: %s"), ems_getBoilerDescription(buffer_type));
+    myDebug_P(PSTR("  Boiler: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_BOILER, buffer_type));
 
     // active stats
     if (ems_getBusConnected()) {
@@ -364,7 +364,7 @@ void showInfo() {
     if (ems_getSolarModuleEnabled()) {
         myDebug_P(PSTR("")); // newline
         myDebug_P(PSTR("%sSolar Module stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
-        myDebug_P(PSTR("  Solar module: %s"), ems_getSolarModuleDescription(buffer_type));
+        myDebug_P(PSTR("  Solar module: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_SOLAR, buffer_type));
         _renderShortValue("Collector temperature", "C", EMS_SolarModule.collectorTemp);
         _renderShortValue("Bottom temperature", "C", EMS_SolarModule.bottomTemp);
         _renderIntValue("Pump modulation", "%", EMS_SolarModule.pumpModulation);
@@ -384,7 +384,7 @@ void showInfo() {
     if (ems_getHeatPumpEnabled()) {
         myDebug_P(PSTR("")); // newline
         myDebug_P(PSTR("%sHeat Pump stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
-        myDebug_P(PSTR("  Heat Pump module: %s"), ems_getHeatPumpDescription(buffer_type));
+        myDebug_P(PSTR("  Heat Pump module: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_HEATPUMP, buffer_type));
         _renderIntValue("Pump modulation", "%", EMS_HeatPump.HPModulation);
         _renderIntValue("Pump speed", "%", EMS_HeatPump.HPSpeed);
     }
@@ -393,24 +393,21 @@ void showInfo() {
     if (ems_getThermostatEnabled()) {
         myDebug_P(PSTR("")); // newline
         myDebug_P(PSTR("%sThermostat stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
-        myDebug_P(PSTR("  Thermostat: %s"), ems_getThermostatDescription(buffer_type, false));
+        myDebug_P(PSTR("  Thermostat: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_THERMOSTAT, buffer_type, false));
 
         // Render Thermostat Date & Time
         uint8_t model = ems_getThermostatModel();
-        if ((model != EMS_MODEL_EASY)) {
+        if ((model != EMS_DEVICE_FLAG_EASY)) {
             myDebug_P(PSTR("  Thermostat time is %s"), EMS_Thermostat.datetime);
         }
 
         uint8_t _m_setpoint, _m_curr;
         switch (model) {
-        case EMS_MODEL_EASY:
+        case EMS_DEVICE_FLAG_EASY:
             _m_setpoint = 10; // *100
             _m_curr     = 10; // *100
             break;
-        case EMS_MODEL_FR10:
-        case EMS_MODEL_FR50:
-        case EMS_MODEL_FW100:
-        case EMS_MODEL_FW120:
+        case EMS_DEVICE_FLAG_JUNKERS:
             _m_setpoint = 1; // *10
             _m_curr     = 1; // *10
             break;
@@ -430,7 +427,7 @@ void showInfo() {
 
                 // Render Day/Night/Holiday Temperature on RC35s
                 // there is no single setpoint temp, but one for day, night and vacation
-                if (model == EMS_MODEL_RC35) {
+                if (model == EMS_DEVICE_FLAG_RC35) {
                     if (EMS_Thermostat.hc[hc_num - 1].summer_mode) {
                         myDebug_P(PSTR("   Program is set to Summer mode"));
                     } else if (EMS_Thermostat.hc[hc_num - 1].holiday_mode) {
@@ -732,15 +729,15 @@ void publishEMSValues(bool force) {
                 strlcpy(hc, THERMOSTAT_HC, sizeof(hc));
                 strlcat(hc, _int_to_char(s, thermostat->hc), sizeof(hc));
                 JsonObject dataThermostat = rootThermostat.createNestedObject(hc);
+                uint8_t    model          = ems_getThermostatModel();
 
                 // different logic depending on thermostat types
-                if (ems_getThermostatModel() == EMS_MODEL_EASY) {
+                if (model == EMS_DEVICE_FLAG_EASY) {
                     if (thermostat->setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
                         dataThermostat[THERMOSTAT_SELTEMP] = (float)thermostat->setpoint_roomTemp / 100;
                     if (thermostat->curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
                         dataThermostat[THERMOSTAT_CURRTEMP] = (float)thermostat->curr_roomTemp / 100;
-                } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FR50)
-                           || (ems_getThermostatModel() == EMS_MODEL_FW100) || (ems_getThermostatModel() == EMS_MODEL_FW120)) {
+                } else if (model == EMS_DEVICE_FLAG_JUNKERS) {
                     if (thermostat->setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
                         dataThermostat[THERMOSTAT_SELTEMP] = (float)thermostat->setpoint_roomTemp / 10;
                     if (thermostat->curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
@@ -1264,14 +1261,7 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
     }
 
     if (strcmp(first_cmd, "devices") == 0) {
-        if (wc == 2) {
-            char * second_cmd = _readWord();
-            if (strcmp(second_cmd, "all") == 0) {
-                ems_printAllDevices(); // verbose
-            }
-        } else {
-            ems_printDevices();
-        }
+        ems_printDevices();
         ok = true;
     }
 
@@ -1714,23 +1704,32 @@ void WebCallback(JsonObject root) {
 
     // send over EMS devices
     JsonArray list = emsbus.createNestedArray("devices");
+    char      buffer[50];
+
+    for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
+        JsonObject item = list.createNestedObject();
+
+        (void)ems_getDeviceTypeDescription((it)->device_id, buffer);
+        item["type"] = buffer;
+
+        if ((it)->known) {
+            item["model"] = EMS_Devices[(it)->device_index].device_desc;
+        } else {
+            item["model"] = EMS_MODELTYPE_UNKNOWN_STRING;
+        }
 
-    for (std::list<_Generic_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
-        JsonObject item   = list.createNestedObject();
-        item["type"]      = (it)->model_type;
-        item["model"]     = (it)->model_string;
         item["version"]   = (it)->version;
         item["productid"] = (it)->product_id;
 
-        char buffer[10];
+        char tmp_hex[10];
         // copy of my _hextoa() function from ems.cpp, to convert device_id into a 0xNN hex value string
-        char * p         = buffer;
+        char * p         = tmp_hex;
         byte   nib1      = ((it)->device_id >> 4) & 0x0F;
         byte   nib2      = ((it)->device_id >> 0) & 0x0F;
         *p++             = nib1 < 0xA ? '0' + nib1 : 'A' + nib1 - 0xA;
         *p++             = nib2 < 0xA ? '0' + nib2 : 'A' + nib2 - 0xA;
         *p               = '\0'; // null terminate just in case
-        item["deviceid"] = buffer;
+        item["deviceid"] = tmp_hex;
     }
 
     // send over Thermostat data
@@ -1740,18 +1739,18 @@ void WebCallback(JsonObject root) {
         thermostat["ok"] = true;
 
         char buffer[200];
-        thermostat["tm"] = ems_getThermostatDescription(buffer, true);
+        thermostat["tm"] = ems_getDeviceDescription(EMS_DEVICE_TYPE_THERMOSTAT, buffer, true);
 
         uint8_t hc_num = EMS_THERMOSTAT_DEFAULTHC; // default to HC1
+        uint8_t model  = ems_getThermostatModel();
 
         // Render Current & Setpoint Room Temperature
-        if (ems_getThermostatModel() == EMS_MODEL_EASY) {
+        if (model == EMS_DEVICE_FLAG_EASY) {
             if (EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
                 thermostat["ts"] = (float)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 100;
             if (EMS_Thermostat.hc[hc_num - 1].curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
                 thermostat["tc"] = (float)EMS_Thermostat.hc[hc_num - 1].curr_roomTemp / 100;
-        } else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FR50) || (ems_getThermostatModel() == EMS_MODEL_FW100)
-                   || (ems_getThermostatModel() == EMS_MODEL_FW120)) {
+        } else if (model == EMS_DEVICE_FLAG_JUNKERS) {
             if (EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET)
                 thermostat["ts"] = (float)EMS_Thermostat.hc[hc_num - 1].setpoint_roomTemp / 10;
             if (EMS_Thermostat.hc[hc_num - 1].curr_roomTemp != EMS_VALUE_SHORT_NOTSET)
@@ -1781,7 +1780,7 @@ void WebCallback(JsonObject root) {
         boiler["ok"] = true;
 
         char buffer[200];
-        boiler["bm"] = ems_getBoilerDescription(buffer, true);
+        boiler["bm"] = ems_getDeviceDescription(EMS_DEVICE_TYPE_BOILER, buffer, true);
 
         boiler["b1"] = (EMS_Boiler.tapwaterActive ? "running" : "off");
         boiler["b2"] = (EMS_Boiler.heatingActive ? "active" : "off");
@@ -1808,7 +1807,7 @@ void WebCallback(JsonObject root) {
         sm["ok"] = true;
 
         char buffer[200];
-        sm["sm"] = ems_getSolarModuleDescription(buffer, true);
+        sm["sm"] = ems_getDeviceDescription(EMS_DEVICE_TYPE_SOLAR, buffer, true);
 
         if (EMS_SolarModule.collectorTemp != EMS_VALUE_SHORT_NOTSET)
             sm["sm1"] = (float)EMS_SolarModule.collectorTemp / 10; // Collector temperature oC
@@ -1841,7 +1840,7 @@ void WebCallback(JsonObject root) {
     if (ems_getHeatPumpEnabled()) {
         hp["ok"] = true;
         char buffer[200];
-        hp["hm"] = ems_getHeatPumpDescription(buffer, true);
+        hp["hm"] = ems_getDeviceDescription(EMS_DEVICE_TYPE_HEATPUMP, buffer, true);
 
         if (EMS_HeatPump.HPModulation != EMS_VALUE_INT_NOTSET)
             hp["hp1"] = EMS_HeatPump.HPModulation; // Pump modulation %
diff --git a/src/ems.cpp b/src/ems.cpp
index ebea04632..79636428a 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -23,7 +23,7 @@ _EMS_Sys_Status EMS_Sys_Status; // EMS Status
 CircularBuffer<_EMS_TxTelegram, EMS_TX_TELEGRAM_QUEUE_MAX> EMS_TxQueue; // FIFO queue for Tx send buffer
 
 // for storing all detected EMS devices
-std::list<_Generic_Device> Devices;
+std::list<_Detected_Device> Devices;
 
 // macros used in the _process* functions
 #define _toByte(i) (EMS_RxTelegram->data[i])
@@ -101,105 +101,84 @@ void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
 
 /**
  * Recognized EMS types and the functions they call to process the telegrams
- * Format: MODEL ID, TYPE ID, Description, function, emsplus
  */
 const _EMS_Type EMS_Types[] = {
 
     // common
-    {EMS_MODEL_ALL, EMS_TYPE_Version, "Version", _process_Version},
-    {EMS_MODEL_ALL, EMS_TYPE_UBADevices, "UBADevices", _process_UBADevices},
+    {EMS_TYPE_Version, "Version", _process_Version},
+    {EMS_TYPE_UBADevices, "UBADevices", _process_UBADevices},
+    {EMS_TYPE_RCTime, "RCTime", _process_RCTime},
+    {EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
 
-    // Boiler commands
-    {EMS_MODEL_UBA, EMS_TYPE_UBAMonitorFast, "UBAMonitorFast", _process_UBAMonitorFast},
-    {EMS_MODEL_UBA, EMS_TYPE_UBAMonitorSlow, "UBAMonitorSlow", _process_UBAMonitorSlow},
-    {EMS_MODEL_UBA, EMS_TYPE_UBAMonitorWWMessage, "UBAMonitorWWMessage", _process_UBAMonitorWWMessage},
-    {EMS_MODEL_UBA, EMS_TYPE_UBAParameterWW, "UBAParameterWW", _process_UBAParameterWW},
-    {EMS_MODEL_UBA, EMS_TYPE_UBATotalUptimeMessage, "UBATotalUptimeMessage", _process_UBATotalUptimeMessage},
-    {EMS_MODEL_UBA, EMS_TYPE_UBAMaintenanceSettingsMessage, "UBAMaintenanceSettingsMessage", nullptr},
-    {EMS_MODEL_UBA, EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage},
-    {EMS_MODEL_UBA, EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints},
+    // UBA/Boiler
+    {EMS_TYPE_UBAMonitorFast, "UBAMonitorFast", _process_UBAMonitorFast},
+    {EMS_TYPE_UBAMonitorSlow, "UBAMonitorSlow", _process_UBAMonitorSlow},
+    {EMS_TYPE_UBAMonitorWWMessage, "UBAMonitorWWMessage", _process_UBAMonitorWWMessage},
+    {EMS_TYPE_UBAParameterWW, "UBAParameterWW", _process_UBAParameterWW},
+    {EMS_TYPE_UBATotalUptimeMessage, "UBATotalUptimeMessage", _process_UBATotalUptimeMessage},
+    {EMS_TYPE_UBAMaintenanceSettingsMessage, "UBAMaintenanceSettingsMessage", nullptr},
+    {EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage},
+    {EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints},
 
-    // SM devices
-    {EMS_MODEL_SM, EMS_TYPE_SM10Monitor, "SM10Monitor", _process_SM10Monitor},
-    {EMS_MODEL_SM, EMS_TYPE_SM100Monitor, "SM100Monitor", _process_SM100Monitor},
-    {EMS_MODEL_SM, EMS_TYPE_SM100Status, "SM100Status", _process_SM100Status},
-    {EMS_MODEL_SM, EMS_TYPE_SM100Status2, "SM100Status2", _process_SM100Status2},
-    {EMS_MODEL_SM, EMS_TYPE_SM100Energy, "SM100Energy", _process_SM100Energy},
-    {EMS_MODEL_SM, EMS_TYPE_ISM1StatusMessage, "ISM1StatusMessage", _process_ISM1StatusMessage},
-    {EMS_MODEL_SM, EMS_TYPE_ISM1Set, "ISM1Set", _process_ISM1Set},
+    // Solar Module devices
+    {EMS_TYPE_SM10Monitor, "SM10Monitor", _process_SM10Monitor},
+    {EMS_TYPE_SM100Monitor, "SM100Monitor", _process_SM100Monitor},
+    {EMS_TYPE_SM100Status, "SM100Status", _process_SM100Status},
+    {EMS_TYPE_SM100Status2, "SM100Status2", _process_SM100Status2},
+    {EMS_TYPE_SM100Energy, "SM100Energy", _process_SM100Energy},
+    {EMS_TYPE_ISM1StatusMessage, "ISM1StatusMessage", _process_ISM1StatusMessage},
+    {EMS_TYPE_ISM1Set, "ISM1Set", _process_ISM1Set},
 
-    // heatpunps
-    {EMS_MODEL_HP, EMS_TYPE_HPMonitor1, "HeatPumpMonitor1", _process_HPMonitor1},
-    {EMS_MODEL_HP, EMS_TYPE_HPMonitor2, "HeatPumpMonitor2", _process_HPMonitor2},
+    // heatpumps
+    {EMS_TYPE_HPMonitor1, "HeatPumpMonitor1", _process_HPMonitor1},
+    {EMS_TYPE_HPMonitor2, "HeatPumpMonitor2", _process_HPMonitor2},
 
     // RC10
-    {EMS_MODEL_RC10, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_MODEL_RC10, EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set},
-    {EMS_MODEL_RC10, EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage},
+    {EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set},
+    {EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage},
 
     // RC20 and RC20RF
-    {EMS_MODEL_RC20, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
-    {EMS_MODEL_RC20, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_MODEL_RC20, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
-    {EMS_MODEL_RC20, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
-
-    {EMS_MODEL_RC20RF, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
-    {EMS_MODEL_RC20RF, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_MODEL_RC20RF, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
-    {EMS_MODEL_RC20RF, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
+    {EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
+    {EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
 
     // RC30
-    {EMS_MODEL_RC30, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
-    {EMS_MODEL_RC30, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_MODEL_RC30, EMS_TYPE_RC30Set, "RC30Set", _process_RC30Set},
-    {EMS_MODEL_RC30, EMS_TYPE_RC30StatusMessage, "RC30StatusMessage", _process_RC30StatusMessage},
+    {EMS_TYPE_RC30Set, "RC30Set", _process_RC30Set},
+    {EMS_TYPE_RC30StatusMessage, "RC30StatusMessage", _process_RC30StatusMessage},
 
-    // RC35
-    {EMS_MODEL_RC35, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
-    {EMS_MODEL_RC35, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35Set_HC1, "RC35Set_HC1", _process_RC35Set},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35StatusMessage_HC1, "RC35StatusMessage_HC1", _process_RC35StatusMessage},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35Set_HC2, "RC35Set_HC2", _process_RC35Set},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35StatusMessage_HC2, "RC35StatusMessage_HC2", _process_RC35StatusMessage},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35Set_HC3, "RC35Set_HC2", _process_RC35Set},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35StatusMessage_HC3, "RC35StatusMessage_HC3", _process_RC35StatusMessage},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35Set_HC4, "RC35Set_HC4", _process_RC35Set},
-    {EMS_MODEL_RC35, EMS_TYPE_RC35StatusMessage_HC4, "RC35StatusMessage_HC4", _process_RC35StatusMessage},
-
-    // ES73
-    {EMS_MODEL_ES73, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
-    {EMS_MODEL_ES73, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_MODEL_ES73, EMS_TYPE_RC35Set_HC1, "RC35Set", _process_RC35Set},
-    {EMS_MODEL_ES73, EMS_TYPE_RC35StatusMessage_HC1, "RC35StatusMessage", _process_RC35StatusMessage},
+    // RC35 and ES71
+    {EMS_TYPE_RC35Set_HC1, "RC35Set_HC1", _process_RC35Set},
+    {EMS_TYPE_RC35StatusMessage_HC1, "RC35StatusMessage_HC1", _process_RC35StatusMessage},
+    {EMS_TYPE_RC35Set_HC2, "RC35Set_HC2", _process_RC35Set},
+    {EMS_TYPE_RC35StatusMessage_HC2, "RC35StatusMessage_HC2", _process_RC35StatusMessage},
+    {EMS_TYPE_RC35Set_HC3, "RC35Set_HC2", _process_RC35Set},
+    {EMS_TYPE_RC35StatusMessage_HC3, "RC35StatusMessage_HC3", _process_RC35StatusMessage},
+    {EMS_TYPE_RC35Set_HC4, "RC35Set_HC4", _process_RC35Set},
+    {EMS_TYPE_RC35StatusMessage_HC4, "RC35StatusMessage_HC4", _process_RC35StatusMessage},
 
     // Easy
-    {EMS_MODEL_EASY, EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage},
+    {EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage},
 
     // Nefit 1010, RC300, RC310 (EMS Plus)
-    {EMS_MODEL_ALL, EMS_TYPE_RCPLUSStatusMessage_HC1, "RCPLUSStatusMessage_HC1", _process_RCPLUSStatusMessage},
-    {EMS_MODEL_ALL, EMS_TYPE_RCPLUSStatusMessage_HC2, "RCPLUSStatusMessage_HC2", _process_RCPLUSStatusMessage},
-    {EMS_MODEL_ALL, EMS_TYPE_RCPLUSStatusMessage_HC3, "RCPLUSStatusMessage_HC3", _process_RCPLUSStatusMessage},
-    {EMS_MODEL_ALL, EMS_TYPE_RCPLUSStatusMessage_HC4, "RCPLUSStatusMessage_HC4", _process_RCPLUSStatusMessage},
-    {EMS_MODEL_ALL, EMS_TYPE_RCPLUSSet, "RCPLUSSetMessage", _process_RCPLUSSetMessage},
-    {EMS_MODEL_ALL, EMS_TYPE_RCPLUSStatusMode, "RCPLUSStatusMode", _process_RCPLUSStatusMode},
+    {EMS_TYPE_RCPLUSStatusMessage_HC1, "RCPLUSStatusMessage_HC1", _process_RCPLUSStatusMessage},
+    {EMS_TYPE_RCPLUSStatusMessage_HC2, "RCPLUSStatusMessage_HC2", _process_RCPLUSStatusMessage},
+    {EMS_TYPE_RCPLUSStatusMessage_HC3, "RCPLUSStatusMessage_HC3", _process_RCPLUSStatusMessage},
+    {EMS_TYPE_RCPLUSStatusMessage_HC4, "RCPLUSStatusMessage_HC4", _process_RCPLUSStatusMessage},
+    {EMS_TYPE_RCPLUSSet, "RCPLUSSetMessage", _process_RCPLUSSetMessage},
+    {EMS_TYPE_RCPLUSStatusMode, "RCPLUSStatusMode", _process_RCPLUSStatusMode},
 
     // Junkers FR10
-    {EMS_MODEL_ALL, EMS_TYPE_JunkersStatusMessage, "JunkersStatusMessage", _process_JunkersStatusMessage},
+    {EMS_TYPE_JunkersStatusMessage, "JunkersStatusMessage", _process_JunkersStatusMessage},
 
     // Mixing devices
-    {EMS_MODEL_MM, EMS_TYPE_MMPLUSStatusMessage_HC1, "MMPLUSStatusMessage_HC1", _process_MMPLUSStatusMessage},
-    {EMS_MODEL_MM, EMS_TYPE_MMPLUSStatusMessage_HC2, "MMPLUSStatusMessage_HC2", _process_MMPLUSStatusMessage},
+    {EMS_TYPE_MMPLUSStatusMessage_HC1, "MMPLUSStatusMessage_HC1", _process_MMPLUSStatusMessage},
+    {EMS_TYPE_MMPLUSStatusMessage_HC2, "MMPLUSStatusMessage_HC2", _process_MMPLUSStatusMessage}
 
 };
 
-// calculate sizes of arrays at compile
-uint8_t _EMS_Types_max           = ArraySize(EMS_Types);           // number of defined types
-uint8_t _Boiler_Devices_max      = ArraySize(Boiler_Devices);      // number of boiler models
-uint8_t _SolarModule_Devices_max = ArraySize(SolarModule_Devices); // number of solar module types
-uint8_t _Other_Devices_max       = ArraySize(Other_Devices);       // number of other ems devices
-uint8_t _Thermostat_Devices_max  = ArraySize(Thermostat_Devices);  // number of defined thermostat types
-uint8_t _HeatPump_Devices_max    = ArraySize(HeatPump_Devices);    // number of defined heatpump types
-uint8_t _Mixing_Devices_max      = ArraySize(Mixing_Devices);      // number of mixing device types
+// calculate sizes of arrays at compile time
+uint8_t _EMS_Types_max         = ArraySize(EMS_Types);
+uint8_t _EMS_Devices_max       = ArraySize(EMS_Devices);
+uint8_t _EMS_Devices_Types_max = ArraySize(EMS_Devices_Types);
 
 // these structs contain the data we store from the specific EMS devices
 _EMS_Boiler      EMS_Boiler;      // for boiler
@@ -207,7 +186,6 @@ _EMS_Thermostat  EMS_Thermostat;  // for thermostat
 _EMS_SolarModule EMS_SolarModule; // for solar modules
 _EMS_HeatPump    EMS_HeatPump;    // for heatpumps
 _EMS_Mixing      EMS_Mixing;      // for mixing devices
-_EMS_Other       EMS_Other;       // for other known EMS devices
 
 // CRC lookup table with poly 12 for faster checking
 const uint8_t ems_crc_table[] = {0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x1C, 0x1E, 0x20, 0x22, 0x24, 0x26,
@@ -279,7 +257,6 @@ void ems_init() {
         EMS_Mixing.hc[i].pumpMod     = EMS_VALUE_INT_NOTSET;
         EMS_Mixing.hc[i].valveStatus = EMS_VALUE_INT_NOTSET;
         EMS_Mixing.hc[i].device_id   = EMS_ID_NONE;
-        EMS_Mixing.hc[i].model_id    = EMS_MODEL_NONE;
         EMS_Mixing.hc[i].product_id  = EMS_ID_NONE;
     }
 
@@ -339,7 +316,6 @@ void ems_init() {
     EMS_SolarModule.EnergyToday            = EMS_VALUE_USHORT_NOTSET;
     EMS_SolarModule.EnergyTotal            = EMS_VALUE_USHORT_NOTSET;
     EMS_SolarModule.device_id              = EMS_ID_NONE;
-    EMS_SolarModule.model_id               = EMS_MODEL_NONE;
     EMS_SolarModule.product_id             = EMS_ID_NONE;
     EMS_SolarModule.pumpWorkMin            = EMS_VALUE_LONG_NOTSET;
     EMS_SolarModule.setpoint_maxBottomTemp = EMS_VALUE_SHORT_NOTSET;
@@ -348,7 +324,6 @@ void ems_init() {
     EMS_HeatPump.HPModulation = EMS_VALUE_INT_NOTSET;
     EMS_HeatPump.HPSpeed      = EMS_VALUE_INT_NOTSET;
     EMS_HeatPump.device_id    = EMS_ID_NONE;
-    EMS_HeatPump.model_id     = EMS_MODEL_NONE;
     EMS_HeatPump.product_id   = EMS_ID_NONE;
 
     // calculated values
@@ -360,7 +335,6 @@ void ems_init() {
     strlcpy(EMS_Boiler.version, "?", sizeof(EMS_Boiler.version));
 
     // set thermostat model
-    EMS_Thermostat.model_id   = EMS_MODEL_NONE;
     EMS_Thermostat.product_id = EMS_ID_NONE;
     strlcpy(EMS_Thermostat.version, "?", sizeof(EMS_Thermostat.version));
 
@@ -407,11 +381,11 @@ bool ems_getHeatPumpEnabled() {
 }
 
 uint8_t ems_getThermostatModel() {
-    return (EMS_Thermostat.model_id);
+    return (EMS_Thermostat.device_flags & 0x7F); // strip 7th bit
 }
 
 uint8_t ems_getSolarModuleModel() {
-    return (EMS_SolarModule.model_id);
+    return (EMS_SolarModule.device_flags);
 }
 
 void ems_setTxDisabled(bool b) {
@@ -500,7 +474,7 @@ uint8_t _crcCalculator(uint8_t * data, uint8_t len) {
  * Find the pointer to the EMS_Types array for a given type ID
  * or -1 if not found
  */
-int _ems_findType(uint16_t type) {
+int8_t _ems_findType(uint16_t type) {
     uint8_t i         = 0;
     bool    typeFound = false;
     // scan through known ID types
@@ -612,14 +586,6 @@ void _ems_sendTelegram() {
     // we don't remove from the queue yet
     _EMS_TxTelegram EMS_TxTelegram = EMS_TxQueue.first();
 
-    /*
-    // if there is no destination, also delete it from the queue
-    if (EMS_TxTelegram.dest == EMS_ID_NONE) {
-        EMS_TxQueue.shift(); // remove from queue
-        return;
-    }
-    */
-
     // if we're in raw mode just fire and forget
     if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_RAW) {
         EMS_TxTelegram.data[EMS_TxTelegram.length - 1] = _crcCalculator(EMS_TxTelegram.data, EMS_TxTelegram.length); // add the CRC
@@ -717,7 +683,6 @@ void _ems_sendTelegram() {
     }
 }
 
-
 /**
  * Takes the last write command and turns into a validate request
  * placing it on the Tx queue
@@ -770,16 +735,6 @@ void ems_dumpBuffer(const char * prefix, uint8_t * telegram, uint8_t length) {
     static char output_str[200] = {0};
     static char buffer[16]      = {0};
 
-    /*
-    // we only care about known devices
-    if (length) {
-        uint8_t dev = telegram[0] & 0x7F;
-        if (!((dev == 0x04)||(dev == 0x08)||(dev == 0x09)||(dev == 0x0a)
-            ||(dev == 0x01)||(dev == 0x0b)||(dev == 0x10)))
-            return;
-    }
-*/
-
     strlcpy(output_str, "(", sizeof(output_str));
     strlcat(output_str, COLOR_CYAN, sizeof(output_str));
     strlcat(output_str, _smallitoa((uint8_t)((timestamp / 3600000) % 24), buffer), sizeof(output_str));
@@ -801,7 +756,6 @@ void ems_dumpBuffer(const char * prefix, uint8_t * telegram, uint8_t length) {
     strlcat(output_str, _hextoa(EMS_Sys_Status.emsTxStatus, buffer), sizeof(output_str));
     strlcat(output_str, ": ", sizeof(output_str));
 
-
     // print whole buffer, don't interpret any data
     for (int i = 0; i < (length); i++) {
         strlcat(output_str, _hextoa(telegram[i], buffer), sizeof(output_str));
@@ -839,7 +793,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
     }
 
     /* 
-     * It may happen that we where interrupted (for instance by WIFI activity) and the 
+     * It may happen that we were interrupted (for instance by WIFI activity) and the 
      * buffer isn't valid anymore, so we must not answer at all...
      */
     if (EMS_Sys_Status.emsRxStatus != EMS_RX_STATUS_IDLE) {
@@ -982,51 +936,23 @@ void _printMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     char output_str[200] = {0};
     char buffer[16]      = {0};
     char color_s[20]     = {0};
+    char type_s[30];
 
     // source
-    if (src == EMS_Boiler.device_id) {
-        strlcpy(output_str, "Boiler", sizeof(output_str));
-    } else if (src == EMS_Thermostat.device_id) {
-        strlcpy(output_str, "Thermostat", sizeof(output_str));
-    } else if (src == EMS_ID_SM) {
-        strlcpy(output_str, "SM", sizeof(output_str));
-    } else if (src == EMS_ID_HP) {
-        strlcpy(output_str, "HP", sizeof(output_str));
-    } else if (src == EMS_ID_GATEWAY) {
-        strlcpy(output_str, "Gateway", sizeof(output_str));
-    } else {
-        strlcpy(output_str, "0x", sizeof(output_str));
-        strlcat(output_str, _hextoa(src, buffer), sizeof(output_str));
-    }
-
+    ems_getDeviceTypeDescription(src, type_s);
+    strlcpy(output_str, type_s, sizeof(output_str));
     strlcat(output_str, " -> ", sizeof(output_str));
 
     // destination
+    (void)ems_getDeviceTypeDescription(dest, type_s);
+    strlcat(output_str, type_s, sizeof(output_str));
+
     if (dest == EMS_ID_ME) {
-        strlcat(output_str, "me", sizeof(output_str));
-        strlcpy(color_s, COLOR_YELLOW, sizeof(color_s));
+        strlcpy(color_s, COLOR_YELLOW, sizeof(color_s)); // me
     } else if (dest == EMS_ID_NONE) {
-        strlcat(output_str, "all", sizeof(output_str));
-        strlcpy(color_s, COLOR_GREEN, sizeof(color_s));
-    } else if (dest == EMS_Boiler.device_id) {
-        strlcat(output_str, "Boiler", sizeof(output_str));
-        strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
-    } else if (dest == EMS_ID_SM) {
-        strlcat(output_str, "SM", sizeof(output_str));
-        strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
-    } else if (dest == EMS_ID_HP) {
-        strlcat(output_str, "HP", sizeof(output_str));
-        strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
-    } else if (dest == EMS_ID_GATEWAY) {
-        strlcat(output_str, "Gateway", sizeof(output_str));
-        strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
-    } else if (dest == EMS_Thermostat.device_id) {
-        strlcat(output_str, "Thermostat", sizeof(output_str));
-        strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
+        strlcpy(color_s, COLOR_GREEN, sizeof(color_s)); // broadcast
     } else {
-        strlcat(output_str, "0x", sizeof(output_str));
-        strlcat(output_str, _hextoa(dest, buffer), sizeof(output_str));
-        strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
+        strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s)); // everything else
     }
 
     if (length) {
@@ -1086,8 +1012,7 @@ void _ems_processTelegram(_EMS_RxTelegram * EMS_RxTelegram) {
 
     while (i < _EMS_Types_max) {
         if (EMS_Types[i].type == type) {
-            // is it a broadcast or something sent to us?
-            // we don't really care where it is from
+            // is it a broadcast (dest=0x00) or something sent to us (dest=0x08)?
             if ((dest == EMS_ID_NONE) || (dest == EMS_ID_ME)) {
                 typeFound = true;
                 break;
@@ -1882,7 +1807,7 @@ void _process_SetPoints(_EMS_RxTelegram * EMS_RxTelegram) {
  * common for all thermostats
  */
 void _process_RCTime(_EMS_RxTelegram * EMS_RxTelegram) {
-    if ((EMS_Thermostat.model_id == EMS_MODEL_EASY)) {
+    if ((EMS_Thermostat.device_flags == EMS_DEVICE_FLAG_EASY)) {
         return; // not supported
     }
 
@@ -1918,84 +1843,54 @@ void ems_clearDeviceList() {
 
 /*
  * add an EMS device to our list of detected devices if its unique
- * model_type : 1=boiler, 2=thermostat, 3=sm, 4=other, 5=unknown
+ * returns true if already in list
  */
-void _addDevice(uint8_t model_type, uint8_t src, uint8_t product_id, char * version, uint8_t i) {
-    _Generic_Device device;
+bool _addDevice(_EMS_DEVICE_TYPE device_type, uint8_t product_id, uint8_t device_id, uint8_t device_index, const char * version, const char * device_desc) {
+    _Detected_Device device;
 
     // check for duplicates
-    bool found = false;
-    for (std::list<_Generic_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
-        if (((it)->product_id == product_id) && ((it)->device_id == src)) {
-            found = true; // it already exists in the list
+    // a combi of product_id and device_id make it unique
+    for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
+        if (((it)->product_id == product_id) && ((it)->device_id == device_id)) {
+            return (true); // it already exists in the list, don't add
         }
     }
 
-    char device_type[500];
-    strlcpy(device_type, "EMS Device recognized as ", sizeof(device_type));
+    // create a new record and add it to list
+    device.device_type  = device_type;
+    device.product_id   = product_id;
+    device.device_id    = device_id;
+    device.device_index = device_index; // where it is in the EMS_Devices table
+    strlcpy(device.version, version, sizeof(device.version));
+    device.known = (device_type != EMS_DEVICE_TYPE_UNKNOWN);
+    Devices.push_back(device);
 
-    switch (model_type) {
-    case EMS_MODELTYPE_BOILER:
-        strlcat(device_type, "Boiler", sizeof(device_type));
-        strlcpy(device.model_string, Boiler_Devices[i].model_string, sizeof(device.model_string));
-        break;
-    case EMS_MODELTYPE_THERMOSTAT:
-        strlcat(device_type, "Thermostat", sizeof(device_type));
-        strlcpy(device.model_string, Thermostat_Devices[i].model_string, sizeof(device.model_string));
-        break;
-    case EMS_MODELTYPE_SM:
-        strlcat(device_type, "Solar Module", sizeof(device_type));
-        strlcpy(device.model_string, SolarModule_Devices[i].model_string, sizeof(device.model_string));
-        break;
-    case EMS_MODELTYPE_HP:
-        strlcat(device_type, "Heat Pump", sizeof(device_type));
-        strlcpy(device.model_string, HeatPump_Devices[i].model_string, sizeof(device.model_string));
-        break;
-    case EMS_MODELTYPE_MIXING:
-        strlcat(device_type, "Mixing Device", sizeof(device_type));
-        strlcpy(device.model_string, Mixing_Devices[i].model_string, sizeof(device.model_string));
-        break;
-    case EMS_MODELTYPE_OTHER:
-        strlcat(device_type, "Other", sizeof(device_type));
-        strlcpy(device.model_string, Other_Devices[i].model_string, sizeof(device.model_string));
-        break;
-    case EMS_MODELTYPE_UNKNOWN:
-    default:
-        strlcat(device_type, "?", sizeof(device_type));
-        strlcpy(device.model_string, EMS_MODELTYPE_UNKNOWN_STRING, sizeof(device.model_string));
-        break;
+    char line[500];
+    strlcpy(line, "New EMS Device recognized as a", sizeof(line));
+
+    // get type as a string
+    char type_s[50];
+    if (ems_getDeviceTypeDescription(device_id, type_s)) {
+        strlcat(line, type_s, sizeof(line));
+    } else {
+        strlcat(line, "?", sizeof(line));
     }
 
     char tmp[6] = {0}; // for formatting numbers
 
-    strlcat(device_type, ": ", sizeof(device_type));
-    strlcat(device_type, device.model_string, sizeof(device_type));
-    strlcat(device_type, " (DeviceID:0x", sizeof(device_type));
-    strlcat(device_type, _hextoa(src, tmp), sizeof(device_type));
+    strlcat(line, ": ", sizeof(line));
+    strlcat(line, device_desc, sizeof(line));
+    strlcat(line, " (DeviceID:0x", sizeof(line));
+    strlcat(line, _hextoa(device_id, tmp), sizeof(line));
+    strlcat(line, " ProductID:", sizeof(line));
+    strlcat(line, itoa(product_id, tmp, 10), sizeof(line));
+    strlcat(line, " Version:", sizeof(line));
+    strlcat(line, version, sizeof(line));
+    strlcat(line, ")", sizeof(line));
 
-    strlcat(device_type, " ProductID:", sizeof(device_type));
-    strlcat(device_type, itoa(product_id, tmp, 10), sizeof(device_type));
+    myDebug(line); // print it
 
-    strlcat(device_type, " Version:", sizeof(device_type));
-    strlcat(device_type, version, sizeof(device_type));
-
-    strlcat(device_type, ")", sizeof(device_type));
-
-    // if already exists mention it
-    if (found) {
-        strlcat(device_type, " **already active**", sizeof(device_type));
-        myDebug(device_type); // print it
-        return;               // exit
-    }
-
-    myDebug(device_type); // print it
-
-    // create a new record and add it to list
-    device.model_type = model_type;
-    device.product_id = product_id;
-    device.device_id  = src;
-    strlcpy(device.version, version, sizeof(device.version));
-    Devices.push_back(device);
+    return false; // added, wasn't a duplicate
 }
 
 /**
@@ -2038,7 +1933,7 @@ void _process_UBADevices(_EMS_RxTelegram * EMS_RxTelegram) {
 }
 
 /**
- * type 0x02 - get the firmware version and type of an EMS device
+ * type 0x02 - get the version and type of an EMS device
  * look up known devices via the product id and make it active if not already setup
  */
 void _process_Version(_EMS_RxTelegram * EMS_RxTelegram) {
@@ -2060,167 +1955,76 @@ void _process_Version(_EMS_RxTelegram * EMS_RxTelegram) {
         }
     }
 
-    uint8_t product_id = _toByte(offset);
+    uint8_t device_id = EMS_RxTelegram->src; // device ID
 
-    // print version as "%02d.%02d"
+    // get version as XX.XX
     char version[10] = {0};
     char buf[6]      = {0};
     strlcpy(version, _smallitoa(_toByte(offset + 1), buf), sizeof(version));
     strlcat(version, ".", sizeof(version));
     strlcat(version, _smallitoa(_toByte(offset + 2), buf), sizeof(version));
 
-    // see if its a known boiler
-    int  i         = 0;
-    bool typeFound = false;
-    while (i < _Boiler_Devices_max) {
-        if ((Boiler_Devices[i].product_id == product_id) && ((EMS_RxTelegram->src & 0x7F) == EMS_ID_BOILER)) {
+    // scan through known devices matching the productid
+    uint8_t product_id = _toByte(offset);
+    uint8_t i          = 0;
+    bool    typeFound  = false;
+    while (i < _EMS_Devices_max) {
+        if (EMS_Devices[i].product_id == product_id) {
             typeFound = true; // we have a matching product id. i is the index.
             break;
         }
         i++;
     }
 
-    if (typeFound) {
-        // its a boiler, add to list
-        _addDevice(EMS_MODELTYPE_BOILER, EMS_RxTelegram->src, product_id, version, i); // type 1 = boiler
-
-        // if its a boiler set it, unless it already has been set by checking for a productID
-        // it will take the first one found in the list
-        if ((EMS_Boiler.device_id == EMS_ID_NONE) || ((EMS_Boiler.device_id == EMS_ID_BOILER) && EMS_Boiler.product_id == EMS_ID_NONE)) {
-            /*
-            myDebug_P(PSTR("* Setting Boiler to model %s (DeviceID:0x%02X ProductID:%d Version:%s)"),
-                      Boiler_Devices[i].model_string,
-                      EMS_ID_BOILER,
-                      product_id,
-                      version);
-                      */
-
-            EMS_Boiler.device_id  = EMS_ID_BOILER;
-            EMS_Boiler.product_id = Boiler_Devices[i].product_id;
-            strlcpy(EMS_Boiler.version, version, sizeof(EMS_Boiler.version));
-
-            ems_getBoilerValues(); // get Boiler values that we would usually have to wait for
-        }
+    // if not found, just add it
+    if (!typeFound) {
+        (void)_addDevice(EMS_DEVICE_TYPE_UNKNOWN, product_id, device_id, 0xFF, version, EMS_MODELTYPE_UNKNOWN_STRING); // use device_index of 255
         return;
     }
 
-    // its not a boiler, maybe its a known thermostat?
-    i = 0;
-    while (i < _Thermostat_Devices_max) {
-        if (Thermostat_Devices[i].product_id == product_id) {
-            typeFound = true; // we have a matching product id. i is the index.
-            break;
-        }
-        i++;
+    // we recognized it, see if we already have it in our recognized list
+    if (_addDevice(EMS_Devices[i].type, product_id, device_id, i, version, EMS_Devices[i].device_desc)) {
+        return; // already in list
     }
 
-    if (typeFound) {
-        // its a known thermostat, add to list
-        _addDevice(EMS_MODELTYPE_THERMOSTAT, EMS_RxTelegram->src, product_id, version, i);
+    // its a new entry, set the specifics
+    uint8_t flags = EMS_Devices[i].flags;
 
-        // if we don't have a thermostat set, use this one. it will pick the first one.
-        if (((EMS_Thermostat.device_id == EMS_ID_NONE) || (EMS_Thermostat.model_id == EMS_MODEL_NONE)
-             || (EMS_Thermostat.device_id == Thermostat_Devices[i].device_id))
-            && EMS_Thermostat.product_id == EMS_ID_NONE) {
-            /*
-            myDebug_P(PSTR("* Setting Thermostat to %s (DeviceID:0x%02X ProductID:%d Version:%s)"),
-                      Thermostat_Devices[i].model_string,
-                      Thermostat_Devices[i].device_id,
-                      product_id,
-                      version);
-                      */
-
-            EMS_Thermostat.model_id        = Thermostat_Devices[i].model_id;
-            EMS_Thermostat.device_id       = EMS_RxTelegram->src;
-            EMS_Thermostat.write_supported = Thermostat_Devices[i].write_supported;
-            EMS_Thermostat.product_id      = product_id;
-            strlcpy(EMS_Thermostat.version, version, sizeof(EMS_Thermostat.version));
-
-            // get Thermostat values (if supported)
-            ems_getThermostatValues();
-        }
-        return;
-    }
-
-
-    // look for Solar Modules
-    i = 0;
-    while (i < _SolarModule_Devices_max) {
-        if (SolarModule_Devices[i].product_id == product_id) {
-            typeFound = true; // we have a matching product id. i is the index.
-            break;
-        }
-        i++;
-    }
-
-    if (typeFound) {
-        // its a known SM, add to list
-        _addDevice(EMS_MODELTYPE_SM, EMS_RxTelegram->src, product_id, version, i);
-
-        // myDebug_P(PSTR("Solar Module support enabled."));
-        EMS_SolarModule.device_id  = EMS_ID_SM;
-        EMS_SolarModule.product_id = product_id;
+    if (EMS_Devices[i].type == EMS_DEVICE_TYPE_BOILER) {
+        EMS_Boiler.device_id    = device_id;
+        EMS_Boiler.product_id   = product_id;
+        EMS_Boiler.device_flags = flags;
+        EMS_Boiler.device_index = i;
+        strlcpy(EMS_Boiler.version, version, sizeof(EMS_Boiler.version));
+        ems_getBoilerValues(); // get Boiler values that we would usually have to wait for
+    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_THERMOSTAT) {
+        EMS_Thermostat.device_id       = device_id;
+        EMS_Thermostat.device_flags    = (flags & 0x7F); // remove 7th bit
+        EMS_Thermostat.write_supported = (flags & EMS_DEVICE_FLAG_NO_WRITE) == 0;
+        EMS_Thermostat.product_id      = product_id;
+        EMS_Thermostat.device_index    = i;
+        strlcpy(EMS_Thermostat.version, version, sizeof(EMS_Thermostat.version));
+        ems_getThermostatValues(); // get Thermostat values
+    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_SOLAR) {
+        EMS_SolarModule.device_id    = device_id;
+        EMS_SolarModule.product_id   = product_id;
+        EMS_SolarModule.device_flags = flags;
+        EMS_SolarModule.device_index = i;
         strlcpy(EMS_SolarModule.version, version, sizeof(EMS_SolarModule.version));
-
-        // fetch Solar Module values
-        ems_getSolarModuleValues();
-        return;
-    }
-
-    // look for heatpumps
-    i = 0;
-    while (i < _HeatPump_Devices_max) {
-        if (HeatPump_Devices[i].product_id == product_id) {
-            typeFound = true; // we have a matching product id. i is the index.
-            break;
-        }
-        i++;
-    }
-
-    if (typeFound) {
-        // its a known SM, add to list
-        _addDevice(EMS_MODELTYPE_HP, EMS_RxTelegram->src, product_id, version, i);
-
-        // myDebug_P(PSTR("Heat Pump support enabled."));
-        EMS_HeatPump.device_id  = EMS_ID_HP;
-        EMS_HeatPump.product_id = product_id;
+        ems_getSolarModuleValues(); // fetch Solar Module values
+    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_HEATPUMP) {
+        EMS_HeatPump.device_id    = device_id;
+        EMS_HeatPump.product_id   = product_id;
+        EMS_HeatPump.device_flags = flags;
+        EMS_HeatPump.device_index = i;
         strlcpy(EMS_HeatPump.version, version, sizeof(EMS_HeatPump.version));
-        return;
-    }
-
-    // look for mixing devices
-    i = 0;
-    while (i < _Mixing_Devices_max) {
-        if (Mixing_Devices[i].product_id == product_id) {
-            typeFound = true;
-            break;
-        }
-        i++;
-    }
-
-    if (typeFound) {
-        _addDevice(EMS_MODELTYPE_MIXING, EMS_RxTelegram->src, product_id, version, i);
-        ems_doReadCommand(EMS_TYPE_MMPLUSStatusMessage_HC1, EMS_RxTelegram->src);
-        EMS_Mixing.detected = true;
-        return;
-    }
-
-    // finally look for the other EMS devices
-    i = 0;
-    while (i < _Other_Devices_max) {
-        if (Other_Devices[i].product_id == product_id) {
-            typeFound = true; // we have a matching product id. i is the index.
-            break;
-        }
-        i++;
-    }
-
-    if (typeFound) {
-        // its a known other device, add to list
-        _addDevice(EMS_MODELTYPE_OTHER, EMS_RxTelegram->src, product_id, version, i);
-    } else {
-        // didn't recognize, add to list anyway
-        _addDevice(EMS_MODELTYPE_UNKNOWN, EMS_RxTelegram->src, product_id, version, 0);
+    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_MIXING) {
+        EMS_Mixing.device_id    = device_id;
+        EMS_Mixing.product_id   = product_id;
+        EMS_Mixing.device_index = i;
+        EMS_Mixing.device_flags = flags;
+        EMS_Mixing.detected     = true;
+        ems_doReadCommand(EMS_TYPE_MMPLUSStatusMessage_HC1, device_id); // fetch MM values
     }
 }
 
@@ -2296,24 +2100,23 @@ void ems_getThermostatValues() {
         return;
     }
 
-    uint8_t model_id  = EMS_Thermostat.model_id;
-    uint8_t device_id = EMS_Thermostat.device_id;
+    uint8_t device_flags = EMS_Thermostat.device_flags;
+    uint8_t device_id    = EMS_Thermostat.device_id;
     uint8_t statusMsg, opMode;
 
-    switch (model_id) {
-    case EMS_MODEL_RC20:
+    switch (device_flags) {
+    case EMS_DEVICE_FLAG_RC20:
         ems_doReadCommand(EMS_TYPE_RC20StatusMessage, device_id); // to get the temps
         ems_doReadCommand(EMS_TYPE_RC20Set, device_id);           // to get the mode
         break;
-    case EMS_MODEL_RC30:
+    case EMS_DEVICE_FLAG_RC30:
         ems_doReadCommand(EMS_TYPE_RC30StatusMessage, device_id); // to get the temps
         ems_doReadCommand(EMS_TYPE_RC30Set, device_id);           // to get the mode
         break;
-    case EMS_MODEL_EASY:
+    case EMS_DEVICE_FLAG_EASY:
         ems_doReadCommand(EMS_TYPE_EasyStatusMessage, device_id);
         break;
-    case EMS_MODEL_RC35:
-    case EMS_MODEL_ES73:
+    case EMS_DEVICE_FLAG_RC35:
         for (uint8_t hc_num = 1; hc_num <= EMS_THERMOSTAT_MAXHC; hc_num++) {
             if (hc_num == 1) {
                 statusMsg = EMS_TYPE_RC35StatusMessage_HC1;
@@ -2332,7 +2135,7 @@ void ems_getThermostatValues() {
             ems_doReadCommand(opMode, device_id);    // to get the mode
         }
         break;
-    case EMS_MODEL_RC300:
+    case EMS_DEVICE_FLAG_RC300:
         ems_doReadCommand(EMS_TYPE_RCPLUSStatusMessage_HC1, device_id);
         ems_doReadCommand(EMS_TYPE_RCPLUSStatusMessage_HC2, device_id);
         ems_doReadCommand(EMS_TYPE_RCPLUSStatusMessage_HC3, device_id);
@@ -2360,189 +2163,96 @@ void ems_getBoilerValues() {
  */
 void ems_getSolarModuleValues() {
     if (ems_getSolarModuleEnabled()) {
-        if (EMS_SolarModule.product_id == EMS_PRODUCTID_SM10) {
+        if (EMS_SolarModule.device_flags == EMS_DEVICE_FLAG_SM10) {
             ems_doReadCommand(EMS_TYPE_SM10Monitor, EMS_ID_SM); // fetch all from SM10Monitor
-        } else if ((EMS_SolarModule.product_id == EMS_PRODUCTID_SM100) || (EMS_SolarModule.product_id == EMS_PRODUCTID_SM50)) {
+        } else if (EMS_SolarModule.device_flags == EMS_DEVICE_FLAG_SM100) {
             ems_doReadCommand(EMS_TYPE_SM100Monitor, EMS_ID_SM); // fetch all from SM100Monitor
         }
     }
 }
 
 /**
- * returns current thermostat type as a string
- * by looking up the product_id
+ * takes a device_id and tries to find the corresponding type name (e.g. Boiler)
+ * If it can't find it, it will use the hex value and function returns false
  */
-char * ems_getThermostatDescription(char * buffer, bool name_only) {
-    uint8_t size = 128;
-    if (!ems_getThermostatEnabled()) {
-        strlcpy(buffer, "<not enabled>", size);
-    } else {
-        int  i      = 0;
-        bool found  = false;
-        char tmp[6] = {0};
+bool ems_getDeviceTypeDescription(uint8_t device_id, char * buffer) {
+    uint8_t i         = 0;
+    bool    typeFound = false;
 
-        // scan through known ID types
-        while (i < _Thermostat_Devices_max) {
-            if (Thermostat_Devices[i].product_id == EMS_Thermostat.product_id) {
-                found = true; // we have a match
-                break;
-            }
-            i++;
+    // scan through known ID types
+    while (i < _EMS_Devices_Types_max) {
+        if (EMS_Devices_Types[i].device_id == device_id) {
+            typeFound = true; // we have a match
+            break;
         }
-
-        if (found) {
-            strlcpy(buffer, Thermostat_Devices[i].model_string, size);
-            if (name_only) {
-                return buffer; // only interested in the model name
-            }
-        } else {
-            strlcpy(buffer, "DeviceID:0x", size);
-            strlcat(buffer, _hextoa(EMS_Thermostat.device_id, tmp), size);
-        }
-
-        strlcat(buffer, " (ProductID:", size);
-        if (EMS_Thermostat.product_id == EMS_ID_NONE) {
-            strlcat(buffer, "?", size);
-        } else {
-            strlcat(buffer, itoa(EMS_Thermostat.product_id, tmp, 10), size);
-        }
-        strlcat(buffer, " Version:", size);
-        strlcat(buffer, EMS_Thermostat.version, size);
-        strlcat(buffer, ")", size);
+        i++;
     }
 
-    return buffer;
+    if (typeFound) {
+        strlcpy(buffer, EMS_Devices_Types[i].device_type_string, 30);
+        return true;
+    } else {
+        // print as hex value
+        char hexbuffer[16] = {0};
+        strlcpy(buffer, "0x", 30);
+        strlcat(buffer, _hextoa(device_id, hexbuffer), 30);
+        return false;
+    }
 }
 
-/**
- *  returns current boiler type as a string
- */
-char * ems_getBoilerDescription(char * buffer, bool name_only) {
-    uint8_t size = 128;
-    if (!ems_getBoilerEnabled()) {
-        strlcpy(buffer, "<not enabled>", size);
-    } else {
-        int  i      = 0;
-        bool found  = false;
-        char tmp[6] = {0};
-
-        // scan through known ID types
-        while (i < _Boiler_Devices_max) {
-            if (Boiler_Devices[i].product_id == EMS_Boiler.product_id) {
-                found = true; // we have a match
-                break;
-            }
-            i++;
-        }
-        if (found) {
-            strlcpy(buffer, Boiler_Devices[i].model_string, size);
-            if (name_only) {
-                return buffer; // only interested in the model name
-            }
-        } else {
-            strlcpy(buffer, "DeviceID:0x", size);
-            strlcat(buffer, _hextoa(EMS_Boiler.device_id, tmp), size);
-        }
-
-        strlcat(buffer, " (ProductID:", size);
-        if (EMS_Boiler.product_id == EMS_ID_NONE) {
-            strlcat(buffer, "?", size);
-        } else {
-            strlcat(buffer, itoa(EMS_Boiler.product_id, tmp, 10), size);
-        }
-        strlcat(buffer, " Version:", size);
-        strlcat(buffer, EMS_Boiler.version, size);
-        strlcat(buffer, ")", size);
-    }
-
-    return buffer;
-}
 
 /**
- *  returns current Solar Module type as a string
+ * returns current device details as a string for known thermostat,boiler,solar and heatpump
  */
-char * ems_getSolarModuleDescription(char * buffer, bool name_only) {
-    uint8_t size = 128;
-    if (!ems_getSolarModuleEnabled()) {
-        strlcpy(buffer, "<not enabled>", size);
-    } else {
-        int  i      = 0;
-        bool found  = false;
-        char tmp[6] = {0};
+char * ems_getDeviceDescription(_EMS_DEVICE_TYPE device_type, char * buffer, bool name_only) {
+    const uint8_t size    = 128;
+    bool          enabled = false;
+    uint8_t       device_id;
+    uint8_t       device_index = 0;
+    char *        version;
 
-        // scan through known ID types
-        while (i < _SolarModule_Devices_max) {
-            if (SolarModule_Devices[i].product_id == EMS_SolarModule.product_id) {
-                found = true; // we have a match
-                break;
-            }
-            i++;
-        }
-        if (found) {
-            strlcpy(buffer, SolarModule_Devices[i].model_string, size);
-            if (name_only) {
-                return buffer; // only interested in the model name
-            }
-        } else {
-            strlcpy(buffer, "DeviceID:0x", size);
-            strlcat(buffer, _hextoa(EMS_SolarModule.device_id, tmp), size);
-        }
-
-        strlcat(buffer, " (ProductID:", size);
-        if (EMS_SolarModule.product_id == EMS_ID_NONE) {
-            strlcat(buffer, "?", size);
-        } else {
-            strlcat(buffer, itoa(EMS_SolarModule.product_id, tmp, 10), size);
-        }
-        strlcat(buffer, " Version:", size);
-        strlcat(buffer, EMS_SolarModule.version, size);
-        strlcat(buffer, ")", size);
+    if (device_type == EMS_DEVICE_TYPE_THERMOSTAT) {
+        enabled      = ems_getThermostatEnabled();
+        device_id    = EMS_Thermostat.device_id;
+        device_index = EMS_Thermostat.device_index;
+        version      = EMS_Thermostat.version;
+    } else if (device_type == EMS_DEVICE_TYPE_BOILER) {
+        enabled      = ems_getBoilerEnabled();
+        device_id    = EMS_Boiler.device_id;
+        device_index = EMS_Boiler.device_index;
+        version      = EMS_Boiler.version;
+    } else if (device_type == EMS_DEVICE_TYPE_SOLAR) {
+        enabled      = ems_getSolarModuleEnabled();
+        device_id    = EMS_SolarModule.device_id;
+        device_index = EMS_SolarModule.device_index;
+        version      = EMS_SolarModule.version;
+    } else if (device_type == EMS_DEVICE_TYPE_HEATPUMP) {
+        enabled      = ems_getHeatPumpEnabled();
+        device_id    = EMS_HeatPump.device_id;
+        device_index = EMS_HeatPump.device_index;
+        version      = EMS_HeatPump.version;
     }
 
-    return buffer;
-}
-
-/**
- *  returns current Heat Pump type as a string
- */
-char * ems_getHeatPumpDescription(char * buffer, bool name_only) {
-    uint8_t size = 128;
-    if (!ems_getHeatPumpEnabled()) {
+    if (!enabled) {
         strlcpy(buffer, "<not enabled>", size);
-    } else {
-        int  i      = 0;
-        bool found  = false;
-        char tmp[6] = {0};
-
-        // scan through known ID types
-        while (i < _HeatPump_Devices_max) {
-            if (HeatPump_Devices[i].product_id == EMS_HeatPump.product_id) {
-                found = true; // we have a match
-                break;
-            }
-            i++;
-        }
-        if (found) {
-            strlcpy(buffer, HeatPump_Devices[i].model_string, size);
-            if (name_only) {
-                return buffer; // only interested in the model name
-            }
-        } else {
-            strlcpy(buffer, "DeviceID:0x", size);
-            strlcat(buffer, _hextoa(EMS_HeatPump.device_id, tmp), size);
-        }
-
-        strlcat(buffer, " (ProductID:", size);
-        if (EMS_HeatPump.product_id == EMS_ID_NONE) {
-            strlcat(buffer, "?", size);
-        } else {
-            strlcat(buffer, itoa(EMS_HeatPump.product_id, tmp, 10), size);
-        }
-        strlcat(buffer, " Version:", size);
-        strlcat(buffer, EMS_HeatPump.version, size);
-        strlcat(buffer, ")", size);
+        return buffer;
     }
 
+    // get device description
+    strlcpy(buffer, EMS_Devices[device_index].device_desc, size);
+    if (name_only) {
+        return buffer; // only interested in the model name
+    }
+
+    strlcat(buffer, " (DeviceID:0x", size);
+    char tmp[6] = {0};
+    strlcat(buffer, _hextoa(device_id, tmp), size);
+    strlcat(buffer, " ProductID:", size);
+    strlcat(buffer, itoa(EMS_Devices[device_index].product_id, tmp, 10), size);
+    strlcat(buffer, " Version:", size);
+    strlcat(buffer, version, size);
+    strlcat(buffer, ")", size);
+
     return buffer;
 }
 
@@ -2554,25 +2264,21 @@ void ems_scanDevices() {
 
     std::list<uint8_t> Device_Ids; // create a new list
 
-
-    Device_Ids.push_back(EMS_ID_BOILER); // add boiler device_id which is always 0x08
-    Device_Ids.push_back(EMS_ID_HP);     // add heat pump
-    Device_Ids.push_back(EMS_ID_SM);     // add solar module
-
-    // copy over thermostats
-    for (_Thermostat_Device tt : Thermostat_Devices) {
-        Device_Ids.push_back(tt.device_id);
-    }
-
-    // copy over others
-    for (_Other_Device ot : Other_Devices) {
-        Device_Ids.push_back(ot.device_id);
-    }
+    Device_Ids.push_back(EMS_ID_BOILER); // UBAMaster/Boilers - 0x08
+    Device_Ids.push_back(EMS_ID_HP);     // HeatPump - 0x38
+    Device_Ids.push_back(EMS_ID_SM);     // Solar Module - 0x30
+    Device_Ids.push_back(0x09);          // Controllers - 0x09
+    Device_Ids.push_back(0x02);          // Connect - 0x02
+    Device_Ids.push_back(0x48);          // Gateway - 0x48
+    Device_Ids.push_back(0x20);          // Mixing Devices - 0x20, 0x21
+    Device_Ids.push_back(0x21);          // Mixing Devices - 0x20, 0x21
+    Device_Ids.push_back(0x10);          // Thermostats - 0x10, 0x17, 0x18
+    Device_Ids.push_back(0x17);          // Thermostats - 0x10, 0x17, 0x18
+    Device_Ids.push_back(0x18);          // Thermostats - 0x10, 0x17, 0x18
 
     // remove duplicates and reserved IDs (like our own device)
     Device_Ids.sort();
-    Device_Ids.unique();
-    Device_Ids.remove(EMS_MODEL_NONE);
+    // Device_Ids.unique();
 
     // send the read command with Version command
     for (uint8_t device_id : Device_Ids) {
@@ -2580,81 +2286,10 @@ void ems_scanDevices() {
     }
 }
 
-/**
- * Print out all handled types
- */
-void ems_printAllDevices() {
-    uint8_t i;
-
-    myDebug_P(PSTR("\nThese %d devices are supported as boiler units:"), _Boiler_Devices_max);
-    for (i = 0; i < _Boiler_Devices_max; i++) {
-        myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d)"),
-                  COLOR_BOLD_ON,
-                  Boiler_Devices[i].model_string,
-                  COLOR_BOLD_OFF,
-                  EMS_ID_BOILER,
-                  Boiler_Devices[i].product_id);
-    }
-
-    myDebug_P(PSTR("\nThese %d devices are supported under solar module devices:"), _SolarModule_Devices_max);
-    for (i = 0; i < _SolarModule_Devices_max; i++) {
-        myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d)"),
-                  COLOR_BOLD_ON,
-                  SolarModule_Devices[i].model_string,
-                  COLOR_BOLD_OFF,
-                  EMS_ID_SM,
-                  SolarModule_Devices[i].product_id);
-    }
-
-    myDebug_P(PSTR("\nThese %d devices are supported under heat pump devices:"), _HeatPump_Devices_max);
-    for (i = 0; i < _HeatPump_Devices_max; i++) {
-        myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d)"),
-                  COLOR_BOLD_ON,
-                  HeatPump_Devices[i].model_string,
-                  COLOR_BOLD_OFF,
-                  EMS_ID_HP,
-                  HeatPump_Devices[i].product_id);
-    }
-
-    myDebug_P(PSTR("\nThese %d devices are supported as other EMS devices:"), _Other_Devices_max);
-    for (i = 0; i < _Other_Devices_max; i++) {
-        myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d)"),
-                  COLOR_BOLD_ON,
-                  Other_Devices[i].model_string,
-                  COLOR_BOLD_OFF,
-                  Other_Devices[i].device_id,
-                  Other_Devices[i].product_id);
-    }
-
-    myDebug_P(PSTR("\nThe following telegram type IDs are supported:"));
-    for (i = 0; i < _EMS_Types_max; i++) {
-        if ((EMS_Types[i].model_id == EMS_MODEL_ALL) || (EMS_Types[i].model_id == EMS_MODEL_UBA)) {
-            myDebug_P(PSTR(" type 0x%04X (%s)"), EMS_Types[i].type, EMS_Types[i].typeString);
-        }
-    }
-
-    myDebug_P(PSTR("\nThese %d thermostat devices are supported:"), _Thermostat_Devices_max);
-    for (i = 0; i < _Thermostat_Devices_max; i++) {
-        myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d) can write:%c"),
-                  COLOR_BOLD_ON,
-                  Thermostat_Devices[i].model_string,
-                  COLOR_BOLD_OFF,
-                  Thermostat_Devices[i].device_id,
-                  Thermostat_Devices[i].product_id,
-                  (Thermostat_Devices[i].write_supported) ? 'y' : 'n');
-    }
-
-    // print out known devices
-    ems_printDevices();
-
-    myDebug_P(PSTR("")); // newline
-}
-
 /**
  * print out contents of the device list that was captured
  */
 void ems_printDevices() {
-    // print out the device map, which is sent from the UBA master and shows all the connected IDs
     char s[100];
     char buffer[16] = {0};
 
@@ -2684,28 +2319,31 @@ void ems_printDevices() {
 
     // print out the ones we recognized
     if (!Devices.empty()) {
-        bool unknown = false;
+        bool have_unknowns = false;
+        char device_name[200];
         myDebug_P(PSTR("and %d were recognized by EMS-ESP as:"), Devices.size());
-        for (std::list<_Generic_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
+        for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
+            if ((it)->known) {
+                strlcpy(device_name, EMS_Devices[(it)->device_index].device_desc, sizeof(device_name));
+            } else {
+                strlcpy(device_name, EMS_MODELTYPE_UNKNOWN_STRING, sizeof(device_name)); // Unknown
+                have_unknowns = true;
+            }
+
             myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d Version:%s)"),
                       COLOR_BOLD_ON,
-                      (it)->model_string,
+                      device_name,
                       COLOR_BOLD_OFF,
                       (it)->device_id,
                       (it)->product_id,
                       (it)->version);
-            // check for unknowns
-            if (strcmp((it)->model_string, EMS_MODELTYPE_UNKNOWN_STRING) == 0) {
-                unknown = true;
-            }
         }
 
         myDebug_P(PSTR("")); // newline
 
-        if (unknown) {
+        if (have_unknowns) {
             myDebug_P(PSTR("You have a device is that is not known by EMS-ESP. Please report this as a GitHub issue so we can expand the EMS device library."));
         }
-
     } else {
         myDebug_P(PSTR("No were devices recognized. This may be because Tx is disabled or failing."));
     }
@@ -2736,7 +2374,7 @@ void ems_doReadCommand(uint16_t type, uint8_t dest, bool forceRefresh) {
     EMS_Sys_Status.txRetryCount    = 0;                   // reset retry counter
 
     // see if its a known type
-    int i = _ems_findType(type);
+    int8_t i = _ems_findType(type);
 
     if ((ems_getLogging() == EMS_SYS_LOGGING_BASIC) || (ems_getLogging() == EMS_SYS_LOGGING_VERBOSE)) {
         if (i == -1) {
@@ -2838,7 +2476,7 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
     EMS_TxTelegram.timestamp       = millis();            // set timestamp
     EMS_Sys_Status.txRetryCount    = 0;                   // reset retry counter
 
-    uint8_t model_id  = EMS_Thermostat.model_id;
+    uint8_t model     = ems_getThermostatModel();
     uint8_t device_id = EMS_Thermostat.device_id;
 
     EMS_TxTelegram.action = EMS_TX_TELEGRAM_WRITE;
@@ -2850,25 +2488,25 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
               hc_num,
               temptype);
 
-    if (model_id == EMS_MODEL_RC20) {
+    if (model == EMS_DEVICE_FLAG_RC20) {
         EMS_TxTelegram.type               = EMS_TYPE_RC20Set;
         EMS_TxTelegram.offset             = EMS_OFFSET_RC20Set_temp;
         EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC20StatusMessage;
         EMS_TxTelegram.type_validate      = EMS_TxTelegram.type;
 
-    } else if (model_id == EMS_MODEL_RC10) {
+    } else if (model == EMS_DEVICE_FLAG_RC10) {
         EMS_TxTelegram.type               = EMS_TYPE_RC10Set;
         EMS_TxTelegram.offset             = EMS_OFFSET_RC10Set_temp;
         EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC10StatusMessage;
         EMS_TxTelegram.type_validate      = EMS_TxTelegram.type;
 
-    } else if (model_id == EMS_MODEL_RC30) {
+    } else if (model == EMS_DEVICE_FLAG_RC30) {
         EMS_TxTelegram.type               = EMS_TYPE_RC30Set;
         EMS_TxTelegram.offset             = EMS_OFFSET_RC30Set_temp;
         EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC30StatusMessage;
         EMS_TxTelegram.type_validate      = EMS_TxTelegram.type;
 
-    } else if (model_id == EMS_MODEL_RC300) {
+    } else if (model == EMS_DEVICE_FLAG_RC300) {
         // check mode to determine offset
         if (EMS_Thermostat.hc[hc_num - 1].mode == 1) {        // auto
             EMS_TxTelegram.offset = 0x08;                     // auto offset
@@ -2892,7 +2530,7 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
 
         EMS_TxTelegram.type_validate = EMS_ID_NONE; // validate by reading from a different telegram
 
-    } else if ((model_id == EMS_MODEL_RC35) || (model_id == EMS_MODEL_ES73)) {
+    } else if (model == EMS_DEVICE_FLAG_RC35) {
         switch (temptype) {
         case 1: // change the night temp
             EMS_TxTelegram.offset = EMS_OFFSET_RC35Set_temp_night;
@@ -2960,12 +2598,12 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
         return;
     }
 
-    uint8_t model_id  = EMS_Thermostat.model_id;
+    uint8_t model     = ems_getThermostatModel();
     uint8_t device_id = EMS_Thermostat.device_id;
     uint8_t set_mode;
 
     // RC300/1000/3000 have different settings
-    if (model_id == EMS_MODEL_RC300) {
+    if (model == EMS_DEVICE_FLAG_RC300) {
         if (mode == 1) {
             set_mode = 0; // manual
         } else {
@@ -2994,19 +2632,19 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
     EMS_TxTelegram.dataValue = set_mode;
 
     // handle different thermostat types
-    if (model_id == EMS_MODEL_RC20) {
+    if (model == EMS_DEVICE_FLAG_RC20) {
         EMS_TxTelegram.type               = EMS_TYPE_RC20Set;
         EMS_TxTelegram.offset             = EMS_OFFSET_RC20Set_mode;
         EMS_TxTelegram.type_validate      = EMS_TYPE_RC20Set;
         EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC20StatusMessage;
 
-    } else if (model_id == EMS_MODEL_RC30) {
+    } else if (model == EMS_DEVICE_FLAG_RC30) {
         EMS_TxTelegram.type               = EMS_TYPE_RC30Set;
         EMS_TxTelegram.offset             = EMS_OFFSET_RC30Set_mode;
         EMS_TxTelegram.type_validate      = EMS_TYPE_RC30Set;
         EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC30StatusMessage;
 
-    } else if ((model_id == EMS_MODEL_RC35) || (model_id == EMS_MODEL_ES73)) {
+    } else if (model == EMS_DEVICE_FLAG_RC35) {
         if (hc_num == 1) {
             EMS_TxTelegram.type               = EMS_TYPE_RC35Set_HC1;
             EMS_TxTelegram.comparisonPostRead = EMS_TYPE_RC35StatusMessage_HC1;
@@ -3023,7 +2661,7 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
         EMS_TxTelegram.offset        = EMS_OFFSET_RC35Set_mode;
         EMS_TxTelegram.type_validate = EMS_TxTelegram.type;
 
-    } else if (model_id == EMS_MODEL_RC300) {
+    } else if (model == EMS_DEVICE_FLAG_RC300) {
         EMS_TxTelegram.offset = EMS_OFFSET_RCPLUSSet_mode;
 
         if (hc_num == 1) {
diff --git a/src/ems.h b/src/ems.h
index 87f53a936..c38916cbd 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -20,17 +20,19 @@
 #define EMS_ID_NONE 0x00 // used as a dest in broadcast messages and empty device IDs
 
 // Fixed EMS IDs
-#define EMS_ID_ME 0x0B      // our device, hardcoded as the "Service Key"
-#define EMS_ID_BOILER 0x08  // all UBA Boilers have 0x08
-#define EMS_ID_SM 0x30      // Solar Module SM10, SM100 and ISM1
-#define EMS_ID_HP 0x38      // HeatPump
-#define EMS_ID_GATEWAY 0x48 // KM200 Web Gateway
-
-// Product IDs
-#define EMS_PRODUCTID_SM10 73   // SM10 solar module
-#define EMS_PRODUCTID_SM50 162  // SM50 solar module
-#define EMS_PRODUCTID_SM100 163 // SM100 solar module
-#define EMS_PRODUCTID_ISM1 101  // Junkers ISM1 solar module
+#define EMS_ID_ME 0x0B          // our device, hardcoded as the "Service Key"
+#define EMS_ID_BOILER 0x08      // all UBA Boilers have 0x08
+#define EMS_ID_SM 0x30          // Solar Module SM10, SM100 and ISM1
+#define EMS_ID_HP 0x38          // HeatPump
+#define EMS_ID_GATEWAY 0x48     // e.g. KM200 Web Gateway
+#define EMS_ID_MIXING1 0x20     // Mixing
+#define EMS_ID_MIXING2 0x21     // Mixing
+#define EMS_ID_SWITCH 0x11      // Switch
+#define EMS_ID_CONTROLLER 0x09  // Controller
+#define EMS_ID_CONNECT 0x02     // Connect
+#define EMS_ID_THERMOSTAT1 0x10 // Thermostat
+#define EMS_ID_THERMOSTAT2 0x17 // Thermostat
+#define EMS_ID_THERMOSTAT3 0x18 // Thermostat
 
 #define EMS_MIN_TELEGRAM_LENGTH 6  // minimal length for a validation telegram, including CRC
 #define EMS_MAX_TELEGRAM_LENGTH 32 // max length of a telegram, including CRC, for Rx and Tx.
@@ -191,50 +193,81 @@ const _EMS_TxTelegram EMS_TX_TELEGRAM_NEW = {
     {0x00}                // data
 };
 
-// where defintions are stored
-typedef struct {
-    uint8_t product_id;
-    char    model_string[100];
-} _Boiler_Device;
+typedef enum {
+    EMS_DEVICE_TYPE_NONE,
+    EMS_DEVICE_TYPE_SERVICEKEY,
+    EMS_DEVICE_TYPE_BOILER,
+    EMS_DEVICE_TYPE_THERMOSTAT,
+    EMS_DEVICE_TYPE_MIXING,
+    EMS_DEVICE_TYPE_SOLAR,
+    EMS_DEVICE_TYPE_HEATPUMP,
+    EMS_DEVICE_TYPE_GATEWAY,
+    EMS_DEVICE_TYPE_OTHER,
+    EMS_DEVICE_TYPE_SWITCH,
+    EMS_DEVICE_TYPE_CONTROLLER,
+    EMS_DEVICE_TYPE_CONNECT,
+    EMS_DEVICE_TYPE_UNKNOWN
+} _EMS_DEVICE_TYPE;
 
+// to store all know EMS devices
 typedef struct {
-    uint8_t product_id;
-    char    model_string[50];
-} _SolarModule_Device;
+    uint8_t          product_id;
+    _EMS_DEVICE_TYPE type;
+    char             device_desc[100];
+    uint8_t          flags;
+} _EMS_Device;
 
+// to store mapping of device_ids to their string name
 typedef struct {
-    uint8_t product_id;
-    uint8_t device_id;
-    char    model_string[50];
-} _Other_Device;
+    uint8_t          device_id;
+    _EMS_DEVICE_TYPE device_type;
+    char             device_type_string[30];
+} _EMS_Device_Types;
 
+// mapping for EMS_Devices_Type
+const _EMS_Device_Types EMS_Devices_Types[] = {
+
+    {EMS_ID_BOILER, EMS_DEVICE_TYPE_BOILER, "UBAMaster"},
+    {EMS_ID_THERMOSTAT1, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
+    {EMS_ID_THERMOSTAT2, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
+    {EMS_ID_THERMOSTAT3, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
+    {EMS_ID_SM, EMS_DEVICE_TYPE_SOLAR, "Solar Module"},
+    {EMS_ID_HP, EMS_DEVICE_TYPE_HEATPUMP, "Heat Pump"},
+    {EMS_ID_GATEWAY, EMS_DEVICE_TYPE_GATEWAY, "Gateway"},
+    {EMS_ID_ME, EMS_DEVICE_TYPE_SERVICEKEY, "Me"},
+    {EMS_ID_NONE, EMS_DEVICE_TYPE_NONE, "All"},
+    {EMS_ID_MIXING1, EMS_DEVICE_TYPE_MIXING, "Mixing Module"},
+    {EMS_ID_MIXING2, EMS_DEVICE_TYPE_MIXING, "Mixing Module"},
+    {EMS_ID_SWITCH, EMS_DEVICE_TYPE_SWITCH, "Switching Module"},
+    {EMS_ID_CONTROLLER, EMS_DEVICE_TYPE_CONTROLLER, "Controller"},
+    {EMS_ID_CONNECT, EMS_DEVICE_TYPE_CONNECT, "Connect"}
+
+};
+
+// for storing all recognised EMS devices
 typedef struct {
-    uint8_t product_id;
-    char    model_string[50];
-} _HeatPump_Device;
+    _EMS_DEVICE_TYPE device_type;  // type
+    uint8_t          product_id;   // product id for looking up details in _EMS_Devices
+    uint8_t          device_id;    // the device_id
+    uint8_t          device_index; // where it is in the EMS_Devices table
+    char             version[10];  // the version number XX.XX
+    bool             known;        // is this a known device?
+} _Detected_Device;
 
-typedef struct {
-    uint8_t model_id;
-    uint8_t product_id;
-    uint8_t device_id;
-    char    model_string[50];
-    bool    write_supported;
-} _Thermostat_Device;
+#define EMS_DEVICE_FLAG_NONE 0 // no flags set
 
-typedef struct {
-    uint8_t product_id;
-    char    model_string[50];
-} _Mixing_Device;
-
-// for consolidating all types
-typedef struct {
-    uint8_t model_type; // 1=boiler, 2=thermostat, 3=sm, 4=other, 5=unknown
-    uint8_t product_id;
-    uint8_t device_id;
-    char    version[10];
-    char    model_string[50];
-} _Generic_Device;
+#define EMS_DEVICE_FLAG_SM10 10
+#define EMS_DEVICE_FLAG_SM100 11
 
+// group flags for thermostats
+#define EMS_DEVICE_FLAG_NO_WRITE 0x80 // top bit set if can't write yet
+#define EMS_DEVICE_FLAG_EASY 1
+#define EMS_DEVICE_FLAG_RC10 2
+#define EMS_DEVICE_FLAG_RC20 3
+#define EMS_DEVICE_FLAG_RC30 4
+#define EMS_DEVICE_FLAG_RC35 5
+#define EMS_DEVICE_FLAG_RC300 6
+#define EMS_DEVICE_FLAG_JUNKERS 7
 
 /*
  * Telegram package defintions
@@ -242,6 +275,8 @@ typedef struct {
 typedef struct {
     // settings
     uint8_t device_id; // this is typically always 0x08
+    uint8_t device_flags;
+    uint8_t device_index;
     uint8_t product_id;
     char    version[10];
 
@@ -304,29 +339,22 @@ typedef struct {
  */
 typedef struct {
     uint8_t device_id; // the device ID of the Heat Pump (e.g. 0x30)
-    uint8_t model_id;  // Solar Module / Heat Pump model
+    uint8_t device_flags;
+    uint8_t device_index;
     uint8_t product_id;
     char    version[10];
-
     uint8_t HPModulation; // heatpump modulation in %
     uint8_t HPSpeed;      // speed 0-100 %
 } _EMS_HeatPump;
 
 typedef struct {
-    uint8_t device_id;
-    uint8_t model_id;
-    uint8_t product_id;
-    char    version[10];
-} _EMS_Other;
-
-typedef struct {
-    uint8_t device_id;
-    uint8_t model_id;
-    uint8_t product_id;
-    char    version[10];
-    uint8_t hc;     // heating circuit 1, 2, 3 or 4
-    bool    active; // true if there is data for this HC
-
+    uint8_t  device_id;
+    uint8_t  device_flags;
+    uint8_t  device_index;
+    uint8_t  product_id;
+    char     version[10];
+    uint8_t  hc;     // heating circuit 1, 2, 3 or 4
+    bool     active; // true if there is data for this HC
     uint16_t flowTemp;
     uint8_t  pumpMod;
     uint8_t  valveStatus;
@@ -334,17 +362,21 @@ typedef struct {
 
 // Mixer data
 typedef struct {
+    uint8_t        device_id;
+    uint8_t        device_flags;
+    uint8_t        device_index;
+    uint8_t        product_id;
     bool           detected;
     _EMS_Mixing_HC hc[EMS_THERMOSTAT_MAXHC]; // array for the 4 heating circuits
 } _EMS_Mixing;
 
 // SM Solar Module - SM10/SM100/ISM1
 typedef struct {
-    uint8_t device_id; // the device ID of the Solar Module
-    uint8_t model_id;  // Solar Module
-    uint8_t product_id;
-    char    version[10];
-
+    uint8_t  device_id;    // the device ID of the Solar Module
+    uint8_t  device_flags; // Solar Module flags
+    uint8_t  device_index;
+    uint8_t  product_id;
+    char     version[10];
     int16_t  collectorTemp;          // collector temp
     int16_t  bottomTemp;             // bottom temp
     uint8_t  pumpModulation;         // modulation solar pump
@@ -375,8 +407,9 @@ typedef struct {
 
 // Thermostat data
 typedef struct {
-    uint8_t            device_id; // the device ID of the thermostat
-    uint8_t            model_id;  // thermostat model
+    uint8_t            device_id;    // the device ID of the thermostat
+    uint8_t            device_flags; // thermostat model flags
+    uint8_t            device_index;
     uint8_t            product_id;
     char               version[10];
     char               datetime[25]; // HH:MM:SS DD/MM/YYYY
@@ -389,9 +422,8 @@ typedef void (*EMS_processType_cb)(_EMS_RxTelegram * EMS_RxTelegram);
 
 // Definition for each EMS type, including the relative callback function
 typedef struct {
-    uint8_t            model_id;
-    uint16_t           type; // long to support EMS+ types
-    const char         typeString[50];
+    uint16_t           type;
+    const char         typeString[30];
     EMS_processType_cb processType_cb;
 } _EMS_Type;
 
@@ -402,7 +434,6 @@ void        ems_init();
 void        ems_doReadCommand(uint16_t type, uint8_t dest, bool forceRefresh = false);
 void        ems_sendRawTelegram(char * telegram);
 void        ems_scanDevices();
-void        ems_printAllDevices();
 void        ems_printDevices();
 uint8_t     ems_printDevices_s(char * buffer, uint16_t len);
 void        ems_printTxQueue();
@@ -428,10 +459,8 @@ void ems_setTxMode(uint8_t mode);
 
 uint8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram);
 
-char *           ems_getThermostatDescription(char * buffer, bool name_only = false);
-char *           ems_getBoilerDescription(char * buffer, bool name_only = false);
-char *           ems_getSolarModuleDescription(char * buffer, bool name_only = false);
-char *           ems_getHeatPumpDescription(char * buffer, bool name_only = false);
+char *           ems_getDeviceDescription(_EMS_DEVICE_TYPE device_type, char * buffer, bool name_only = false);
+bool             ems_getDeviceTypeDescription(uint8_t device_id, char * buffer);
 void             ems_getThermostatValues();
 void             ems_getBoilerValues();
 void             ems_getSolarModuleValues();
@@ -465,7 +494,6 @@ extern _EMS_Boiler      EMS_Boiler;
 extern _EMS_Thermostat  EMS_Thermostat;
 extern _EMS_SolarModule EMS_SolarModule;
 extern _EMS_HeatPump    EMS_HeatPump;
-extern _EMS_Other       EMS_Other;
 extern _EMS_Mixing      EMS_Mixing;
 
-extern std::list<_Generic_Device> Devices;
+extern std::list<_Detected_Device> Devices;
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 19948c23e..d0d5d289e 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -155,155 +155,106 @@
 #define EMS_OFFSET_MMPLUSStatusMessage_pump_mod 5     // pump modulation
 #define EMS_OFFSET_MMPLUSStatusMessage_valve_status 2 // valve in percent
 
-
-// Known EMS devices
-typedef enum {
-    EMS_MODEL_NONE, // unset
-    EMS_MODEL_ALL,  // common for all devices
-
-    EMS_MODEL_HP,  // heatpump
-    EMS_MODEL_SM,  // solar module
-    EMS_MODEL_MM,  // mixer module
-    EMS_MODEL_UBA, // boiler
-
-    // and the various thermostats
-    EMS_MODEL_ES73,
-    EMS_MODEL_RC10,
-    EMS_MODEL_RC20,
-    EMS_MODEL_RC20RF,
-    EMS_MODEL_RC30,
-    EMS_MODEL_RC35,
-    EMS_MODEL_EASY,
-    EMS_MODEL_RC300,
-    EMS_MODEL_CW100,
-    EMS_MODEL_RC100,
-    EMS_MODEL_OT,
-    EMS_MODEL_FW100,
-    EMS_MODEL_FR10,
-    EMS_MODEL_FR50,
-    EMS_MODEL_FR100,
-    EMS_MODEL_FR110,
-    EMS_MODEL_FW120,
-    EMS_MODEL_FW200,
-    EMS_MODEL_FR120
-
-} _EMS_MODEL_ID;
-
-// EMS types for known boilers. This list will be extended when new devices are recognized.
-// The device_id is always 0x08
-// format is PRODUCT ID, DESCRIPTION
-const _Boiler_Device Boiler_Devices[] = {
-
-    {72, "MC10 Module"},
-    {123, "Buderus GBx72/Nefit Trendline/Junkers Cerapur/Worcester Greenstar Si/27i"},
-    {133, "Buderus GB125/Logamatic MC110"},
-    {115, "Nefit Topline/Buderus GB162"},
-    {203, "Buderus Logamax U122/Junkers Cerapur"},
-    {208, "Buderus Logamax plus/GB192/Bosch Condens GC9000"},
-    {64, "Sieger BK13,BK15/Nefit Smartline/Buderus GB1x2"},
-    {234, "Buderus Logamax Plus GB122"},
-    {95, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Worcester Greenstar i/Generic HT3"},
-    {122, "Nefit Proline"},
-    {170, "Buderus Logano GB212"},
-    {172, "Nefit Enviline"}
-
-};
-
 /*
- * Known Solar Module types, device id is 0x30
- * format is PRODUCT ID, DESCRIPTION
+ * Table of all known EMS Devices
+ * ProductID, DeviceType, Description, Flags
  */
-const _SolarModule_Device SolarModule_Devices[] = {
+const _EMS_Device EMS_Devices[] = {
 
-    {EMS_PRODUCTID_SM10, "SM10 Solar Module"},
-    {EMS_PRODUCTID_SM100, "SM100 Solar Module"},
-    {EMS_PRODUCTID_ISM1, "Junkers ISM1 Solar Module"},
-    {EMS_PRODUCTID_SM50, "SM50 Solar Module"}
+    //
+    // UBA Masters - typically with device_id of 0x08
+    //
 
-};
+    {72, EMS_DEVICE_TYPE_BOILER, "MC10 Module", EMS_DEVICE_FLAG_NONE},
+    {123, EMS_DEVICE_TYPE_BOILER, "Buderus GBx72/Nefit Trendline/Junkers Cerapur/Worcester Greenstar Si/27i", EMS_DEVICE_FLAG_NONE},
+    {133, EMS_DEVICE_TYPE_BOILER, "Buderus GB125/Logamatic MC110", EMS_DEVICE_FLAG_NONE},
+    {115, EMS_DEVICE_TYPE_BOILER, "Nefit Topline/Buderus GB162", EMS_DEVICE_FLAG_NONE},
+    {203, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax U122/Junkers Cerapur", EMS_DEVICE_FLAG_NONE},
+    {208, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax plus/GB192/Bosch Condens GC9000", EMS_DEVICE_FLAG_NONE},
+    {64, EMS_DEVICE_TYPE_BOILER, "Sieger BK13,BK15/Nefit Smartline/Buderus GB1x2", EMS_DEVICE_FLAG_NONE},
+    {234, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax Plus GB122", EMS_DEVICE_FLAG_NONE},
+    {95, EMS_DEVICE_TYPE_BOILER, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Worcester Greenstar i/Generic HT3", EMS_DEVICE_FLAG_NONE},
+    {122, EMS_DEVICE_TYPE_BOILER, "Nefit Proline", EMS_DEVICE_FLAG_NONE},
+    {170, EMS_DEVICE_TYPE_BOILER, "Buderus Logano GB212", EMS_DEVICE_FLAG_NONE},
+    {172, EMS_DEVICE_TYPE_BOILER, "Nefit Enviline", EMS_DEVICE_FLAG_NONE},
 
-/*
- * Mixing Units
- * Typically device id is 0x20 or 0x21
- * format is PRODUCT ID, DESCRIPTION
- */
-const _Mixing_Device Mixing_Devices[] = {
+    //
+    // Solar Modules - type 0x30
+    //
 
-    {160, "MM100 Mixing Module"},
-    {161, "MM200 Mixing Module"},
-    {69, "MM10 Mixer Module"},
-    {159, "MM50 Mixing Module"},
-    {79, "MM100 Mixer Module"},
-    {80, "MM200 Mixer Module"},
-    {78, "MM400 Mixer Module"}
+    {73, EMS_DEVICE_TYPE_SOLAR, "SM10 Solar Module", EMS_DEVICE_FLAG_SM10},
+    {163, EMS_DEVICE_TYPE_SOLAR, "SM100 Solar Module", EMS_DEVICE_FLAG_SM100},
+    {101, EMS_DEVICE_TYPE_SOLAR, "Junkers ISM1 Solar Module", EMS_DEVICE_FLAG_SM100},
+    {162, EMS_DEVICE_TYPE_SOLAR, "SM50 Solar Module", EMS_DEVICE_FLAG_SM100},
 
-};
+    //
+    // Mixing Devices - type 0x20 or 0x21
+    //
 
-// Other EMS devices which are not considered boilers, thermostats or solar modules
-// format is PRODUCT ID, DEVICE ID, DESCRIPTION
-const _Other_Device Other_Devices[] = {
+    {160, EMS_DEVICE_TYPE_MIXING, "MM100 Mixing Module", EMS_DEVICE_FLAG_NONE},
+    {161, EMS_DEVICE_TYPE_MIXING, "MM200 Mixing Module", EMS_DEVICE_FLAG_NONE},
+    {69, EMS_DEVICE_TYPE_MIXING, "MM10 Mixer Module", EMS_DEVICE_FLAG_NONE},
+    {159, EMS_DEVICE_TYPE_MIXING, "MM50 Mixing Module", EMS_DEVICE_FLAG_NONE},
+    {79, EMS_DEVICE_TYPE_MIXING, "MM100 Mixer Module", EMS_DEVICE_FLAG_NONE},
+    {80, EMS_DEVICE_TYPE_MIXING, "MM200 Mixer Module", EMS_DEVICE_FLAG_NONE},
+    {78, EMS_DEVICE_TYPE_MIXING, "MM400 Mixer Module", EMS_DEVICE_FLAG_NONE},
 
-    {71, 0x11, "WM10 Switch Module"},
+    //
+    // HeatPump - type 0x38
+    //
 
-    {68, 0x09, "BC10/RFM20 Receiver"},
-    {190, 0x09, "BC10 Base Controller"},
-    {114, 0x09, "BC10 Base Controller"},
-    {125, 0x09, "BC25 Base Controller"},
-    {169, 0x09, "BC40 Base Controller"},
-    {152, 0x09, "Controller"},
-    {95, 0x09, "HT3 Controller"},
-    {230, 0x09, "BC Base Controller"},
+    {252, EMS_DEVICE_TYPE_HEATPUMP, "HeatPump Module", EMS_DEVICE_FLAG_NONE},
+    {200, EMS_DEVICE_TYPE_HEATPUMP, "HeatPump Module", EMS_DEVICE_FLAG_NONE},
 
-    {205, 0x02, "Nefit Moduline Easy Connect"},
-    {206, 0x02, "Bosch Easy Connect"},
-    {171, 0x02, "EMS-OT OpenTherm converter"},
+    //
+    // Other devices, like 0x11 for Switching, 0x09 for controllers, 0x02 for Connect, 0x48 for Gateway
+    //
 
-    {189, EMS_ID_GATEWAY, "Web Gateway KM200"}
+    {71, EMS_DEVICE_TYPE_SWITCH, "WM10 Switch Module", EMS_DEVICE_FLAG_NONE},            // 0x11
+    {68, EMS_DEVICE_TYPE_CONTROLLER, "BC10/RFM20 Receiver", EMS_DEVICE_FLAG_NONE},       // 0x09
+    {190, EMS_DEVICE_TYPE_CONTROLLER, "BC10 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
+    {114, EMS_DEVICE_TYPE_CONTROLLER, "BC10 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
+    {125, EMS_DEVICE_TYPE_CONTROLLER, "BC25 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
+    {169, EMS_DEVICE_TYPE_CONTROLLER, "BC40 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
+    {152, EMS_DEVICE_TYPE_CONTROLLER, "Controller", EMS_DEVICE_FLAG_NONE},               // 0x09
+    {95, EMS_DEVICE_TYPE_CONTROLLER, "HT3 Controller", EMS_DEVICE_FLAG_NONE},            // 0x09
+    {230, EMS_DEVICE_TYPE_CONTROLLER, "BC Base Controller", EMS_DEVICE_FLAG_NONE},       // 0x09
+    {205, EMS_DEVICE_TYPE_CONNECT, "Nefit Moduline Easy Connect", EMS_DEVICE_FLAG_NONE}, // 0x02
+    {206, EMS_DEVICE_TYPE_CONNECT, "Bosch Easy Connect", EMS_DEVICE_FLAG_NONE},          // 0x02
+    {171, EMS_DEVICE_TYPE_CONNECT, "EMS-OT OpenTherm converter", EMS_DEVICE_FLAG_NONE},  // 0x02
+    {189, EMS_DEVICE_TYPE_GATEWAY, "Web Gateway KM200", EMS_DEVICE_FLAG_NONE},           // 0x48
 
-};
-
-// heatpump, device ID 0x38
-// format is PRODUCT ID, DEVICE ID, DESCRIPTION
-const _HeatPump_Device HeatPump_Devices[] = {
-
-    {252, "HeatPump Module"},
-    {200, "HeatPump Module"}
-
-};
-
-/*
- * Known thermostat types and their capabilities
- * format is MODEL_ID, PRODUCT ID, DEVICE ID, DESCRIPTION
- * Typically on DeviceID 0x10 or 0x18
- */
-const _Thermostat_Device Thermostat_Devices[] = {
+    //
+    // Thermostats, typically device id of 0x10, 0x17 and 0x18
+    //
 
     // Easy devices - not currently supporting write operations
-    {EMS_MODEL_EASY, 202, 0x18, "Logamatic TC100/Nefit Moduline Easy", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_EASY, 203, 0x18, "Bosch EasyControl CT200", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_CW100, 157, 0x18, "Buderus RC200/Bosch CW100/Junkers CW100", EMS_THERMOSTAT_WRITE_NO},
+    {202, EMS_DEVICE_TYPE_THERMOSTAT, "Logamatic TC100/Nefit Moduline Easy", EMS_DEVICE_FLAG_EASY & EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write
+    {203, EMS_DEVICE_TYPE_THERMOSTAT, "Bosch EasyControl CT200", EMS_DEVICE_FLAG_EASY & EMS_DEVICE_FLAG_NO_WRITE},             // 0x18, cannot write
+    {157, EMS_DEVICE_TYPE_THERMOSTAT, "Buderus RC200/Bosch CW100/Junkers CW100", EMS_DEVICE_FLAG_NO_WRITE},                    // 0x18, cannot write
 
     // Buderus/Nefit
-    {EMS_MODEL_RC10, 79, 0x17, "RC10/Moduline 100", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC20, 77, 0x17, "RC20/Moduline 300", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC20RF, 93, 0x18, "RC20RF", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC30, 67, 0x10, "RC30", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC30, 78, 0x10, "RC30/Moduline 400", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC35, 86, 0x10, "RC35", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC300, 158, 0x10, "RC300/RC310/Moduline 3000/Bosch CW400", EMS_THERMOSTAT_WRITE_YES},
-    {EMS_MODEL_RC100, 165, 0x18, "RC100/Moduline 1010", EMS_THERMOSTAT_WRITE_NO},
+    {79, EMS_DEVICE_TYPE_THERMOSTAT, "RC10/Moduline 100", EMS_DEVICE_FLAG_RC10},                                // 0x17
+    {77, EMS_DEVICE_TYPE_THERMOSTAT, "RC20/Moduline 300", EMS_DEVICE_FLAG_RC20},                                // 0x17
+    {93, EMS_DEVICE_TYPE_THERMOSTAT, "RC20RF", EMS_DEVICE_FLAG_RC20},                                           // 0x18
+    {67, EMS_DEVICE_TYPE_THERMOSTAT, "RC30", EMS_DEVICE_FLAG_RC30},                                             // 0x10
+    {78, EMS_DEVICE_TYPE_THERMOSTAT, "RC30/Moduline 400", EMS_DEVICE_FLAG_RC30},                                // 0x10
+    {86, EMS_DEVICE_TYPE_THERMOSTAT, "RC35", EMS_DEVICE_FLAG_RC35},                                             // 0x10
+    {158, EMS_DEVICE_TYPE_THERMOSTAT, "RC300/RC310/Moduline 3000/Bosch CW400", EMS_DEVICE_FLAG_RC300},          // 0x10
+    {165, EMS_DEVICE_TYPE_THERMOSTAT, "RC100/Moduline 1010", EMS_DEVICE_FLAG_RC300 & EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write
 
     // Sieger
-    {EMS_MODEL_ES73, 76, 0x10, "Sieger ES73", EMS_THERMOSTAT_WRITE_YES},
+    {076, EMS_DEVICE_TYPE_THERMOSTAT, "Sieger ES73", EMS_DEVICE_FLAG_RC35}, // 0x10
 
     // Junkers
-    {EMS_MODEL_FW100, 105, 0x10, "Junkers FW100", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FW200, 106, 0x10, "Junkers FW200", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FR100, 107, 0x18, "Junkers FR100", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FR110, 108, 0x18, "Junkers FR110", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FR10, 111, 0x18, "Junkers FR10", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FR120, 191, 0x10, "Junkers FR120", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FW120, 192, 0x10, "Junkers FW120", EMS_THERMOSTAT_WRITE_NO},
-    {EMS_MODEL_FR50, 147, 0x10, "Junkers FR50", EMS_THERMOSTAT_WRITE_NO}
+    {105, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW100", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {106, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW200", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {107, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR100", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {108, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR110", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {111, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR10", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE},  // 0x10, cannot write
+    {191, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR120", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {192, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW120", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {147, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR50", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}   // 0x10, cannot write
+
 
 };
diff --git a/src/version.h b/src/version.h
index 5ede72e09..8d57dc8c4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b10"
+#define APP_VERSION "1.9.4b11"

From 3cfa188f5ea7f53f8af22059e1c0711b9eafb4a4 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 12 Nov 2019 00:13:27 +0100
Subject: [PATCH 075/120] typo

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

diff --git a/src/ems.cpp b/src/ems.cpp
index 79636428a..fa66d6aa1 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1866,7 +1866,7 @@ bool _addDevice(_EMS_DEVICE_TYPE device_type, uint8_t product_id, uint8_t device
     Devices.push_back(device);
 
     char line[500];
-    strlcpy(line, "New EMS Device recognized as a", sizeof(line));
+    strlcpy(line, "New EMS device recognized as a ", sizeof(line));
 
     // get type as a string
     char type_s[50];

From cb09041279e7de551b8147451fd5e7fc5570b9a7 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 12 Nov 2019 08:50:31 +0100
Subject: [PATCH 076/120] mem debugging

---
 platformio.ini | 11 +++++++++--
 src/ems.cpp    |  7 ++++---
 src/ems.h      | 11 +++++------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index b89693979..9134007a5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -3,7 +3,8 @@
 ;
 
 [platformio]
-default_envs = release
+;default_envs = release
+default_envs = debug
 
 [common]
 ; custom build options are:
@@ -15,7 +16,8 @@ default_envs = release
 custom_flags =
 
 ;general_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -DVTABLES_IN_FLASH
-general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC 
+;general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC 
+general_flags =
 
 [env]
 framework = arduino
@@ -42,6 +44,9 @@ monitor_speed = 115200
 upload_protocol = espota
 upload_port = ems-esp.local
 
+# These following targets are used by TravisCI to build the firmware versions on Release
+# Do not modify
+
 [env:travis]
 board = esp12e
 build_flags = ${common.general_flags}
@@ -67,6 +72,8 @@ board = nodemcu
 build_flags = ${common.general_flags}
 extra_scripts = scripts/main_script.py
 
+# These two targets (release and debug) can be modified
+
 [env:debug]
 board = d1_mini
 build_type = debug
diff --git a/src/ems.cpp b/src/ems.cpp
index fa66d6aa1..da60b7b86 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -709,18 +709,19 @@ void _createValidate() {
     new_EMS_TxTelegram.action = EMS_TX_TELEGRAM_VALIDATE;
 
     // copy old Write record
-    new_EMS_TxTelegram.type_validate = EMS_TxTelegram.type;          // save the original type in the type_validate, increase we need to re-try
-    new_EMS_TxTelegram.type          = EMS_TxTelegram.type_validate; // new type is the validate type
-
+    new_EMS_TxTelegram.type_validate      = EMS_TxTelegram.type;          // save the original type in the type_validate, increase we need to re-try
+    new_EMS_TxTelegram.type               = EMS_TxTelegram.type_validate; // new type is the validate type
     new_EMS_TxTelegram.dest               = EMS_TxTelegram.dest;
     new_EMS_TxTelegram.comparisonValue    = EMS_TxTelegram.comparisonValue;
     new_EMS_TxTelegram.comparisonPostRead = EMS_TxTelegram.comparisonPostRead;
     new_EMS_TxTelegram.comparisonOffset   = EMS_TxTelegram.comparisonOffset;
+    new_EMS_TxTelegram.forceRefresh       = EMS_TxTelegram.forceRefresh;
 
     // this is what is different
     new_EMS_TxTelegram.offset    = EMS_TxTelegram.comparisonOffset; // location of byte to fetch
     new_EMS_TxTelegram.dataValue = 1;                               // fetch single byte
     new_EMS_TxTelegram.length    = EMS_MIN_TELEGRAM_LENGTH;         // is always 6 bytes long (including CRC at end)
+    new_EMS_TxTelegram.timestamp = millis();
 
     // remove old telegram from queue and add this new read one
     EMS_TxQueue.shift();                     // remove from queue
diff --git a/src/ems.h b/src/ems.h
index c38916cbd..52659aa12 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -247,19 +247,18 @@ const _EMS_Device_Types EMS_Devices_Types[] = {
 // for storing all recognised EMS devices
 typedef struct {
     _EMS_DEVICE_TYPE device_type;  // type
-    uint8_t          product_id;   // product id for looking up details in _EMS_Devices
+    uint8_t          product_id;   // product id for looking up details in EMS_Devices
     uint8_t          device_id;    // the device_id
     uint8_t          device_index; // where it is in the EMS_Devices table
     char             version[10];  // the version number XX.XX
     bool             known;        // is this a known device?
 } _Detected_Device;
 
-#define EMS_DEVICE_FLAG_NONE 0 // no flags set
+#define EMS_DEVICE_FLAG_NONE 0   // no flags set
+#define EMS_DEVICE_FLAG_SM10 10  // solar module1
+#define EMS_DEVICE_FLAG_SM100 11 // solar module2
 
-#define EMS_DEVICE_FLAG_SM10 10
-#define EMS_DEVICE_FLAG_SM100 11
-
-// group flags for thermostats
+// group flags specific for thermostats
 #define EMS_DEVICE_FLAG_NO_WRITE 0x80 // top bit set if can't write yet
 #define EMS_DEVICE_FLAG_EASY 1
 #define EMS_DEVICE_FLAG_RC10 2

From d009816add5c53fb54db07f222f98025352d5fbd Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 13 Nov 2019 10:20:52 +0100
Subject: [PATCH 077/120] revert back to old webserver and arduinojson

---
 platformio.ini | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 9134007a5..1a48ccd02 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -3,8 +3,8 @@
 ;
 
 [platformio]
-;default_envs = release
-default_envs = debug
+default_envs = release
+;default_envs = debug
 
 [common]
 ; custom build options are:
@@ -13,11 +13,12 @@ default_envs = debug
 ; -DCRASH
 ; -DFORCE_SERIAL
 ; -DMYESP_DEBUG
+;custom_flags = -DFORCE_SERIAL -DMYESP_DEBUG
 custom_flags =
 
 ;general_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -DVTABLES_IN_FLASH
-;general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC 
-general_flags =
+general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC 
+;general_flags =
 
 [env]
 framework = arduino
@@ -25,12 +26,13 @@ platform = espressif8266
 lib_deps =
   https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
-  https://github.com/me-no-dev/ESPAsyncWebServer
+  ;https://github.com/me-no-dev/ESPAsyncWebServer
+  https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
   https://github.com/bakercp/CRC32
   JustWifi@2.0.2
   AsyncMqttClient@0.8.2
   EEPROM_Rotate@0.9.2
-  ArduinoJson@6.13.0
+  ArduinoJson@6.12.0
   ESPAsyncUDP
   ESPAsyncTCP@1.2.2
 upload_speed = 921600
@@ -44,9 +46,9 @@ monitor_speed = 115200
 upload_protocol = espota
 upload_port = ems-esp.local
 
+#
 # These following targets are used by TravisCI to build the firmware versions on Release
 # Do not modify
-
 [env:travis]
 board = esp12e
 build_flags = ${common.general_flags}
@@ -72,8 +74,9 @@ board = nodemcu
 build_flags = ${common.general_flags}
 extra_scripts = scripts/main_script.py
 
-# These two targets (release and debug) can be modified
-
+#
+# These two targets (release and debug) can be modified below
+#
 [env:debug]
 board = d1_mini
 build_type = debug
@@ -84,6 +87,7 @@ extra_scripts =
 
 [env:release]
 board = d1_mini
+build_type = release
 build_flags = ${common.general_flags} ${common.custom_flags}
 extra_scripts = 
   pre:scripts/pre_script.py

From bd1e192b0de7533d18593fa4695fa0e03646c7c7 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 13 Nov 2019 10:21:17 +0100
Subject: [PATCH 078/120] tidy up code

---
 src/MyESP.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index e1ee69d81..6b3a9ff96 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -1660,7 +1660,6 @@ size_t MyESP::_fs_validateConfigFile(const char * filename, size_t maxsize, Json
         delete[] buffer;
         return 0;
     }
-
     // now read into the given json
     DeserializationError error = deserializeJson(doc, buffer);
     if (error) {

From ae5290131df65dc1e6176dac093c1cbdda5b2abf Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 13 Nov 2019 10:21:44 +0100
Subject: [PATCH 079/120] optimzed how device descriptions are read

---
 src/custom.js     |   8 +--
 src/ems-esp.cpp   |   5 +-
 src/ems.cpp       | 137 +++++++++++++++++++++++++---------------------
 src/ems.h         | 102 +++++++++++++++-------------------
 src/ems_devices.h |   2 +-
 src/version.h     |   2 +-
 6 files changed, 127 insertions(+), 129 deletions(-)

diff --git a/src/custom.js b/src/custom.js
index 18f64b74c..5d8a16fd7 100644
--- a/src/custom.js
+++ b/src/custom.js
@@ -99,13 +99,13 @@ function listCustomStats() {
         var l = document.createElement("li");
         var type = obj[i].type;
         var color = "";
-        if (type === 1) {
+        if (type === "UBAMaster") {
             color = "list-group-item-success";
-        } else if (type === 2) {
+        } else if (type === "Thermostat") {
             color = "list-group-item-info";
-        } else if (type === 3) {
+        } else if (type === "Solar Module") {
             color = "list-group-item-warning";
-        } else if (type === 4) {
+        } else if (type === "Heat Pump") {
             color = "list-group-item-success";
         }
         l.innerHTML = obj[i].model + " (Version:" + obj[i].version + " ProductID:" + obj[i].productid + " DeviceID:0x" + obj[i].deviceid + ")";
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index a3e37ff7e..c98086d36 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1669,7 +1669,6 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
     }
 }
 
-
 // Init callback, which is used to set functions and call methods after a wifi connection has been established
 void WIFICallback() {
     // This is where we enable the UART service to scan the incoming serial Tx/Rx bus signals
@@ -1712,8 +1711,8 @@ void WebCallback(JsonObject root) {
         (void)ems_getDeviceTypeDescription((it)->device_id, buffer);
         item["type"] = buffer;
 
-        if ((it)->known) {
-            item["model"] = EMS_Devices[(it)->device_index].device_desc;
+        if ((it)->known == true) {
+            item["model"] = (it)->device_desc_p;
         } else {
             item["model"] = EMS_MODELTYPE_UNKNOWN_STRING;
         }
diff --git a/src/ems.cpp b/src/ems.cpp
index da60b7b86..f66a3ff8b 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -256,8 +256,6 @@ void ems_init() {
         EMS_Mixing.hc[i].flowTemp    = EMS_VALUE_SHORT_NOTSET;
         EMS_Mixing.hc[i].pumpMod     = EMS_VALUE_INT_NOTSET;
         EMS_Mixing.hc[i].valveStatus = EMS_VALUE_INT_NOTSET;
-        EMS_Mixing.hc[i].device_id   = EMS_ID_NONE;
-        EMS_Mixing.hc[i].product_id  = EMS_ID_NONE;
     }
 
     // UBAParameterWW
@@ -1846,7 +1844,7 @@ void ems_clearDeviceList() {
  * add an EMS device to our list of detected devices if its unique
  * returns true if already in list
  */
-bool _addDevice(_EMS_DEVICE_TYPE device_type, uint8_t product_id, uint8_t device_id, uint8_t device_index, const char * version, const char * device_desc) {
+bool _addDevice(_EMS_DEVICE_TYPE device_type, uint8_t product_id, uint8_t device_id, const char * device_desc_p, const char * version) {
     _Detected_Device device;
 
     // check for duplicates
@@ -1858,10 +1856,10 @@ bool _addDevice(_EMS_DEVICE_TYPE device_type, uint8_t product_id, uint8_t device
     }
 
     // create a new record and add it to list
-    device.device_type  = device_type;
-    device.product_id   = product_id;
-    device.device_id    = device_id;
-    device.device_index = device_index; // where it is in the EMS_Devices table
+    device.device_type   = device_type;
+    device.product_id    = product_id;
+    device.device_id     = device_id;
+    device.device_desc_p = device_desc_p; // pointer to the description in the EMS_Devices table
     strlcpy(device.version, version, sizeof(device.version));
     device.known = (device_type != EMS_DEVICE_TYPE_UNKNOWN);
     Devices.push_back(device);
@@ -1879,8 +1877,11 @@ bool _addDevice(_EMS_DEVICE_TYPE device_type, uint8_t product_id, uint8_t device
 
     char tmp[6] = {0}; // for formatting numbers
 
-    strlcat(line, ": ", sizeof(line));
-    strlcat(line, device_desc, sizeof(line));
+    if (device_desc_p != nullptr) {
+        strlcat(line, ": ", sizeof(line));
+        strlcat(line, device_desc_p, sizeof(line));
+    }
+
     strlcat(line, " (DeviceID:0x", sizeof(line));
     strlcat(line, _hextoa(device_id, tmp), sizeof(line));
     strlcat(line, " ProductID:", sizeof(line));
@@ -1919,7 +1920,7 @@ void _process_UBADevices(_EMS_RxTelegram * EMS_RxTelegram) {
                     if ((byte & 0x01) && ((saved_byte & 0x01) == 0)) {
                         uint8_t device_id = ((data_byte + 1) * 8) + bit;
                         if (device_id != EMS_ID_ME) {
-                            myDebug("[EMS] Detected new EMS Device with ID 0x%02X", device_id);
+                            // myDebug("[EMS] Detected new EMS Device with ID 0x%02X", device_id);
                             if (!ems_getTxDisabled()) {
                                 ems_doReadCommand(EMS_TYPE_Version, device_id); // get version, but ignore ourselves
                             }
@@ -1979,52 +1980,54 @@ void _process_Version(_EMS_RxTelegram * EMS_RxTelegram) {
 
     // if not found, just add it
     if (!typeFound) {
-        (void)_addDevice(EMS_DEVICE_TYPE_UNKNOWN, product_id, device_id, 0xFF, version, EMS_MODELTYPE_UNKNOWN_STRING); // use device_index of 255
+        (void)_addDevice(EMS_DEVICE_TYPE_UNKNOWN, product_id, device_id, nullptr, version);
         return;
     }
 
+    const char *     device_desc_p = (EMS_Devices[i].device_desc); // pointer to the full description of the device
+    _EMS_DEVICE_TYPE type          = EMS_Devices[i].type;          // type
+
     // we recognized it, see if we already have it in our recognized list
-    if (_addDevice(EMS_Devices[i].type, product_id, device_id, i, version, EMS_Devices[i].device_desc)) {
+    if (_addDevice(type, product_id, device_id, device_desc_p, version)) {
         return; // already in list
     }
 
-    // its a new entry, set the specifics
-    uint8_t flags = EMS_Devices[i].flags;
+    uint8_t flags = EMS_Devices[i].flags; // its a new entry, set the specifics
 
-    if (EMS_Devices[i].type == EMS_DEVICE_TYPE_BOILER) {
-        EMS_Boiler.device_id    = device_id;
-        EMS_Boiler.product_id   = product_id;
-        EMS_Boiler.device_flags = flags;
-        EMS_Boiler.device_index = i;
+    if (type == EMS_DEVICE_TYPE_BOILER) {
+        EMS_Boiler.device_id     = device_id;
+        EMS_Boiler.product_id    = product_id;
+        EMS_Boiler.device_flags  = flags;
+        EMS_Boiler.device_desc_p = device_desc_p;
         strlcpy(EMS_Boiler.version, version, sizeof(EMS_Boiler.version));
         ems_getBoilerValues(); // get Boiler values that we would usually have to wait for
-    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_THERMOSTAT) {
+    } else if (type == EMS_DEVICE_TYPE_THERMOSTAT) {
         EMS_Thermostat.device_id       = device_id;
         EMS_Thermostat.device_flags    = (flags & 0x7F); // remove 7th bit
         EMS_Thermostat.write_supported = (flags & EMS_DEVICE_FLAG_NO_WRITE) == 0;
         EMS_Thermostat.product_id      = product_id;
-        EMS_Thermostat.device_index    = i;
+        EMS_Thermostat.device_desc_p   = device_desc_p;
         strlcpy(EMS_Thermostat.version, version, sizeof(EMS_Thermostat.version));
         ems_getThermostatValues(); // get Thermostat values
-    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_SOLAR) {
-        EMS_SolarModule.device_id    = device_id;
-        EMS_SolarModule.product_id   = product_id;
-        EMS_SolarModule.device_flags = flags;
-        EMS_SolarModule.device_index = i;
+    } else if (type == EMS_DEVICE_TYPE_SOLAR) {
+        EMS_SolarModule.device_id     = device_id;
+        EMS_SolarModule.product_id    = product_id;
+        EMS_SolarModule.device_flags  = flags;
+        EMS_SolarModule.device_desc_p = device_desc_p;
         strlcpy(EMS_SolarModule.version, version, sizeof(EMS_SolarModule.version));
         ems_getSolarModuleValues(); // fetch Solar Module values
-    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_HEATPUMP) {
-        EMS_HeatPump.device_id    = device_id;
-        EMS_HeatPump.product_id   = product_id;
-        EMS_HeatPump.device_flags = flags;
-        EMS_HeatPump.device_index = i;
+    } else if (type == EMS_DEVICE_TYPE_HEATPUMP) {
+        EMS_HeatPump.device_id     = device_id;
+        EMS_HeatPump.product_id    = product_id;
+        EMS_HeatPump.device_flags  = flags;
+        EMS_HeatPump.device_desc_p = device_desc_p;
         strlcpy(EMS_HeatPump.version, version, sizeof(EMS_HeatPump.version));
-    } else if (EMS_Devices[i].type == EMS_DEVICE_TYPE_MIXING) {
-        EMS_Mixing.device_id    = device_id;
-        EMS_Mixing.product_id   = product_id;
-        EMS_Mixing.device_index = i;
-        EMS_Mixing.device_flags = flags;
-        EMS_Mixing.detected     = true;
+    } else if (type == EMS_DEVICE_TYPE_MIXING) {
+        EMS_Mixing.device_id     = device_id;
+        EMS_Mixing.product_id    = product_id;
+        EMS_Mixing.device_desc_p = device_desc_p;
+        EMS_Mixing.device_flags  = flags;
+        EMS_Mixing.detected      = true;
         ems_doReadCommand(EMS_TYPE_MMPLUSStatusMessage_HC1, device_id); // fetch MM values
     }
 }
@@ -2209,29 +2212,34 @@ char * ems_getDeviceDescription(_EMS_DEVICE_TYPE device_type, char * buffer, boo
     const uint8_t size    = 128;
     bool          enabled = false;
     uint8_t       device_id;
-    uint8_t       device_index = 0;
+    uint8_t       product_id;
     char *        version;
+    const char *  device_desc_p;
 
     if (device_type == EMS_DEVICE_TYPE_THERMOSTAT) {
-        enabled      = ems_getThermostatEnabled();
-        device_id    = EMS_Thermostat.device_id;
-        device_index = EMS_Thermostat.device_index;
-        version      = EMS_Thermostat.version;
+        enabled       = ems_getThermostatEnabled();
+        device_id     = EMS_Thermostat.device_id;
+        product_id    = EMS_Thermostat.product_id;
+        device_desc_p = EMS_Thermostat.device_desc_p;
+        version       = EMS_Thermostat.version;
     } else if (device_type == EMS_DEVICE_TYPE_BOILER) {
-        enabled      = ems_getBoilerEnabled();
-        device_id    = EMS_Boiler.device_id;
-        device_index = EMS_Boiler.device_index;
-        version      = EMS_Boiler.version;
+        enabled       = ems_getBoilerEnabled();
+        device_id     = EMS_Boiler.device_id;
+        product_id    = EMS_Boiler.product_id;
+        device_desc_p = EMS_Boiler.device_desc_p;
+        version       = EMS_Boiler.version;
     } else if (device_type == EMS_DEVICE_TYPE_SOLAR) {
-        enabled      = ems_getSolarModuleEnabled();
-        device_id    = EMS_SolarModule.device_id;
-        device_index = EMS_SolarModule.device_index;
-        version      = EMS_SolarModule.version;
+        enabled       = ems_getSolarModuleEnabled();
+        device_id     = EMS_SolarModule.device_id;
+        product_id    = EMS_SolarModule.product_id;
+        device_desc_p = EMS_SolarModule.device_desc_p;
+        version       = EMS_SolarModule.version;
     } else if (device_type == EMS_DEVICE_TYPE_HEATPUMP) {
-        enabled      = ems_getHeatPumpEnabled();
-        device_id    = EMS_HeatPump.device_id;
-        device_index = EMS_HeatPump.device_index;
-        version      = EMS_HeatPump.version;
+        enabled       = ems_getHeatPumpEnabled();
+        device_id     = EMS_HeatPump.device_id;
+        product_id    = EMS_HeatPump.product_id;
+        device_desc_p = EMS_HeatPump.device_desc_p;
+        version       = EMS_HeatPump.version;
     }
 
     if (!enabled) {
@@ -2239,8 +2247,14 @@ char * ems_getDeviceDescription(_EMS_DEVICE_TYPE device_type, char * buffer, boo
         return buffer;
     }
 
+    // assume at this point we have a known device.
     // get device description
-    strlcpy(buffer, EMS_Devices[device_index].device_desc, size);
+    if (device_desc_p == nullptr) {
+        strlcpy(buffer, EMS_MODELTYPE_UNKNOWN_STRING, size);
+    } else {
+        strlcpy(buffer, device_desc_p, size);
+    }
+
     if (name_only) {
         return buffer; // only interested in the model name
     }
@@ -2249,7 +2263,7 @@ char * ems_getDeviceDescription(_EMS_DEVICE_TYPE device_type, char * buffer, boo
     char tmp[6] = {0};
     strlcat(buffer, _hextoa(device_id, tmp), size);
     strlcat(buffer, " ProductID:", size);
-    strlcat(buffer, itoa(EMS_Devices[device_index].product_id, tmp, 10), size);
+    strlcat(buffer, itoa(product_id, tmp, 10), size);
     strlcat(buffer, " Version:", size);
     strlcat(buffer, version, size);
     strlcat(buffer, ")", size);
@@ -2321,19 +2335,19 @@ void ems_printDevices() {
     // print out the ones we recognized
     if (!Devices.empty()) {
         bool have_unknowns = false;
-        char device_name[200];
+        char device_string[100];
         myDebug_P(PSTR("and %d were recognized by EMS-ESP as:"), Devices.size());
         for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
             if ((it)->known) {
-                strlcpy(device_name, EMS_Devices[(it)->device_index].device_desc, sizeof(device_name));
+                strlcpy(device_string, (it)->device_desc_p, sizeof(device_string));
             } else {
-                strlcpy(device_name, EMS_MODELTYPE_UNKNOWN_STRING, sizeof(device_name)); // Unknown
+                strlcpy(device_string, EMS_MODELTYPE_UNKNOWN_STRING, sizeof(device_string)); // Unknown
                 have_unknowns = true;
             }
 
             myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d Version:%s)"),
                       COLOR_BOLD_ON,
-                      device_name,
+                      device_string,
                       COLOR_BOLD_OFF,
                       (it)->device_id,
                       (it)->product_id,
@@ -2343,7 +2357,8 @@ void ems_printDevices() {
         myDebug_P(PSTR("")); // newline
 
         if (have_unknowns) {
-            myDebug_P(PSTR("You have a device is that is not known by EMS-ESP. Please report this as a GitHub issue so we can expand the EMS device library."));
+            myDebug_P(
+                PSTR("You have a device is that is not yet known by EMS-ESP. Please report this as a GitHub issue so we can expand the EMS device library."));
         }
     } else {
         myDebug_P(PSTR("No were devices recognized. This may be because Tx is disabled or failing."));
diff --git a/src/ems.h b/src/ems.h
index 52659aa12..c2bea1000 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -73,16 +73,6 @@ typedef enum {
 
 #define EMS_SYS_DEVICEMAP_LENGTH 15 // size of the 0x07 telegram data part which stores all active EMS devices
 
-// define the model types
-// which get rendered to html colors in the web interface in file custom.js in function listCustomStats()
-#define EMS_MODELTYPE_BOILER 1     // success color
-#define EMS_MODELTYPE_THERMOSTAT 2 // info color
-#define EMS_MODELTYPE_SM 3         // warning color
-#define EMS_MODELTYPE_HP 4         // success color
-#define EMS_MODELTYPE_OTHER 5      // no color
-#define EMS_MODELTYPE_UNKNOWN 6    // no color
-#define EMS_MODELTYPE_MIXING 7
-
 #define EMS_MODELTYPE_UNKNOWN_STRING "unknown?" // model type text to use when discovering an unknown device
 
 /* EMS UART transfer status */
@@ -209,7 +199,7 @@ typedef enum {
     EMS_DEVICE_TYPE_UNKNOWN
 } _EMS_DEVICE_TYPE;
 
-// to store all know EMS devices
+// to store all known EMS devices to date
 typedef struct {
     uint8_t          product_id;
     _EMS_DEVICE_TYPE type;
@@ -246,12 +236,12 @@ const _EMS_Device_Types EMS_Devices_Types[] = {
 
 // for storing all recognised EMS devices
 typedef struct {
-    _EMS_DEVICE_TYPE device_type;  // type
-    uint8_t          product_id;   // product id for looking up details in EMS_Devices
-    uint8_t          device_id;    // the device_id
-    uint8_t          device_index; // where it is in the EMS_Devices table
-    char             version[10];  // the version number XX.XX
-    bool             known;        // is this a known device?
+    _EMS_DEVICE_TYPE device_type;   // type (see above)
+    uint8_t          product_id;    // product id
+    uint8_t          device_id;     // device_id
+    const char *           device_desc_p; // pointer to description string in EMS_Devices table
+    char             version[10];   // the version number XX.XX
+    bool             known;         // is this a known device?
 } _Detected_Device;
 
 #define EMS_DEVICE_FLAG_NONE 0   // no flags set
@@ -275,7 +265,7 @@ typedef struct {
     // settings
     uint8_t device_id; // this is typically always 0x08
     uint8_t device_flags;
-    uint8_t device_index;
+    const char *  device_desc_p;
     uint8_t product_id;
     char    version[10];
 
@@ -339,19 +329,15 @@ typedef struct {
 typedef struct {
     uint8_t device_id; // the device ID of the Heat Pump (e.g. 0x30)
     uint8_t device_flags;
-    uint8_t device_index;
+    const char *  device_desc_p;
     uint8_t product_id;
     char    version[10];
     uint8_t HPModulation; // heatpump modulation in %
     uint8_t HPSpeed;      // speed 0-100 %
 } _EMS_HeatPump;
 
+// Mixing Module per HC
 typedef struct {
-    uint8_t  device_id;
-    uint8_t  device_flags;
-    uint8_t  device_index;
-    uint8_t  product_id;
-    char     version[10];
     uint8_t  hc;     // heating circuit 1, 2, 3 or 4
     bool     active; // true if there is data for this HC
     uint16_t flowTemp;
@@ -363,17 +349,18 @@ typedef struct {
 typedef struct {
     uint8_t        device_id;
     uint8_t        device_flags;
-    uint8_t        device_index;
+    const char *         device_desc_p;
     uint8_t        product_id;
+    char           version[10];
     bool           detected;
     _EMS_Mixing_HC hc[EMS_THERMOSTAT_MAXHC]; // array for the 4 heating circuits
 } _EMS_Mixing;
 
-// SM Solar Module - SM10/SM100/ISM1
+// Solar Module - SM10/SM100/ISM1
 typedef struct {
     uint8_t  device_id;    // the device ID of the Solar Module
     uint8_t  device_flags; // Solar Module flags
-    uint8_t  device_index;
+    const char *   device_desc_p;
     uint8_t  product_id;
     char     version[10];
     int16_t  collectorTemp;          // collector temp
@@ -408,7 +395,7 @@ typedef struct {
 typedef struct {
     uint8_t            device_id;    // the device ID of the thermostat
     uint8_t            device_flags; // thermostat model flags
-    uint8_t            device_index;
+    const char *             device_desc_p;
     uint8_t            product_id;
     char               version[10];
     char               datetime[25]; // HH:MM:SS DD/MM/YYYY
@@ -427,37 +414,33 @@ typedef struct {
 } _EMS_Type;
 
 // function definitions
-extern void ems_dumpBuffer(const char * prefix, uint8_t * telegram, uint8_t length);
-extern void ems_parseTelegram(uint8_t * telegram, uint8_t len);
-void        ems_init();
-void        ems_doReadCommand(uint16_t type, uint8_t dest, bool forceRefresh = false);
-void        ems_sendRawTelegram(char * telegram);
-void        ems_scanDevices();
-void        ems_printDevices();
-uint8_t     ems_printDevices_s(char * buffer, uint16_t len);
-void        ems_printTxQueue();
-void        ems_testTelegram(uint8_t test_num);
-void        ems_startupTelegrams();
-bool        ems_checkEMSBUSAlive();
-void        ems_clearDeviceList();
-
-void ems_setThermostatTemp(float temperature, uint8_t hc, uint8_t temptype = 0);
-void ems_setThermostatMode(uint8_t mode, uint8_t hc);
-void ems_setWarmWaterTemp(uint8_t temperature);
-void ems_setFlowTemp(uint8_t temperature);
-void ems_setWarmWaterActivated(bool activated);
-void ems_setWarmWaterOnetime(bool activated);
-void ems_setWarmTapWaterActivated(bool activated);
-void ems_setPoll(bool b);
-void ems_setLogging(_EMS_SYS_LOGGING loglevel, bool silent = false);
-void ems_setEmsRefreshed(bool b);
-void ems_setWarmWaterModeComfort(uint8_t comfort);
-void ems_setModels();
-void ems_setTxDisabled(bool b);
-void ems_setTxMode(uint8_t mode);
-
-uint8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram);
-
+void             ems_dumpBuffer(const char * prefix, uint8_t * telegram, uint8_t length);
+void             ems_parseTelegram(uint8_t * telegram, uint8_t len);
+void             ems_init();
+void             ems_doReadCommand(uint16_t type, uint8_t dest, bool forceRefresh = false);
+void             ems_sendRawTelegram(char * telegram);
+void             ems_scanDevices();
+void             ems_printDevices();
+uint8_t          ems_printDevices_s(char * buffer, uint16_t len);
+void             ems_printTxQueue();
+void             ems_testTelegram(uint8_t test_num);
+void             ems_startupTelegrams();
+bool             ems_checkEMSBUSAlive();
+void             ems_clearDeviceList();
+void             ems_setThermostatTemp(float temperature, uint8_t hc, uint8_t temptype = 0);
+void             ems_setThermostatMode(uint8_t mode, uint8_t hc);
+void             ems_setWarmWaterTemp(uint8_t temperature);
+void             ems_setFlowTemp(uint8_t temperature);
+void             ems_setWarmWaterActivated(bool activated);
+void             ems_setWarmWaterOnetime(bool activated);
+void             ems_setWarmTapWaterActivated(bool activated);
+void             ems_setPoll(bool b);
+void             ems_setLogging(_EMS_SYS_LOGGING loglevel, bool silent = false);
+void             ems_setEmsRefreshed(bool b);
+void             ems_setWarmWaterModeComfort(uint8_t comfort);
+void             ems_setModels();
+void             ems_setTxDisabled(bool b);
+void             ems_setTxMode(uint8_t mode);
 char *           ems_getDeviceDescription(_EMS_DEVICE_TYPE device_type, char * buffer, bool name_only = false);
 bool             ems_getDeviceTypeDescription(uint8_t device_id, char * buffer);
 void             ems_getThermostatValues();
@@ -486,6 +469,7 @@ void    _processType(_EMS_RxTelegram * EMS_RxTelegram);
 void    _debugPrintPackage(const char * prefix, _EMS_RxTelegram * EMS_RxTelegram, const char * color);
 void    _ems_clearTxData();
 void    _removeTxQueue();
+uint8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram);
 
 // global so can referenced in other classes
 extern _EMS_Sys_Status  EMS_Sys_Status;
diff --git a/src/ems_devices.h b/src/ems_devices.h
index d0d5d289e..a7218634b 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -159,7 +159,7 @@
  * Table of all known EMS Devices
  * ProductID, DeviceType, Description, Flags
  */
-const _EMS_Device EMS_Devices[] = {
+static const _EMS_Device EMS_Devices[] = {
 
     //
     // UBA Masters - typically with device_id of 0x08
diff --git a/src/version.h b/src/version.h
index 8d57dc8c4..7d7b21be6 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b11"
+#define APP_VERSION "1.9.4b12"

From 81af4182942e821c2a23dbdceaf5a4b39d023d87 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 13 Nov 2019 10:22:46 +0100
Subject: [PATCH 080/120] code formatting

---
 src/ems.h | 58 +++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/ems.h b/src/ems.h
index c2bea1000..ffffacb60 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -239,7 +239,7 @@ typedef struct {
     _EMS_DEVICE_TYPE device_type;   // type (see above)
     uint8_t          product_id;    // product id
     uint8_t          device_id;     // device_id
-    const char *           device_desc_p; // pointer to description string in EMS_Devices table
+    const char *     device_desc_p; // pointer to description string in EMS_Devices table
     char             version[10];   // the version number XX.XX
     bool             known;         // is this a known device?
 } _Detected_Device;
@@ -263,11 +263,11 @@ typedef struct {
  */
 typedef struct {
     // settings
-    uint8_t device_id; // this is typically always 0x08
-    uint8_t device_flags;
-    const char *  device_desc_p;
-    uint8_t product_id;
-    char    version[10];
+    uint8_t      device_id; // this is typically always 0x08
+    uint8_t      device_flags;
+    const char * device_desc_p;
+    uint8_t      product_id;
+    char         version[10];
 
     // UBAParameterWW
     uint8_t wWActivated;   // Warm Water activated
@@ -327,13 +327,13 @@ typedef struct {
  * Telegram package defintions for Other EMS devices
  */
 typedef struct {
-    uint8_t device_id; // the device ID of the Heat Pump (e.g. 0x30)
-    uint8_t device_flags;
-    const char *  device_desc_p;
-    uint8_t product_id;
-    char    version[10];
-    uint8_t HPModulation; // heatpump modulation in %
-    uint8_t HPSpeed;      // speed 0-100 %
+    uint8_t      device_id; // the device ID of the Heat Pump (e.g. 0x30)
+    uint8_t      device_flags;
+    const char * device_desc_p;
+    uint8_t      product_id;
+    char         version[10];
+    uint8_t      HPModulation; // heatpump modulation in %
+    uint8_t      HPSpeed;      // speed 0-100 %
 } _EMS_HeatPump;
 
 // Mixing Module per HC
@@ -349,7 +349,7 @@ typedef struct {
 typedef struct {
     uint8_t        device_id;
     uint8_t        device_flags;
-    const char *         device_desc_p;
+    const char *   device_desc_p;
     uint8_t        product_id;
     char           version[10];
     bool           detected;
@@ -358,20 +358,20 @@ typedef struct {
 
 // Solar Module - SM10/SM100/ISM1
 typedef struct {
-    uint8_t  device_id;    // the device ID of the Solar Module
-    uint8_t  device_flags; // Solar Module flags
-    const char *   device_desc_p;
-    uint8_t  product_id;
-    char     version[10];
-    int16_t  collectorTemp;          // collector temp
-    int16_t  bottomTemp;             // bottom temp
-    uint8_t  pumpModulation;         // modulation solar pump
-    uint8_t  pump;                   // pump active
-    int16_t  setpoint_maxBottomTemp; // setpoint for maximum collector temp
-    uint16_t EnergyLastHour;
-    uint16_t EnergyToday;
-    uint16_t EnergyTotal;
-    uint32_t pumpWorkMin; // Total solar pump operating time
+    uint8_t      device_id;    // the device ID of the Solar Module
+    uint8_t      device_flags; // Solar Module flags
+    const char * device_desc_p;
+    uint8_t      product_id;
+    char         version[10];
+    int16_t      collectorTemp;          // collector temp
+    int16_t      bottomTemp;             // bottom temp
+    uint8_t      pumpModulation;         // modulation solar pump
+    uint8_t      pump;                   // pump active
+    int16_t      setpoint_maxBottomTemp; // setpoint for maximum collector temp
+    uint16_t     EnergyLastHour;
+    uint16_t     EnergyToday;
+    uint16_t     EnergyTotal;
+    uint32_t     pumpWorkMin; // Total solar pump operating time
 } _EMS_SolarModule;
 
 // heating circuit
@@ -395,7 +395,7 @@ typedef struct {
 typedef struct {
     uint8_t            device_id;    // the device ID of the thermostat
     uint8_t            device_flags; // thermostat model flags
-    const char *             device_desc_p;
+    const char *       device_desc_p;
     uint8_t            product_id;
     char               version[10];
     char               datetime[25]; // HH:MM:SS DD/MM/YYYY

From f7dda6bd54ddc7f47371acee36fa0e0bc8f14c8d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 13 Nov 2019 21:46:09 +0100
Subject: [PATCH 081/120] added boiler temp for Bosch -
 https://github.com/proddy/EMS-ESP/issues/206

---
 src/ems.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/ems.cpp b/src/ems.cpp
index f66a3ff8b..80bae5ab7 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1282,8 +1282,16 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.curBurnPow = _toByte(4);
     EMS_Boiler.selBurnPow = _toByte(3); // burn power max setting
 
+    // set boiler temp only if we actually have a real value
+    if (_toShort(11) != EMS_VALUE_USHORT_NOTSET) {
+        EMS_Boiler.boilTemp = _toShort(11); // 0x8000 if not available
+    }
+
     EMS_Boiler.flameCurr = _toShort(15);
 
+    // system pressure. FF means missing
+    EMS_Boiler.sysPress = _toByte(17); // this is *10
+
     // read the service code / installation status as appears on the display
     EMS_Boiler.serviceCodeChar[0] = char(_toByte(18)); // ascii character 1
     EMS_Boiler.serviceCodeChar[1] = char(_toByte(19)); // ascii character 2
@@ -1292,9 +1300,6 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
     // read error code
     EMS_Boiler.serviceCode = _toShort(20);
 
-    // system pressure. FF means missing
-    EMS_Boiler.sysPress = _toByte(17); // this is *10
-
     // at this point do a quick check to see if the hot water or heating is active
     _checkActive();
 }
@@ -1304,8 +1309,13 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
  * received every 60 seconds
  */
 void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.extTemp     = _toShort(0); // 0x8000 if not available
-    EMS_Boiler.boilTemp    = _toShort(2); // 0x8000 if not available
+    EMS_Boiler.extTemp = _toShort(0); // 0x8000 if not available
+
+    // set boiler temp only if we actually have a real value
+    if (_toShort(2) != EMS_VALUE_USHORT_NOTSET) {
+        EMS_Boiler.boilTemp = _toShort(2); // 0x8000 if not available
+    }
+
     EMS_Boiler.pumpMod     = _toByte(9);
     EMS_Boiler.burnStarts  = _toLong(10);
     EMS_Boiler.burnWorkMin = _toLong(13);

From b56e12f33e30d4772b9a24731dc2e6d0955a68ec Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 13 Nov 2019 22:22:51 +0100
Subject: [PATCH 082/120] added outdoor temp 0xD1 -
 https://github.com/proddy/EMS-ESP/issues/220

---
 src/ems-esp.cpp   |  2 +-
 src/ems.cpp       | 20 +++++++++++++++++++-
 src/ems_devices.h |  3 +++
 src/ems_utils.cpp |  2 +-
 src/test_data.h   |  3 ++-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index c98086d36..52a24c8b0 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -103,7 +103,7 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "tx_mode <n>", "changes Tx logic. 1=EMS generic, 2=EMS+, 3=HT3"},
 
     {false, "info", "show current values deciphered from the EMS messages"},
-    {false, "log <n | b | t | s | r | j | v>", "set logging mode to none, basic, thermostat only, solar module only, raw, jabber or verbose"},
+    {false, "log <n | b | t | s | r | j | v | number>", "set logging to none, basic, thermostat, solar module, raw, jabber, verbose or specific type"},
 
 #ifdef TESTS
     {false, "test <n>", "insert a test telegram on to the EMS bus"},
diff --git a/src/ems.cpp b/src/ems.cpp
index 80bae5ab7..3c9c4bd52 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -48,6 +48,9 @@ void _process_UBATotalUptimeMessage(_EMS_RxTelegram * EMS_RxTelegram);
 void _process_UBAParametersMessage(_EMS_RxTelegram * EMS_RxTelegram);
 void _process_SetPoints(_EMS_RxTelegram * EMS_RxTelegram);
 
+// EMS+ specific
+void _process_UBAOutdoorTemp(_EMS_RxTelegram * EMS_RxTelegram);
+
 // SM10
 void _process_SM10Monitor(_EMS_RxTelegram * EMS_RxTelegram);
 
@@ -120,6 +123,9 @@ const _EMS_Type EMS_Types[] = {
     {EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage},
     {EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints},
 
+    // UBA/Boiler EMS+
+    {EMS_TYPE_UBAOutdoorTemp, "UBAOutdoorTemp", _process_UBAOutdoorTemp},
+
     // Solar Module devices
     {EMS_TYPE_SM10Monitor, "SM10Monitor", _process_SM10Monitor},
     {EMS_TYPE_SM100Monitor, "SM100Monitor", _process_SM100Monitor},
@@ -1307,9 +1313,12 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
 /**
  * UBAMonitorSlow - type 0x19 - central heating monitor part 2 (27 bytes long)
  * received every 60 seconds
+ * e.g. 08 00 19 00 80 00 02 41 80 00 00 00 00 00 03 91 7B 05 B8 40 00 00 00 04 92 AD 00 5E EE 80 00 (CRC=C9) #data=27
  */
 void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.extTemp = _toShort(0); // 0x8000 if not available
+    if (_toShort(0) != EMS_VALUE_USHORT_NOTSET) { // 0x8000 if not available
+        EMS_Boiler.extTemp = _toShort(0);
+    }
 
     // set boiler temp only if we actually have a real value
     if (_toShort(2) != EMS_VALUE_USHORT_NOTSET) {
@@ -1323,6 +1332,15 @@ void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.switchTemp  = _toShort(25);
 }
 
+/**
+ * UBAOutdoorTemp - type 0xD1 - external temperature
+ */
+void _process_UBAOutdoorTemp(_EMS_RxTelegram * EMS_RxTelegram) {
+    if (_toShort(0) != EMS_VALUE_USHORT_NOTSET) { // 0x8000 if not available
+        EMS_Boiler.extTemp = _toShort(0);
+    }
+}
+
 /**
  * type 0xB1 - data from the RC10 thermostat (0x17)
  * For reading the temp values only
diff --git a/src/ems_devices.h b/src/ems_devices.h
index a7218634b..cd55e3bf0 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -32,6 +32,9 @@
 #define EMS_TYPE_UBASetPoints 0x1A
 #define EMS_TYPE_UBAFunctionTest 0x1D
 
+// EMS+ specific
+#define EMS_TYPE_UBAOutdoorTemp 0xD1 // external temp
+
 #define EMS_OFFSET_UBAParameterWW_wwtemp 2                  // WW Temperature
 #define EMS_OFFSET_UBAParameterWW_wwactivated 1             // WW Activated
 #define EMS_OFFSET_UBAParameterWW_wwOneTime 0x00            // WW OneTime loading
diff --git a/src/ems_utils.cpp b/src/ems_utils.cpp
index b622aa253..cb584a244 100644
--- a/src/ems_utils.cpp
+++ b/src/ems_utils.cpp
@@ -108,7 +108,7 @@ char * _ushort_to_char(char * s, uint16_t value, uint8_t decimals) {
 }
 
 // takes a signed short value (2 bytes), converts to a fraction and prints it
-// decimals: 0 = no division, 1=divide value by 10, 2=divide by 2, 10=divide value by 100
+// decimals: 0=no division, 1=divide value by 10 (default), 2=divide by 2, 10=divide value by 100
 void _renderShortValue(const char * prefix, const char * postfix, int16_t value, uint8_t decimals) {
     static char buffer[200] = {0};
     static char s[20]       = {0};
diff --git a/src/test_data.h b/src/test_data.h
index c47805977..697ab0004 100644
--- a/src/test_data.h
+++ b/src/test_data.h
@@ -54,7 +54,8 @@ static const char * TEST_DATA[] = {
     "88 00 19 00 00 DC 80 00 80 00 FF FF 00 00 00 21 9A 06 E1 7C 00 00 00 06 C2 13 00 1E 90 80 00", // test 49 - check max length
     "30 00 FF 00 02 8E 00 00 41 82 00 00 28 36 00 00 82 21",                                        // test 50 - SM100
     "10 00 FF 08 01 B9 26",                                                                         // test 51 - EMS+ 0x1B9 set temp
-    "10 00 F7 00 FF 01 B9 21 E9"                                                                    // test 52 - EMS+ 0x1B9 F7 test
+    "10 00 F7 00 FF 01 B9 21 E9",                                                                   // test 52 - EMS+ 0x1B9 F7 test
+    "08 00 D1 00 00 80"                                                                             // test 53 - outdoor temp
 
 
 };

From 4a56f0dc9f37393eab90c06579eb4844b435295c Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Thu, 14 Nov 2019 23:13:47 +0100
Subject: [PATCH 083/120] added log w and more ems+ messages

---
 CHANGELOG.md      |  3 ++
 src/ems-esp.cpp   | 23 ++++++++-----
 src/ems.cpp       | 85 +++++++++++++++++++++++++++++++++++++++--------
 src/ems.h         |  4 ++-
 src/ems_devices.h |  5 +--
 src/version.h     |  2 +-
 6 files changed, 96 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7f7a1675..bd8e7a8e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ There are breaking changes in this release. See `publish_time` below and make su
 - Implemented timezone support and automatic adjustment, also taking daylight saving times into account
 - Added `kick` command to reset core services like NTP, Web, Web Sockets
 - Added WiFi static IP (setting done in WebUI only)
+- `log w <type_id>` for watching a specific telegram type ID
+- initial support for EMS+ GB125s and MC110's (https://github.com/proddy/EMS-ESP/wiki/MC110-controller)
 
 ### Fixed
 
@@ -34,6 +36,7 @@ There are breaking changes in this release. See `publish_time` below and make su
 - Removed `publish_always` and use `publish_time`. For automatic mode you will need to change `publish_time` to 0 which will send MQTT every time data has changed (every 10 seconds).
 - Changed NTP interval from 1 hour to 12 hours
 - Refactored EMS device library to make it support multi-EMS devices easier (e.g. multiple thermostats)
+- `autodetect deep` removed and replaced with `autodetect scan` for scanning known devices.
 
 ### Removed
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 52a24c8b0..e2a5ce6c2 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -103,7 +103,7 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "tx_mode <n>", "changes Tx logic. 1=EMS generic, 2=EMS+, 3=HT3"},
 
     {false, "info", "show current values deciphered from the EMS messages"},
-    {false, "log <n | b | t | s | r | j | v | number>", "set logging to none, basic, thermostat, solar module, raw, jabber, verbose or specific type"},
+    {false, "log <n | b | t | s | r | j | v | w [type ID]", "set logging to none, basic, thermostat, solar module, raw, jabber, verbose or watch a specific type"},
 
 #ifdef TESTS
     {false, "test <n>", "insert a test telegram on to the EMS bus"},
@@ -113,7 +113,7 @@ static const command_t project_cmds[] PROGMEM = {
     {false, "refresh", "fetch values from the EMS devices"},
     {false, "devices", "list detected EMS devices"},
     {false, "queue", "show current Tx queue"},
-    {false, "autodetect [quick]", "detect EMS devices and attempt to automatically set boiler and thermostat types"},
+    {false, "autodetect [scan]", "detect EMS devices and attempt to automatically set boiler and thermostat types"},
     {false, "send XX ...", "send raw telegram data to EMS bus (XX are hex values)"},
     {false, "thermostat read <type ID>", "send read request to the thermostat for heating circuit hc 1-4"},
     {false, "thermostat temp [hc] <degrees>", "set current thermostat temperature"},
@@ -230,6 +230,8 @@ void showInfo() {
         myDebug_P(PSTR("  System logging set to Solar Module only"));
     } else if (sysLog == EMS_SYS_LOGGING_JABBER) {
         myDebug_P(PSTR("  System logging set to Jabber"));
+    } else if (sysLog == EMS_SYS_LOGGING_WATCH) {
+        myDebug_P(PSTR("  System logging set to Watch"));
     } else {
         myDebug_P(PSTR("  System logging set to None"));
     }
@@ -1228,9 +1230,9 @@ void _showCommands(uint8_t event) {
 // we set the logging here
 void TelnetCallback(uint8_t event) {
     if (event == TELNET_EVENT_CONNECT) {
-        ems_setLogging(EMS_SYS_LOGGING_DEFAULT, true);
+        ems_setLogging(EMS_SYS_LOGGING_DEFAULT);
     } else if (event == TELNET_EVENT_DISCONNECT) {
-        ems_setLogging(EMS_SYS_LOGGING_NONE, true);
+        ems_setLogging(EMS_SYS_LOGGING_NONE);
     } else if ((event == TELNET_EVENT_SHOWCMD) || (event == TELNET_EVENT_SHOWSET)) {
         _showCommands(event);
     }
@@ -1273,19 +1275,19 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
     if (strcmp(first_cmd, "autodetect") == 0) {
         if (wc == 2) {
             char * second_cmd = _readWord();
-            if (strcmp(second_cmd, "quick") == 0) {
-                ems_clearDeviceList();
-                ems_doReadCommand(EMS_TYPE_UBADevices, EMS_Boiler.device_id);
+            if (strcmp(second_cmd, "scan") == 0) {
+                ems_scanDevices(); // known device scan
                 ok = true;
             }
         } else {
-            ems_scanDevices(); // normal known device scan
+            ems_clearDeviceList();
+            ems_doReadCommand(EMS_TYPE_UBADevices, EMS_Boiler.device_id);
             ok = true;
         }
     }
 
     // logging
-    if ((strcmp(first_cmd, "log") == 0) && (wc == 2)) {
+    if ((strcmp(first_cmd, "log") == 0) && (wc >= 2)) {
         char * second_cmd = _readWord();
         if (strcmp(second_cmd, "v") == 0) {
             ems_setLogging(EMS_SYS_LOGGING_VERBOSE);
@@ -1308,6 +1310,9 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
         } else if (strcmp(second_cmd, "j") == 0) {
             ems_setLogging(EMS_SYS_LOGGING_JABBER);
             ok = true;
+        } else if (strcmp(second_cmd, "w") == 0) {
+            ems_setLogging(EMS_SYS_LOGGING_WATCH, _readHexNumber()); // get type_id
+            ok = true;
         }
     }
 
diff --git a/src/ems.cpp b/src/ems.cpp
index 3c9c4bd52..748e8898b 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -50,6 +50,8 @@ void _process_SetPoints(_EMS_RxTelegram * EMS_RxTelegram);
 
 // EMS+ specific
 void _process_UBAOutdoorTemp(_EMS_RxTelegram * EMS_RxTelegram);
+void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram);
+void _process_UBAMonitorSlow2(_EMS_RxTelegram * EMS_RxTelegram);
 
 // SM10
 void _process_SM10Monitor(_EMS_RxTelegram * EMS_RxTelegram);
@@ -125,6 +127,8 @@ const _EMS_Type EMS_Types[] = {
 
     // UBA/Boiler EMS+
     {EMS_TYPE_UBAOutdoorTemp, "UBAOutdoorTemp", _process_UBAOutdoorTemp},
+    {EMS_TYPE_UBAMonitorFast2, "UBAMonitorFast2", _process_UBAMonitorFast2},
+    {EMS_TYPE_UBAMonitorSlow2, "UBAMonitorSlow2", _process_UBAMonitorSlow2},
 
     // Solar Module devices
     {EMS_TYPE_SM10Monitor, "SM10Monitor", _process_SM10Monitor},
@@ -422,12 +426,9 @@ _EMS_SYS_LOGGING ems_getLogging() {
     return EMS_Sys_Status.emsLogging;
 }
 
-void ems_setLogging(_EMS_SYS_LOGGING loglevel, bool silent) {
-    if (loglevel <= EMS_SYS_LOGGING_JABBER) {
+void ems_setLogging(_EMS_SYS_LOGGING loglevel, uint16_t type_id) {
+    if (loglevel <= EMS_SYS_LOGGING_WATCH) {
         EMS_Sys_Status.emsLogging = loglevel;
-        if (silent) {
-            return; // don't print to telnet/serial
-        }
 
         if (loglevel == EMS_SYS_LOGGING_NONE) {
             myDebug_P(PSTR("System Logging set to None"));
@@ -443,6 +444,9 @@ void ems_setLogging(_EMS_SYS_LOGGING loglevel, bool silent) {
             myDebug_P(PSTR("System Logging set to Raw mode"));
         } else if (loglevel == EMS_SYS_LOGGING_JABBER) {
             myDebug_P(PSTR("System Logging set to Jabber mode"));
+        } else if (loglevel == EMS_SYS_LOGGING_WATCH) {
+            EMS_Sys_Status.emsLogging_typeID = type_id;
+            myDebug_P(PSTR("System Logging set to Watch mode"));
         }
     }
 }
@@ -555,14 +559,16 @@ void _debugPrintTelegram(const char * prefix, _EMS_RxTelegram * EMS_RxTelegram,
         strlcat(output_str, " ", sizeof(output_str)); // add space
     }
 
-    strlcat(output_str, "(CRC=", sizeof(output_str));
-    strlcat(output_str, _hextoa(data[length - 1], buffer), sizeof(output_str));
-    strlcat(output_str, ")", sizeof(output_str));
+    if (!raw) {
+        strlcat(output_str, "(CRC=", sizeof(output_str));
+        strlcat(output_str, _hextoa(data[length - 1], buffer), sizeof(output_str));
+        strlcat(output_str, ")", sizeof(output_str));
 
-    // print number of data bytes only if its a valid telegram
-    if (data_len) {
-        strlcat(output_str, " #data=", sizeof(output_str));
-        strlcat(output_str, itoa(data_len, buffer, 10), sizeof(output_str));
+        // print number of data bytes only if its a valid telegram
+        if (data_len) {
+            strlcat(output_str, " #data=", sizeof(output_str));
+            strlcat(output_str, itoa(data_len, buffer, 10), sizeof(output_str));
+        }
     }
 
     strlcat(output_str, COLOR_RESET, sizeof(output_str));
@@ -904,9 +910,12 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
     }
 
     // if we are in raw logging mode then just print out the telegram as it is
+    // or if we're watching a specific type ID show it
     // but still continue to process it
     if ((EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_RAW)) {
         _debugPrintTelegram("", &EMS_RxTelegram, COLOR_WHITE, true);
+    } else if ((EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_WATCH) && (EMS_RxTelegram.type == EMS_Sys_Status.emsLogging_typeID)) {
+        _debugPrintTelegram("", &EMS_RxTelegram, COLOR_WHITE, true);
     }
 
     // Assume at this point we have something that vaguely resembles a telegram in the format [src] [dest] [type] [offset] [data] [crc]
@@ -974,7 +983,6 @@ void _printMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 
     strlcat(output_str, ", ", sizeof(output_str));
 
-
     if (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_THERMOSTAT) {
         // only print ones to/from thermostat if logging is set to thermostat only
         if ((src == EMS_Thermostat.device_id) || (dest == EMS_Thermostat.device_id)) {
@@ -1310,6 +1318,42 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
     _checkActive();
 }
 
+/**
+ * UBAMonitorFast2 - type 0xE4 - central heating monitor
+ */
+void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
+    EMS_Boiler.selFlowTemp = _toByte(6);
+    //EMS_Boiler.curFlowTemp = _toShort(1);
+    //EMS_Boiler.retTemp     = _toShort(13);
+
+    EMS_Boiler.burnGas = _bitRead(11, 0);
+    EMS_Boiler.wWHeat  = _bitRead(11, 2);
+
+    EMS_Boiler.curBurnPow = _toByte(10);
+    EMS_Boiler.selBurnPow = _toByte(9); // burn power max setting
+
+    // set boiler temp only if we actually have a real value
+    if (_toShort(7) != EMS_VALUE_USHORT_NOTSET) {
+        EMS_Boiler.boilTemp = _toShort(7); // 0x8000 if not available
+    }
+
+    EMS_Boiler.flameCurr = _toShort(19);
+
+    // system pressure. FF means missing
+    //EMS_Boiler.sysPress = _toByte(17); // this is *10
+
+    // read the service code / installation status as appears on the display
+    EMS_Boiler.serviceCodeChar[0] = char(_toByte(4)); // ascii character 1
+    EMS_Boiler.serviceCodeChar[1] = char(_toByte(5)); // ascii character 2
+    EMS_Boiler.serviceCodeChar[2] = '\0';             // null terminate string
+
+    // read error code
+    //EMS_Boiler.serviceCode = _toShort(20);
+
+    // at this point do a quick check to see if the hot water or heating is active
+    _checkActive();
+}
+
 /**
  * UBAMonitorSlow - type 0x19 - central heating monitor part 2 (27 bytes long)
  * received every 60 seconds
@@ -1332,6 +1376,21 @@ void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.switchTemp  = _toShort(25);
 }
 
+/**
+ * UBAMonitorSlow2 - type 0xE5 - central heating monitor
+ */
+void _process_UBAMonitorSlow2(_EMS_RxTelegram * EMS_RxTelegram) {
+    EMS_Boiler.fanWork = _bitRead(2, 2);
+    EMS_Boiler.ignWork = _bitRead(2, 3);
+    EMS_Boiler.heatPmp = _bitRead(2, 5);
+    EMS_Boiler.wWCirc  = _bitRead(2, 7);
+
+    EMS_Boiler.burnStarts  = _toLong(10);
+    EMS_Boiler.burnWorkMin = _toLong(13);
+    EMS_Boiler.heatWorkMin = _toLong(19);
+    EMS_Boiler.pumpMod     = _toByte(25); // or is it switchTemp ?
+}
+
 /**
  * UBAOutdoorTemp - type 0xD1 - external temperature
  */
diff --git a/src/ems.h b/src/ems.h
index ffffacb60..3d5efb07d 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -105,6 +105,7 @@ typedef enum {
 typedef enum {
     EMS_SYS_LOGGING_NONE,        // no messages
     EMS_SYS_LOGGING_RAW,         // raw data mode
+    EMS_SYS_LOGGING_WATCH,       // watch a specific type ID
     EMS_SYS_LOGGING_BASIC,       // only basic read/write messages
     EMS_SYS_LOGGING_THERMOSTAT,  // only telegrams sent from thermostat
     EMS_SYS_LOGGING_SOLARMODULE, // only telegrams sent from thermostat
@@ -121,6 +122,7 @@ typedef struct {
     uint16_t         emxCrcErr;                              // CRC errors
     bool             emsPollEnabled;                         // flag enable the response to poll messages
     _EMS_SYS_LOGGING emsLogging;                             // logging
+    uint16_t         emsLogging_typeID;                      // the typeID to watch
     bool             emsRefreshed;                           // fresh data, needs to be pushed out to MQTT
     bool             emsBusConnected;                        // is there an active bus
     uint32_t         emsRxTimestamp;                         // timestamp of last EMS message received
@@ -435,7 +437,7 @@ void             ems_setWarmWaterActivated(bool activated);
 void             ems_setWarmWaterOnetime(bool activated);
 void             ems_setWarmTapWaterActivated(bool activated);
 void             ems_setPoll(bool b);
-void             ems_setLogging(_EMS_SYS_LOGGING loglevel, bool silent = false);
+void             ems_setLogging(_EMS_SYS_LOGGING loglevel, uint16_t type_id = 0);
 void             ems_setEmsRefreshed(bool b);
 void             ems_setWarmWaterModeComfort(uint8_t comfort);
 void             ems_setModels();
diff --git a/src/ems_devices.h b/src/ems_devices.h
index cd55e3bf0..c602a6c54 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -33,7 +33,9 @@
 #define EMS_TYPE_UBAFunctionTest 0x1D
 
 // EMS+ specific
-#define EMS_TYPE_UBAOutdoorTemp 0xD1 // external temp
+#define EMS_TYPE_UBAOutdoorTemp 0xD1  // external temp
+#define EMS_TYPE_UBAMonitorFast2 0xE4 // Monitor fast for newer EMS+
+#define EMS_TYPE_UBAMonitorSlow2 0xE5 // Monitor slow for newer EMS+
 
 #define EMS_OFFSET_UBAParameterWW_wwtemp 2                  // WW Temperature
 #define EMS_OFFSET_UBAParameterWW_wwactivated 1             // WW Activated
@@ -92,7 +94,6 @@
 #define EMS_OFFSET_RC30Set_mode 23 // position of thermostat mode
 #define EMS_OFFSET_RC30Set_temp 28 // position of thermostat setpoint temperature
 
-
 // RC35 specific
 #define EMS_TYPE_RC35StatusMessage_HC1 0x3E // is an automatic thermostat broadcast giving us temps on HC1
 #define EMS_TYPE_RC35StatusMessage_HC2 0x48 // is an automatic thermostat broadcast giving us temps on HC2
diff --git a/src/version.h b/src/version.h
index 7d7b21be6..b522cd61d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b12"
+#define APP_VERSION "1.9.4b13"

From 044079070cc768c30840f52f50824aaabda23b20 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 17 Nov 2019 19:24:09 +0100
Subject: [PATCH 084/120] fix junkers detection -
 https://github.com/proddy/EMS-ESP/issues/224

---
 src/ems_devices.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ems_devices.h b/src/ems_devices.h
index c602a6c54..8947a671a 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -233,8 +233,8 @@ static const _EMS_Device EMS_Devices[] = {
     //
 
     // Easy devices - not currently supporting write operations
-    {202, EMS_DEVICE_TYPE_THERMOSTAT, "Logamatic TC100/Nefit Moduline Easy", EMS_DEVICE_FLAG_EASY & EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write
-    {203, EMS_DEVICE_TYPE_THERMOSTAT, "Bosch EasyControl CT200", EMS_DEVICE_FLAG_EASY & EMS_DEVICE_FLAG_NO_WRITE},             // 0x18, cannot write
+    {202, EMS_DEVICE_TYPE_THERMOSTAT, "Logamatic TC100/Nefit Moduline Easy", EMS_DEVICE_FLAG_EASY | EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write
+    {203, EMS_DEVICE_TYPE_THERMOSTAT, "Bosch EasyControl CT200", EMS_DEVICE_FLAG_EASY | EMS_DEVICE_FLAG_NO_WRITE},             // 0x18, cannot write
     {157, EMS_DEVICE_TYPE_THERMOSTAT, "Buderus RC200/Bosch CW100/Junkers CW100", EMS_DEVICE_FLAG_NO_WRITE},                    // 0x18, cannot write
 
     // Buderus/Nefit
@@ -245,20 +245,20 @@ static const _EMS_Device EMS_Devices[] = {
     {78, EMS_DEVICE_TYPE_THERMOSTAT, "RC30/Moduline 400", EMS_DEVICE_FLAG_RC30},                                // 0x10
     {86, EMS_DEVICE_TYPE_THERMOSTAT, "RC35", EMS_DEVICE_FLAG_RC35},                                             // 0x10
     {158, EMS_DEVICE_TYPE_THERMOSTAT, "RC300/RC310/Moduline 3000/Bosch CW400", EMS_DEVICE_FLAG_RC300},          // 0x10
-    {165, EMS_DEVICE_TYPE_THERMOSTAT, "RC100/Moduline 1010", EMS_DEVICE_FLAG_RC300 & EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write
+    {165, EMS_DEVICE_TYPE_THERMOSTAT, "RC100/Moduline 1010", EMS_DEVICE_FLAG_RC300 | EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write
 
     // Sieger
     {076, EMS_DEVICE_TYPE_THERMOSTAT, "Sieger ES73", EMS_DEVICE_FLAG_RC35}, // 0x10
 
     // Junkers
-    {105, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW100", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
-    {106, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW200", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
-    {107, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR100", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
-    {108, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR110", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
-    {111, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR10", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE},  // 0x10, cannot write
-    {191, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR120", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
-    {192, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW120", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
-    {147, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR50", EMS_DEVICE_FLAG_JUNKERS & EMS_DEVICE_FLAG_NO_WRITE}   // 0x10, cannot write
+    {105, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW100", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {106, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW200", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {107, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR100", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {108, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR110", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {111, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR10", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE},  // 0x10, cannot write
+    {191, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR120", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {192, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FW120", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE}, // 0x10, cannot write
+    {147, EMS_DEVICE_TYPE_THERMOSTAT, "Junkers FR50", EMS_DEVICE_FLAG_JUNKERS | EMS_DEVICE_FLAG_NO_WRITE}   // 0x10, cannot write
 
 
 };

From 6dbfe5ad308b3c82d5621084a002c723bca2eed1 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 17 Nov 2019 19:24:41 +0100
Subject: [PATCH 085/120] 1.9.4b14

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

diff --git a/src/version.h b/src/version.h
index b522cd61d..cf97be182 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b13"
+#define APP_VERSION "1.9.4b14"

From a8ce0e23e19033b3ad41fca451bbfc2c1ece85c1 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 17 Nov 2019 19:27:19 +0100
Subject: [PATCH 086/120] remove -O2 flag for debug

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

diff --git a/platformio.ini b/platformio.ini
index 1a48ccd02..0a212feed 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -17,7 +17,7 @@ default_envs = release
 custom_flags =
 
 ;general_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -DVTABLES_IN_FLASH
-general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -O2 -DBEARSSL_SSL_BASIC 
+general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -DBEARSSL_SSL_BASIC 
 ;general_flags =
 
 [env]

From ded3a2ce33fcc450211e92dd3e0aada748d2b909 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 17 Nov 2019 19:27:34 +0100
Subject: [PATCH 087/120] small text change

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

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 6b3a9ff96..c903d84f7 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -1454,7 +1454,7 @@ void MyESP::_heartbeatCheck(bool force = false) {
         last_heartbeat = millis();
 
 #ifdef MYESP_DEBUG
-        _printHeap("Heartbeat");
+        _printHeap("HEARTBEAT");
 #endif
         if (!isMQTTConnected() || !(_mqtt_heartbeat)) {
             return;

From 14b21aeeee303d313eb424a2b56f8bc08a268ce4 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 17 Nov 2019 19:28:00 +0100
Subject: [PATCH 088/120] switch current flow for boiler temp for type E4
 (heatpumps)

---
 src/ems.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ems.cpp b/src/ems.cpp
index 748e8898b..0e90faac8 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1323,7 +1323,6 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
  */
 void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.selFlowTemp = _toByte(6);
-    //EMS_Boiler.curFlowTemp = _toShort(1);
     //EMS_Boiler.retTemp     = _toShort(13);
 
     EMS_Boiler.burnGas = _bitRead(11, 0);
@@ -1364,10 +1363,7 @@ void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
         EMS_Boiler.extTemp = _toShort(0);
     }
 
-    // set boiler temp only if we actually have a real value
-    if (_toShort(2) != EMS_VALUE_USHORT_NOTSET) {
-        EMS_Boiler.boilTemp = _toShort(2); // 0x8000 if not available
-    }
+    EMS_Boiler.curFlowTemp = _toShort(2);
 
     EMS_Boiler.pumpMod     = _toByte(9);
     EMS_Boiler.burnStarts  = _toLong(10);

From 4d8bc392a0fdd4bd7f8fd20efaea69e234ad6edf Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 17 Nov 2019 19:28:22 +0100
Subject: [PATCH 089/120] extra check for command "log w"

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

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index e2a5ce6c2..15e1aa59d 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1310,7 +1310,7 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
         } else if (strcmp(second_cmd, "j") == 0) {
             ems_setLogging(EMS_SYS_LOGGING_JABBER);
             ok = true;
-        } else if (strcmp(second_cmd, "w") == 0) {
+        } else if ((strcmp(second_cmd, "w") == 0) && (wc == 3)) {
             ems_setLogging(EMS_SYS_LOGGING_WATCH, _readHexNumber()); // get type_id
             ok = true;
         }

From 9a0780ba775bd6f1d9708046ae588b9c27997956 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Tue, 19 Nov 2019 13:12:11 +0100
Subject: [PATCH 090/120] added RFM200

---
 CHANGELOG.md      |  1 +
 src/ems.cpp       |  6 ++---
 src/ems.h         | 66 ++++++++++++-----------------------------------
 src/ems_devices.h | 64 +++++++++++++++++++++++++++++++++++----------
 src/version.h     |  2 +-
 5 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd8e7a8e3..4556aef40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ There are breaking changes in this release. See `publish_time` below and make su
 - Added WiFi static IP (setting done in WebUI only)
 - `log w <type_id>` for watching a specific telegram type ID
 - initial support for EMS+ GB125s and MC110's (https://github.com/proddy/EMS-ESP/wiki/MC110-controller)
+- Buderus RFM200 receiver
 
 ### Fixed
 
diff --git a/src/ems.cpp b/src/ems.cpp
index 0e90faac8..6a02f90b7 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1323,7 +1323,7 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
  */
 void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.selFlowTemp = _toByte(6);
-    //EMS_Boiler.retTemp     = _toShort(13);
+    // EMS_Boiler.retTemp     = _toShort(13);
 
     EMS_Boiler.burnGas = _bitRead(11, 0);
     EMS_Boiler.wWHeat  = _bitRead(11, 2);
@@ -1339,7 +1339,7 @@ void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.flameCurr = _toShort(19);
 
     // system pressure. FF means missing
-    //EMS_Boiler.sysPress = _toByte(17); // this is *10
+    // EMS_Boiler.sysPress = _toByte(17); // this is *10
 
     // read the service code / installation status as appears on the display
     EMS_Boiler.serviceCodeChar[0] = char(_toByte(4)); // ascii character 1
@@ -1347,7 +1347,7 @@ void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.serviceCodeChar[2] = '\0';             // null terminate string
 
     // read error code
-    //EMS_Boiler.serviceCode = _toShort(20);
+    // EMS_Boiler.serviceCode = _toShort(20);
 
     // at this point do a quick check to see if the hot water or heating is active
     _checkActive();
diff --git a/src/ems.h b/src/ems.h
index 3d5efb07d..9a6218405 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -19,21 +19,6 @@
 
 #define EMS_ID_NONE 0x00 // used as a dest in broadcast messages and empty device IDs
 
-// Fixed EMS IDs
-#define EMS_ID_ME 0x0B          // our device, hardcoded as the "Service Key"
-#define EMS_ID_BOILER 0x08      // all UBA Boilers have 0x08
-#define EMS_ID_SM 0x30          // Solar Module SM10, SM100 and ISM1
-#define EMS_ID_HP 0x38          // HeatPump
-#define EMS_ID_GATEWAY 0x48     // e.g. KM200 Web Gateway
-#define EMS_ID_MIXING1 0x20     // Mixing
-#define EMS_ID_MIXING2 0x21     // Mixing
-#define EMS_ID_SWITCH 0x11      // Switch
-#define EMS_ID_CONTROLLER 0x09  // Controller
-#define EMS_ID_CONNECT 0x02     // Connect
-#define EMS_ID_THERMOSTAT1 0x10 // Thermostat
-#define EMS_ID_THERMOSTAT2 0x17 // Thermostat
-#define EMS_ID_THERMOSTAT3 0x18 // Thermostat
-
 #define EMS_MIN_TELEGRAM_LENGTH 6  // minimal length for a validation telegram, including CRC
 #define EMS_MAX_TELEGRAM_LENGTH 32 // max length of a telegram, including CRC, for Rx and Tx.
 
@@ -50,6 +35,23 @@
 #define EMS_THERMOSTAT_DEFAULTHC 1 // default heating circuit is 1
 #define EMS_THERMOSTAT_WRITE_YES true
 #define EMS_THERMOSTAT_WRITE_NO false
+
+// Device Flags
+
+#define EMS_DEVICE_FLAG_NONE 0   // no flags set
+#define EMS_DEVICE_FLAG_SM10 10  // solar module1
+#define EMS_DEVICE_FLAG_SM100 11 // solar module2
+
+// group flags specific for thermostats
+#define EMS_DEVICE_FLAG_NO_WRITE 0x80 // top bit set if write not supported
+#define EMS_DEVICE_FLAG_EASY 1
+#define EMS_DEVICE_FLAG_RC10 2
+#define EMS_DEVICE_FLAG_RC20 3
+#define EMS_DEVICE_FLAG_RC30 4
+#define EMS_DEVICE_FLAG_RC35 5
+#define EMS_DEVICE_FLAG_RC300 6
+#define EMS_DEVICE_FLAG_JUNKERS 7
+
 typedef enum {
     EMS_THERMOSTAT_MODE_UNKNOWN,
     EMS_THERMOSTAT_MODE_OFF,
@@ -216,26 +218,6 @@ typedef struct {
     char             device_type_string[30];
 } _EMS_Device_Types;
 
-// mapping for EMS_Devices_Type
-const _EMS_Device_Types EMS_Devices_Types[] = {
-
-    {EMS_ID_BOILER, EMS_DEVICE_TYPE_BOILER, "UBAMaster"},
-    {EMS_ID_THERMOSTAT1, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
-    {EMS_ID_THERMOSTAT2, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
-    {EMS_ID_THERMOSTAT3, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
-    {EMS_ID_SM, EMS_DEVICE_TYPE_SOLAR, "Solar Module"},
-    {EMS_ID_HP, EMS_DEVICE_TYPE_HEATPUMP, "Heat Pump"},
-    {EMS_ID_GATEWAY, EMS_DEVICE_TYPE_GATEWAY, "Gateway"},
-    {EMS_ID_ME, EMS_DEVICE_TYPE_SERVICEKEY, "Me"},
-    {EMS_ID_NONE, EMS_DEVICE_TYPE_NONE, "All"},
-    {EMS_ID_MIXING1, EMS_DEVICE_TYPE_MIXING, "Mixing Module"},
-    {EMS_ID_MIXING2, EMS_DEVICE_TYPE_MIXING, "Mixing Module"},
-    {EMS_ID_SWITCH, EMS_DEVICE_TYPE_SWITCH, "Switching Module"},
-    {EMS_ID_CONTROLLER, EMS_DEVICE_TYPE_CONTROLLER, "Controller"},
-    {EMS_ID_CONNECT, EMS_DEVICE_TYPE_CONNECT, "Connect"}
-
-};
-
 // for storing all recognised EMS devices
 typedef struct {
     _EMS_DEVICE_TYPE device_type;   // type (see above)
@@ -246,20 +228,6 @@ typedef struct {
     bool             known;         // is this a known device?
 } _Detected_Device;
 
-#define EMS_DEVICE_FLAG_NONE 0   // no flags set
-#define EMS_DEVICE_FLAG_SM10 10  // solar module1
-#define EMS_DEVICE_FLAG_SM100 11 // solar module2
-
-// group flags specific for thermostats
-#define EMS_DEVICE_FLAG_NO_WRITE 0x80 // top bit set if can't write yet
-#define EMS_DEVICE_FLAG_EASY 1
-#define EMS_DEVICE_FLAG_RC10 2
-#define EMS_DEVICE_FLAG_RC20 3
-#define EMS_DEVICE_FLAG_RC30 4
-#define EMS_DEVICE_FLAG_RC35 5
-#define EMS_DEVICE_FLAG_RC300 6
-#define EMS_DEVICE_FLAG_JUNKERS 7
-
 /*
  * Telegram package defintions
  */
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 8947a671a..07f7e73f8 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -11,6 +11,43 @@
 
 #include "ems.h"
 
+// Fixed EMS Device IDs
+#define EMS_ID_ME 0x0B          // our device, hardcoded as the "Service Key"
+#define EMS_ID_BOILER 0x08      // all UBA Boilers have 0x08
+#define EMS_ID_SM 0x30          // Solar Module SM10, SM100 and ISM1
+#define EMS_ID_HP 0x38          // HeatPump
+#define EMS_ID_GATEWAY 0x48     // Gateway e.g. KM200 Web Gateway
+#define EMS_ID_MIXING1 0x20     // Mixing
+#define EMS_ID_MIXING2 0x21     // Mixing
+#define EMS_ID_SWITCH 0x11      // Switch
+#define EMS_ID_CONTROLLER 0x09  // Controller
+#define EMS_ID_CONNECT1 0x02    // Connect
+#define EMS_ID_CONNECT2 0x50    // Connect
+#define EMS_ID_THERMOSTAT1 0x10 // Thermostat
+#define EMS_ID_THERMOSTAT2 0x17 // Thermostat
+#define EMS_ID_THERMOSTAT3 0x18 // Thermostat
+
+// mapping for EMS_Devices_Type
+const _EMS_Device_Types EMS_Devices_Types[] = {
+
+    {EMS_ID_BOILER, EMS_DEVICE_TYPE_BOILER, "UBAMaster"},
+    {EMS_ID_THERMOSTAT1, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
+    {EMS_ID_THERMOSTAT2, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
+    {EMS_ID_THERMOSTAT3, EMS_DEVICE_TYPE_THERMOSTAT, "Thermostat"},
+    {EMS_ID_SM, EMS_DEVICE_TYPE_SOLAR, "Solar Module"},
+    {EMS_ID_HP, EMS_DEVICE_TYPE_HEATPUMP, "Heat Pump"},
+    {EMS_ID_GATEWAY, EMS_DEVICE_TYPE_GATEWAY, "Gateway"},
+    {EMS_ID_ME, EMS_DEVICE_TYPE_SERVICEKEY, "Me"},
+    {EMS_ID_NONE, EMS_DEVICE_TYPE_NONE, "All"},
+    {EMS_ID_MIXING1, EMS_DEVICE_TYPE_MIXING, "Mixing Module"},
+    {EMS_ID_MIXING2, EMS_DEVICE_TYPE_MIXING, "Mixing Module"},
+    {EMS_ID_SWITCH, EMS_DEVICE_TYPE_SWITCH, "Switching Module"},
+    {EMS_ID_CONTROLLER, EMS_DEVICE_TYPE_CONTROLLER, "Controller"},
+    {EMS_ID_CONNECT1, EMS_DEVICE_TYPE_CONNECT, "Connect"},
+    {EMS_ID_CONNECT2, EMS_DEVICE_TYPE_CONNECT, "Connect"}
+
+};
+
 /*
  * Common Type
  */
@@ -214,19 +251,20 @@ static const _EMS_Device EMS_Devices[] = {
     // Other devices, like 0x11 for Switching, 0x09 for controllers, 0x02 for Connect, 0x48 for Gateway
     //
 
-    {71, EMS_DEVICE_TYPE_SWITCH, "WM10 Switch Module", EMS_DEVICE_FLAG_NONE},            // 0x11
-    {68, EMS_DEVICE_TYPE_CONTROLLER, "BC10/RFM20 Receiver", EMS_DEVICE_FLAG_NONE},       // 0x09
-    {190, EMS_DEVICE_TYPE_CONTROLLER, "BC10 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
-    {114, EMS_DEVICE_TYPE_CONTROLLER, "BC10 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
-    {125, EMS_DEVICE_TYPE_CONTROLLER, "BC25 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
-    {169, EMS_DEVICE_TYPE_CONTROLLER, "BC40 Base Controller", EMS_DEVICE_FLAG_NONE},     // 0x09
-    {152, EMS_DEVICE_TYPE_CONTROLLER, "Controller", EMS_DEVICE_FLAG_NONE},               // 0x09
-    {95, EMS_DEVICE_TYPE_CONTROLLER, "HT3 Controller", EMS_DEVICE_FLAG_NONE},            // 0x09
-    {230, EMS_DEVICE_TYPE_CONTROLLER, "BC Base Controller", EMS_DEVICE_FLAG_NONE},       // 0x09
-    {205, EMS_DEVICE_TYPE_CONNECT, "Nefit Moduline Easy Connect", EMS_DEVICE_FLAG_NONE}, // 0x02
-    {206, EMS_DEVICE_TYPE_CONNECT, "Bosch Easy Connect", EMS_DEVICE_FLAG_NONE},          // 0x02
-    {171, EMS_DEVICE_TYPE_CONNECT, "EMS-OT OpenTherm converter", EMS_DEVICE_FLAG_NONE},  // 0x02
-    {189, EMS_DEVICE_TYPE_GATEWAY, "Web Gateway KM200", EMS_DEVICE_FLAG_NONE},           // 0x48
+    {71, EMS_DEVICE_TYPE_SWITCH, "WM10 Switch Module", EMS_DEVICE_FLAG_NONE},                        // 0x11
+    {68, EMS_DEVICE_TYPE_CONTROLLER, "BC10/RFM20 Receiver", EMS_DEVICE_FLAG_NONE},                   // 0x09
+    {218, EMS_DEVICE_TYPE_CONTROLLER, "Junkers M200/Buderus RFM200 Receiver", EMS_DEVICE_FLAG_NONE}, // 0x50
+    {190, EMS_DEVICE_TYPE_CONTROLLER, "BC10 Base Controller", EMS_DEVICE_FLAG_NONE},                 // 0x09
+    {114, EMS_DEVICE_TYPE_CONTROLLER, "BC10 Base Controller", EMS_DEVICE_FLAG_NONE},                 // 0x09
+    {125, EMS_DEVICE_TYPE_CONTROLLER, "BC25 Base Controller", EMS_DEVICE_FLAG_NONE},                 // 0x09
+    {169, EMS_DEVICE_TYPE_CONTROLLER, "BC40 Base Controller", EMS_DEVICE_FLAG_NONE},                 // 0x09
+    {152, EMS_DEVICE_TYPE_CONTROLLER, "Controller", EMS_DEVICE_FLAG_NONE},                           // 0x09
+    {95, EMS_DEVICE_TYPE_CONTROLLER, "HT3 Controller", EMS_DEVICE_FLAG_NONE},                        // 0x09
+    {230, EMS_DEVICE_TYPE_CONTROLLER, "BC Base Controller", EMS_DEVICE_FLAG_NONE},                   // 0x09
+    {205, EMS_DEVICE_TYPE_CONNECT, "Nefit Moduline Easy Connect", EMS_DEVICE_FLAG_NONE},             // 0x02
+    {206, EMS_DEVICE_TYPE_CONNECT, "Bosch Easy Connect", EMS_DEVICE_FLAG_NONE},                      // 0x02
+    {171, EMS_DEVICE_TYPE_CONNECT, "EMS-OT OpenTherm converter", EMS_DEVICE_FLAG_NONE},              // 0x02
+    {189, EMS_DEVICE_TYPE_GATEWAY, "Web Gateway KM200", EMS_DEVICE_FLAG_NONE},                       // 0x48
 
     //
     // Thermostats, typically device id of 0x10, 0x17 and 0x18
diff --git a/src/version.h b/src/version.h
index cf97be182..c5b16f1ec 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b14"
+#define APP_VERSION "1.9.4b15"

From a04b2ff708991a756fe37ca22bb1f74f79efe98b Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 19 Nov 2019 23:11:26 +0100
Subject: [PATCH 091/120] prep for syslog

---
 CHANGELOG.md                |   1 +
 platformio.ini              |  42 +++--
 src/MyESP.cpp               | 334 ++++--------------------------------
 src/MyESP.h                 |  14 +-
 src/ems-esp.cpp             |   2 +-
 src/ems.cpp                 |  16 +-
 src/websrc/index.html       |   3 -
 src/websrc/myesp.htm        |  36 +---
 src/websrc/myesp.js         | 137 ---------------
 tools/wsemulator/wserver.js |  36 ----
 10 files changed, 75 insertions(+), 546 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4556aef40..47d17bb0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ There are breaking changes in this release. See `publish_time` below and make su
 ### Removed
 
 - thermostat scan and autodetect deep functions
+- removed Event Logging to SPIFFS (worried about wearing). Replaced with SysLog.
 
 ## [1.9.3] 2019-10-26
 
diff --git a/platformio.ini b/platformio.ini
index 0a212feed..c0976bdcf 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,9 +16,25 @@ default_envs = release
 ;custom_flags = -DFORCE_SERIAL -DMYESP_DEBUG
 custom_flags =
 
-;general_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH -DVTABLES_IN_FLASH
-general_flags = -fno-exceptions -lstdc++ -DNO_GLOBAL_EEPROM -DBEARSSL_SSL_BASIC 
-;general_flags =
+#
+# Available lwIP variants (macros):
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH  = v1.4 Higher Bandwidth (default)
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY       = v2 Lower Memory
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH = v2 Higher Bandwidth
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+#    -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_LOW_MEMORY
+# Other flags
+#    -DVTABLES_IN_FLASH
+#    -DNO_GLOBAL_EEPROM
+#    -DBEARSSL_SSL_BASIC 
+general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DBEARSSL_SSL_BASIC -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+
+# From https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld
+#  eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer 
+#  eagle.flash.4m2m.ld = same as above but with 2024 KB SPIFFS
+#  eagle.flash.4m.ld   = same as above but with no SPIFFS storage
+build_flags_4m1m = -Wl,-Teagle.flash.4m1m.ld
+build_flags = ${common.general_flags} ${common.build_flags_4m1m}
 
 [env]
 framework = arduino
@@ -26,13 +42,13 @@ platform = espressif8266
 lib_deps =
   https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
-  ;https://github.com/me-no-dev/ESPAsyncWebServer
-  https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
+  https://github.com/me-no-dev/ESPAsyncWebServer
+  ;https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
   https://github.com/bakercp/CRC32
   JustWifi@2.0.2
   AsyncMqttClient@0.8.2
   EEPROM_Rotate@0.9.2
-  ArduinoJson@6.12.0
+  ArduinoJson@6.13.0
   ESPAsyncUDP
   ESPAsyncTCP@1.2.2
 upload_speed = 921600
@@ -51,27 +67,27 @@ upload_port = ems-esp.local
 # Do not modify
 [env:travis]
 board = esp12e
-build_flags = ${common.general_flags}
+build_flags = ${common.build_flags}
 extra_scripts = scripts/main_script.py
 
 [env:esp12e]
 board = esp12e
-build_flags = ${common.general_flags}
+build_flags = ${common.build_flags}
 extra_scripts = scripts/main_script.py
 
 [env:d1_mini]
 board = d1_mini
-build_flags = ${common.general_flags}
+build_flags = ${common.build_flags}
 extra_scripts = scripts/main_script.py
 
 [env:nodemcuv2]
 board = nodemcuv2
-build_flags = ${common.general_flags}
+build_flags = ${common.build_flags}
 extra_scripts = scripts/main_script.py
 
 [env:nodemcu]
 board = nodemcu
-build_flags = ${common.general_flags}
+build_flags = ${common.build_flags}
 extra_scripts = scripts/main_script.py
 
 #
@@ -80,7 +96,7 @@ extra_scripts = scripts/main_script.py
 [env:debug]
 board = d1_mini
 build_type = debug
-build_flags = ${common.general_flags} ${common.custom_flags}
+build_flags = ${common.build_flags} ${common.custom_flags}
 extra_scripts = 
   pre:scripts/pre_script.py
   scripts/main_script.py
@@ -88,7 +104,7 @@ extra_scripts =
 [env:release]
 board = d1_mini
 build_type = release
-build_flags = ${common.general_flags} ${common.custom_flags}
+build_flags = ${common.build_flags} ${common.custom_flags}
 extra_scripts = 
   pre:scripts/pre_script.py
   scripts/main_script.py
\ No newline at end of file
diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index c903d84f7..de6294244 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -380,7 +380,9 @@ bool MyESP::mqttSubscribe(const char * topic) {
         char * topic_s = _mqttTopic(topic);
 
         uint16_t packet_id = mqttClient.subscribe(topic_s, _mqtt_qos);
-        // myDebug_P(PSTR("[MQTT] Subscribing to %s"), topic_s);
+#ifdef MYESP_DEBUG
+        myDebug_P(PSTR("[MQTT] Subscribing to %s"), topic_s);
+#endif
 
         if (packet_id) {
             // add to mqtt log
@@ -497,7 +499,6 @@ void MyESP::_mqtt_setup() {
 
     // last will
     if (_hasValue(_mqtt_will_topic)) {
-        //myDebug_P(PSTR("[MQTT] Setting last will topic %s"), _mqttTopic(_mqtt_will_topic));
         mqttClient.setWill(_mqttTopic(_mqtt_will_topic), 1, true,
                            _mqtt_will_offline_payload); // retain always true
     }
@@ -650,7 +651,9 @@ void MyESP::_telnetConnected() {
 }
 
 void MyESP::_telnetDisconnected() {
-    // myDebug_P(PSTR("[TELNET] Telnet connection closed"));
+#ifdef MYESP_DEBUG
+    myDebug_P(PSTR("[TELNET] Telnet connection closed"));
+#endif
     if (_telnet_callback_f) {
         (_telnet_callback_f)(TELNET_EVENT_DISCONNECT); // call callback
     }
@@ -1144,7 +1147,6 @@ void MyESP::_setSystemBootStatus(uint8_t status) {
     data.value             = Rtcmem->sys;
     data.parts.boot_status = status;
     Rtcmem->sys            = data.value;
-    // myDebug("*** setting boot status to %d", data.parts.boot_status);
 }
 
 uint8_t MyESP::_getSystemStabilityCounter() {
@@ -1677,104 +1679,6 @@ size_t MyESP::_fs_validateConfigFile(const char * filename, size_t maxsize, Json
     return size;
 }
 
-// validates the event log file in SPIFFS
-// returns true if all OK
-size_t MyESP::_fs_validateLogFile(const char * filename) {
-    // exit if we have disabled logging
-    if (!_general_log_events) {
-        return 0;
-    }
-
-    // see if we can open it
-    File eventlog = SPIFFS.open(filename, "r");
-    if (!eventlog) {
-        myDebug_P(PSTR("[FS] File %s not found"), filename);
-        return 0;
-    }
-
-    // check sizes
-    size_t size    = eventlog.size();
-    size_t maxsize = ESP.getFreeHeap() - 2000; // reserve some buffer
-#ifdef MYESP_DEBUG
-    myDebug_P(PSTR("[FS] Checking file %s (%d/%d bytes)"), filename, size, maxsize);
-#endif
-    if (size > maxsize) {
-        eventlog.close();
-        myDebug_P(PSTR("[FS] File %s size %d is too large"), filename, size);
-        return 0;
-    } else if (size == 0) {
-        eventlog.close();
-        myDebug_P(PSTR("[FS] Corrupted file %s"), filename);
-        return 0;
-    }
-
-    /*
-    // check integrity by reading file from SPIFFS into the char array
-    char * buffer = new char[size + 2]; // reserve some memory to read in the file
-    size_t real_size = file.readBytes(buffer, size);
-    if (real_size != size) {
-        file.close();
-        myDebug_P(PSTR("[FS] Error, file %s sizes don't match (%d/%d), looks corrupted"), filename, real_size, size);
-        delete[] buffer;
-        return false;
-    }
-    file.close();
-    delete[] buffer;
-    */
-
-    /*
-    File configFile = SPIFFS.open(filename, "r");
-    myDebug_P(PSTR("[FS] File: "));
-    while (configFile.available()) {
-        SerialAndTelnet.print((char)configFile.read());
-    }
-    myDebug_P(PSTR("[FS] end")); // newline
-    configFile.close();
-    */
-
-    // parse it to check JSON validity
-    // its slow but the only reliable way to check integrity of the file
-    uint16_t                                   char_count = 0;
-    bool                                       abort      = false;
-    char                                       char_buffer[MYESP_JSON_LOG_MAXSIZE];
-    StaticJsonDocument<MYESP_JSON_LOG_MAXSIZE> doc;
-
-    // eventlog.seek(0);
-    while (eventlog.available() && !abort) {
-        char c = eventlog.read(); // read a char
-
-        // see if we have reached the end of the string
-        if (c == '\0' || c == '\n') {
-            char_buffer[char_count] = '\0'; // terminate and add it to the list
-#ifdef MYESP_DEBUG
-            Serial.printf("Got line: %s\n", char_buffer);
-#endif
-            // validate it by looking at JSON structure
-            DeserializationError error = deserializeJson(doc, char_buffer);
-            if (error) {
-                myDebug_P(PSTR("[FS] Event log has a corrupted entry (error %s)"), error.c_str());
-                abort = true;
-            }
-            char_count = 0; // start new record
-        } else {
-            // add the char to the buffer if recording, checking for overrun
-            if (char_count < MYESP_JSON_LOG_MAXSIZE) {
-                char_buffer[char_count++] = c;
-            } else {
-                abort = true; // reached limit of our line buffer
-            }
-        }
-    }
-
-    eventlog.close();
-
-    if (abort) {
-        return 0;
-    }
-
-    return size;
-}
-
 // format File System
 void MyESP::_fs_eraseConfig() {
     myDebug_P(PSTR("[FS] Performing a factory reset..."));
@@ -1795,12 +1699,6 @@ void MyESP::setSettings(fs_loadsave_callback_f loadsave, fs_setlist_callback_f s
 // load system config from SPIFFS
 // returns false on error or the file needs to be recreated
 bool MyESP::_fs_loadConfig() {
-    // see if old file exists and delete it
-    if (SPIFFS.exists("/config.json")) {
-        SPIFFS.remove("/config.json");
-        myDebug_P(PSTR("[FS] Removed old config version"));
-    }
-
     StaticJsonDocument<MYESP_SPIFFS_MAXSIZE_CONFIG> doc;
 
     // set to true to print out contents of file
@@ -1973,20 +1871,9 @@ bool MyESP::fs_saveCustomConfig(JsonObject root) {
         configFile.close();
 
         if (n) {
-            /*
-        // reload the settings, not sure why?
-        if (_fs_loadsave_callback_f) {
-            if (!(_fs_loadsave_callback_f)(MYESP_FSACTION_LOAD, root)) {
-                myDebug_P(PSTR("[FS] Error parsing custom config json"));
-            }
-        }
-        */
-
             if (_general_log_events) {
-                _writeEvent("INFO", "system", "Custom config stored in the SPIFFS", "");
+                _writeLogEvent("INFO", "system", "Custom config stored in the SPIFFS", "");
             }
-
-            // myDebug_P(PSTR("[FS] custom config saved"));
             ok = true;
         }
     }
@@ -2020,9 +1907,8 @@ bool MyESP::fs_saveConfig(JsonObject root) {
 
         if (n) {
             if (_general_log_events) {
-                _writeEvent("INFO", "system", "System config stored in the SPIFFS", "");
+                _writeLogEvent("INFO", "system", "System config stored in the SPIFFS", "");
             }
-            // myDebug_P(PSTR("[FS] system config saved"));
             ok = true;
         }
 
@@ -2122,30 +2008,16 @@ void MyESP::_fs_setup() {
         }
     }
 
-    /*
-    // fill event log with tests
-    SPIFFS.remove(MYESP_EVENTLOG_FILE);
-    File fs = SPIFFS.open(MYESP_EVENTLOG_FILE, "w");
-    fs.close();
-    char logs[100];
-    for (uint8_t i = 1; i < 143; i++) {
-        sprintf(logs, "Record #%d", i);
-        _writeEvent("WARN", "system", "test data", logs);
+    // see if old files exists from previous versions and delete it
+    if (SPIFFS.exists(MYESP_OLD_CONFIG_FILE)) {
+        SPIFFS.remove(MYESP_OLD_CONFIG_FILE);
+        myDebug_P(PSTR("[FS] Removed old config settings"));
     }
-    */
 
-    // validate the event log. Sometimes it can can corrupted.
-    size_t size = _fs_validateLogFile(MYESP_EVENTLOG_FILE);
-    if (size) {
-        myDebug_P(PSTR("[FS] Event log loaded (%d bytes)"), size);
-    } else {
-#ifndef MYESP_DEBUG
-        myDebug_P(PSTR("[FS] Resetting event log"));
-        SPIFFS.remove(MYESP_EVENTLOG_FILE);
-        if (_general_log_events) {
-            _writeEvent("WARN", "system", "Event Log", "Log was erased due to probable file corruption");
-        }
-#endif
+    // see if old file exists and delete it
+    if (SPIFFS.exists(MYESP_OLD_CONFIG_FILE)) {
+        SPIFFS.remove(MYESP_OLD_CONFIG_FILE);
+        myDebug_P(PSTR("[FS] Removed old config settings"));
     }
 
     // load the main system config file if we can. Otherwise create it and expect user to configure in web interface
@@ -2380,127 +2252,13 @@ void MyESP::crashInfo() {
 }
 #endif
 
-// write a log entry to SPIFFS
+// write a log entry to SysLog via UDP
 // assumes we have "log_events" on
-void MyESP::_writeEvent(const char * type, const char * src, const char * desc, const char * data) {
-    // this will also create the file if its doesn't exist
-    File eventlog = SPIFFS.open(MYESP_EVENTLOG_FILE, "a");
-    if (!eventlog) {
+void MyESP::_writeLogEvent(const char * type, const char * src, const char * desc, const char * data) {
+    // TODO: finish function
 #ifdef MYESP_DEBUG
-        Serial.println("[SYSTEM] Error opening event log for writing");
+    Serial.printf("%s: %s\n", type, desc);
 #endif
-        eventlog.close();
-        return;
-    }
-
-    StaticJsonDocument<MYESP_JSON_LOG_MAXSIZE> root;
-    root["type"] = type;
-    root["src"]  = src;
-    root["desc"] = desc;
-    root["data"] = data;
-    root["time"] = now(); // is relative if we're not using NTP
-
-    // Serialize JSON to file
-    (void)serializeJson(root, eventlog);
-
-    eventlog.print("\n"); // this indicates end of the entry
-
-    eventlog.close();
-}
-
-// send a paged list (10 items) to the ws
-void MyESP::_sendEventLog(uint8_t page) {
-    if (_ota_pre_callback_f) {
-        (_ota_pre_callback_f)(); // call custom function
-    }
-
-    File eventlog;
-    // if its missing create it, it'll be empty though
-    if (!SPIFFS.exists(MYESP_EVENTLOG_FILE)) {
-        myDebug_P(PSTR("[FS] Event log is missing. Creating it."));
-        eventlog = SPIFFS.open(MYESP_EVENTLOG_FILE, "w");
-        eventlog.close();
-    }
-
-    eventlog = SPIFFS.open(MYESP_EVENTLOG_FILE, "r");
-
-    // the size of the json will be quite big so best not to use stack (StaticJsonDocument)
-    // it only covers 10 log entries
-    DynamicJsonDocument doc(MYESP_JSON_MAXSIZE);
-    JsonObject          root = doc.to<JsonObject>();
-    root["command"]          = "eventlist";
-    root["page"]             = page;
-
-    JsonArray list = doc.createNestedArray("list");
-
-    size_t static lastPos;
-    // if first page, reset the file pointer
-    if (page == 1) {
-        lastPos = 0;
-    }
-
-    eventlog.seek(lastPos); // move to position in file
-
-    uint8_t char_count = 0;
-    uint8_t line_count = 0;
-    bool    abort      = false;
-    char    char_buffer[MYESP_JSON_LOG_MAXSIZE];
-    float   pages;
-
-    // start at top and read until we find the page we want (sets of 10)
-    while (eventlog.available() && !abort) {
-        char c = eventlog.read();
-
-        // see if we have reached the end of the string
-        if (c == '\0' || c == '\n') {
-            char_buffer[char_count] = '\0'; // terminate and add it to the list
-#ifdef MYESP_DEBUG
-            Serial.printf("Got line %d: %s\n", line_count + 1, char_buffer);
-#endif
-            list.add(char_buffer);
-            // increment line counter and check if we've reached 10 records, if so abort
-            if (++line_count == 10) {
-                abort = true;
-            }
-            char_count = 0; // start new record
-        } else {
-            // add the char to the buffer if recording, checking for overrun
-            if (char_count < MYESP_JSON_LOG_MAXSIZE) {
-                char_buffer[char_count++] = c;
-            } else {
-                abort = true; // reached limit of our line buffer
-            }
-        }
-    }
-
-    lastPos = eventlog.position(); // remember last position for next cycle
-
-    // calculate remaining pages, as needed for footable
-    if (eventlog.available()) {
-        float totalPagesRoughly = eventlog.size() / (float)(lastPos / page);
-        pages                   = totalPagesRoughly < page ? page + 1 : totalPagesRoughly;
-    } else {
-        pages = page; // this was the last page
-    }
-
-    eventlog.close(); // close SPIFFS
-
-    root["haspages"] = ceil(pages);
-
-    char   buffer[MYESP_JSON_MAXSIZE];
-    size_t len = serializeJson(root, buffer);
-
-#ifdef MYESP_DEBUG
-    Serial.printf("\nEVENTLOG: page %d, length=%d\n", page, len);
-    serializeJson(root, Serial);
-#endif
-
-    _ws->textAll(buffer, len);
-    _ws->textAll("{\"command\":\"result\",\"resultof\":\"eventlist\",\"result\": true}");
-
-    if (_ota_post_callback_f) {
-        (_ota_post_callback_f)(); // call custom function
-    }
 }
 
 // Handles WebSocket Events
@@ -2556,7 +2314,7 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
 
     const char * command = doc["command"];
 #ifdef MYESP_DEBUG
-    Serial.printf("*** Got command: %s\n", command);
+    myDebug("*** Got command: %s\n", command);
 #endif
 
     // Check whatever the command is and act accordingly
@@ -2574,19 +2332,10 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
         _formatreq = true;
     } else if (strcmp(command, "forcentp") == 0) {
         NTP.getNtpTime();
-    } else if (strcmp(command, "geteventlog") == 0) {
-        uint8_t page = doc["page"];
-        _sendEventLog(page);
-    } else if (strcmp(command, "clearevent") == 0) {
-        _emptyEventLog();
     } else if (strcmp(command, "scan") == 0) {
         WiFi.scanNetworksAsync(std::bind(&MyESP::_printScanResult, this, std::placeholders::_1), true);
     } else if (strcmp(command, "gettime") == 0) {
         _timerequest = true;
-    } else if (strcmp(command, "settime") == 0) {
-        time_t t = doc["epoch"];
-        setTime(t);
-        _timerequest = true;
     } else if (strcmp(command, "getconf") == 0) {
         _fs_sendConfig();
     }
@@ -2595,22 +2344,6 @@ void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
     client->_tempObject = NULL;
 }
 
-// delete the event log
-void MyESP::_emptyEventLog() {
-    if (_ota_pre_callback_f) {
-        (_ota_pre_callback_f)(); // call custom function
-    }
-    if (SPIFFS.remove(MYESP_EVENTLOG_FILE)) {
-        _writeEvent("WARN", "system", "Event log cleared", "");
-        myDebug_P(PSTR("[WEB] Event log cleared"));
-    } else {
-        myDebug_P(PSTR("[WEB] Could not clear event log"));
-    }
-    if (_ota_post_callback_f) {
-        (_ota_post_callback_f)(); // call custom function
-    }
-}
-
 // read both system config and the custom config and send as json to web socket
 bool MyESP::_fs_sendConfig() {
     File   configFile;
@@ -2632,7 +2365,7 @@ bool MyESP::_fs_sendConfig() {
     configFile.close();
 
 #ifdef MYESP_DEBUG
-    Serial.printf("_fs_sendConfig() sending system (%d): %s\n", size, json);
+    myDebug("_fs_sendConfig() sending system (%d): %s\n", size, json);
 #endif
 
     _ws->textAll(json, size);
@@ -2653,7 +2386,7 @@ bool MyESP::_fs_sendConfig() {
     configFile.close();
 
 #ifdef MYESP_DEBUG
-    Serial.printf("_fs_sendConfig() sending custom (%d): %s\n", size, json);
+    myDebug("_fs_sendConfig() sending custom (%d): %s\n", size, json);
 #endif
 
     _ws->textAll(json, size);
@@ -2684,7 +2417,7 @@ void MyESP::_sendCustomStatus() {
     size_t len = serializeJson(root, buffer);
 
 #ifdef MYESP_DEBUG
-    Serial.printf("_sendCustomStatus() sending: %s\n", buffer);
+    myDebug("_sendCustomStatus() sending: %s\n", buffer);
 #endif
 
     _ws->textAll(buffer, len);
@@ -2836,13 +2569,10 @@ void MyESP::_webserver_setup() {
                        }
                        if (!index) {
                            ETS_UART_INTR_DISABLE(); // disable all UART interrupts to be safe
-                           _writeEvent("INFO", "system", "Firmware update started", "");
-#ifdef MYESP_DEBUG
-                           Serial.printf("[SYSTEM] Firmware update started: %s\n", filename.c_str());
-#endif
+                           _writeLogEvent("INFO", "system", "Firmware update started", "");
                            Update.runAsync(true);
                            if (!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)) {
-                               _writeEvent("ERRO", "system", "Not enough space to update", "");
+                               _writeLogEvent("ERRO", "system", "Not enough space to update", "");
 #ifdef MYESP_DEBUG
                                Update.printError(Serial);
 #endif
@@ -2850,7 +2580,7 @@ void MyESP::_webserver_setup() {
                        }
                        if (!Update.hasError()) {
                            if (Update.write(data, len) != len) {
-                               _writeEvent("ERRO", "system", "Writing to flash failed", "");
+                               _writeLogEvent("ERRO", "system", "Writing to flash failed", "");
 #ifdef MYESP_DEBUG
                                Update.printError(Serial);
 #endif
@@ -2858,10 +2588,10 @@ void MyESP::_webserver_setup() {
                        }
                        if (final) {
                            if (Update.end(true)) {
-                               _writeEvent("INFO", "system", "Firmware update finished", "");
+                               _writeLogEvent("INFO", "system", "Firmware update finished", "");
                                _shouldRestart = !Update.hasError();
                            } else {
-                               _writeEvent("ERRO", "system", "Firmware update failed", "");
+                               _writeLogEvent("ERRO", "system", "Firmware update failed", "");
 #ifdef MYESP_DEBUG
                                Update.printError(Serial);
 #endif
@@ -3036,7 +2766,7 @@ void MyESP::_bootupSequence() {
         if ((_ntp_enabled) && (now() > 10000) && !_have_ntp_time) {
             _have_ntp_time = true;
             if (_general_log_events) {
-                _writeEvent("INFO", "system", "System booted", "");
+                _writeLogEvent("INFO", "system", "System booted", "");
             }
         }
         return;
@@ -3068,7 +2798,7 @@ void MyESP::_bootupSequence() {
         // write a log message if we're not using NTP, otherwise wait for the internet time to arrive
         if (!_ntp_enabled) {
             if (_general_log_events) {
-                _writeEvent("INFO", "system", "System booted", "");
+                _writeLogEvent("INFO", "system", "System booted", "");
             }
         }
     }
@@ -3151,7 +2881,7 @@ void MyESP::loop() {
 
     if (_shouldRestart) {
         if (_general_log_events) {
-            _writeEvent("INFO", "system", "System is restarting", "");
+            _writeLogEvent("INFO", "system", "System is restarting", "");
         }
         myDebug("[SYSTEM] Restarting...");
         _deferredReset(500, CUSTOM_RESET_TERMINAL);
diff --git a/src/MyESP.h b/src/MyESP.h
index c014b4c7f..f875b9d29 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.19"
+#define MYESP_VERSION "1.2.20"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -53,7 +53,8 @@ extern struct rst_info resetInfo;
 
 #define MYESP_CONFIG_FILE "/myesp.json"
 #define MYESP_CUSTOMCONFIG_FILE "/customconfig.json"
-#define MYESP_EVENTLOG_FILE "/eventlog.json"
+#define MYESP_EVENTLOG_FILE "/eventlog.json" // depreciated
+#define MYESP_OLD_CONFIG_FILE "/config.json" // depreciated
 
 #define MYESP_HTTP_USERNAME "admin" // HTTP username
 #define MYESP_HTTP_PASSWORD "admin" // default password
@@ -67,7 +68,6 @@ extern struct rst_info resetInfo;
 #define MYESP_WIFI_RECONNECT_INTERVAL 600000 // If could not connect to WIFI, retry after this time in ms. 10 minutes
 
 // set to value >0 if the ESP is overheating or there are timing issues. Recommend a value of 1.
-// initially set to 0 for no delay. Change to 1 if getting WDT resets from wifi
 #define MYESP_DELAY 1
 
 // MQTT
@@ -266,8 +266,8 @@ class MyESP {
     MyESP();
     ~MyESP();
 
-    // write event called from within lambda classs
-    static void _writeEvent(const char * type, const char * src, const char * desc, const char * data);
+    // write event called from within lambda class
+    static void _writeLogEvent(const char * type, const char * src, const char * desc, const char * data);
 
     // wifi
     void setWIFICallback(void (*callback)());
@@ -475,10 +475,6 @@ class MyESP {
     web_callback_f _web_callback_f;
     const char *   _http_username;
 
-    // log
-    void _sendEventLog(uint8_t page);
-    void _emptyEventLog();
-
     // web
     void _onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t * data, size_t len);
     void _procMsg(AsyncWebSocketClient * client, size_t sz);
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 15e1aa59d..50a61b1ac 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1702,7 +1702,7 @@ void WebCallback(JsonObject root) {
             }
         } else {
             emsbus["ok"]  = false;
-            emsbus["msg"] = "EMS Bus is not connected. Check event logs for errors.";
+            emsbus["msg"] = "EMS Bus is not connected.";
         }
     }
 
diff --git a/src/ems.cpp b/src/ems.cpp
index 6a02f90b7..302e27aeb 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1323,7 +1323,6 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
  */
 void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.selFlowTemp = _toByte(6);
-    // EMS_Boiler.retTemp     = _toShort(13);
 
     EMS_Boiler.burnGas = _bitRead(11, 0);
     EMS_Boiler.wWHeat  = _bitRead(11, 2);
@@ -1331,23 +1330,21 @@ void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
     EMS_Boiler.curBurnPow = _toByte(10);
     EMS_Boiler.selBurnPow = _toByte(9); // burn power max setting
 
-    // set boiler temp only if we actually have a real value
     if (_toShort(7) != EMS_VALUE_USHORT_NOTSET) {
-        EMS_Boiler.boilTemp = _toShort(7); // 0x8000 if not available
+        EMS_Boiler.curFlowTemp = _toShort(7); // 0x8000 if not available
     }
 
     EMS_Boiler.flameCurr = _toShort(19);
 
-    // system pressure. FF means missing
-    // EMS_Boiler.sysPress = _toByte(17); // this is *10
-
     // read the service code / installation status as appears on the display
     EMS_Boiler.serviceCodeChar[0] = char(_toByte(4)); // ascii character 1
     EMS_Boiler.serviceCodeChar[1] = char(_toByte(5)); // ascii character 2
     EMS_Boiler.serviceCodeChar[2] = '\0';             // null terminate string
 
-    // read error code
-    // EMS_Boiler.serviceCode = _toShort(20);
+    // still to figure out:
+    //  EMS_Boiler.serviceCode
+    //  EMS_Boiler.retTemp
+    //  EMS_Boiler.sysPress
 
     // at this point do a quick check to see if the hot water or heating is active
     _checkActive();
@@ -1363,8 +1360,7 @@ void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
         EMS_Boiler.extTemp = _toShort(0);
     }
 
-    EMS_Boiler.curFlowTemp = _toShort(2);
-
+    EMS_Boiler.boilTemp    = _toShort(2); // 0x8000 if not available
     EMS_Boiler.pumpMod     = _toByte(9);
     EMS_Boiler.burnStarts  = _toLong(10);
     EMS_Boiler.burnWorkMin = _toLong(13);
diff --git a/src/websrc/index.html b/src/websrc/index.html
index 0bd7ac770..913e8d81c 100644
--- a/src/websrc/index.html
+++ b/src/websrc/index.html
@@ -52,9 +52,6 @@
                         </li>
                     </ul>
                 </li>
-                <li>
-                    <a href="#" id="eventlog"><i class="glyphicon glyphicon-transfer"></i>Event Log</a>
-                </li>
                 <li>
                     <a href="#" id="backup"><i class="glyphicon glyphicon-floppy-disk"></i>Backup & Restore</a>
                 </li>
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index 33617f7f0..b23e0c091 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -119,7 +119,7 @@
     <div class="row form-group">
         <label class="col-xs-3">Event Logging<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="Enabling logging of all events to the device's storage"></i></label>
+                data-content="Enabling logging of all events to a remote SysLog"></i></label>
         <div class="col-xs-9">
             <form>
                 <label class="radio-inline">
@@ -142,32 +142,6 @@
 <br>
 </div>
 
-<div id="eventcontent">
-    <div class="text-center" id="loading-img">
-        <h5>Loading Logs. Please wait...<span id="loadpages"></span></h5>
-        <br>
-    </div>
-    <div>
-        <br>
-        <legend>Event Log</legend>
-        <h6 class="text-muted">Dates shown in () represent elapsed time in seconds when NTP Time is disabled</h6>
-        <div id="logevents" class="label label-danger">Event Logging has been disabled. See Settings->General Settings.
-        </div>
-        <br>
-        <div class="panel panel-default">
-            <div>
-                <table id="eventtable" class="table" data-paging="true" data-filtering="true" data-sorting="true"
-                    data-editing="false" data-state="true"></table>
-            </div>
-        </div>
-        <button onclick="clearevent()" class="btn btn-primary btn-sm">Clear Log</button>
-        <div style="clear:both;">
-            <br>
-            <br>
-        </div>
-    </div>
-</div>
-
 <div id="mqttcontent">
     <br>
     <legend>MQTT Settings</legend>
@@ -386,14 +360,6 @@
         </div>
     </div>
 
-    <div class="row form-group">
-        <label class="col-xs-3">Browser Time</label>
-        <span id="rtc" class="col-xs-9 col-md-5"></span>
-        <div class="col-xs-3">
-            <button onclick="syncBrowserTime()" class="btn btn-info btn-sm">Sync Browser Time to Device</button>
-        </div>
-    </div>
-
     <div class="row form-group">
         <label class="col-xs-3">NTP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index 2fddb5394..f1a92ed5c 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -28,30 +28,12 @@ var nextIsNotJson = false;
 
 var config = {};
 
-function browserTime() {
-    var d = new Date(0); // The 0 there is the key, which sets the date to the epoch
-    var c = new Date();
-    var timestamp = Math.floor((c.getTime() / 1000) + ((c.getTimezoneOffset() * 60) * -1));
-    d.setUTCSeconds(timestamp);
-    document.getElementById("rtc").innerHTML = d.toUTCString().slice(0, -3);
-}
-
 function deviceTime() {
     var t = new Date(0); // The 0 there is the key, which sets the date to the epoch
     t.setUTCSeconds(ntpSeconds);
     document.getElementById("utc").innerHTML = t.toUTCString().slice(0, -3);
 }
 
-function syncBrowserTime() {
-    var d = new Date();
-    var timestamp = Math.floor((d.getTime() / 1000));
-    var datatosend = {};
-    datatosend.command = "settime";
-    datatosend.epoch = timestamp;
-    websock.send(JSON.stringify(datatosend));
-    $("#ntp").click();
-}
-
 function handleNTPON() {
     document.getElementById("forcentp").style.display = "block";
 }
@@ -360,10 +342,6 @@ function scanWifi() {
     }
 }
 
-function getEvents() {
-    websock.send("{\"command\":\"geteventlog\", \"page\":" + page + "}");
-}
-
 function isVisible(e) {
     return !!(e.offsetWidth || e.offsetHeight || e.getClientRects().length);
 }
@@ -382,10 +360,6 @@ function getnextpage(mode) {
     }
 }
 
-function builddata(obj) {
-    data = data.concat(obj.list);
-}
-
 function colorStatusbar(ref) {
     var percentage = ref.style.width.slice(0, -1);
     if (percentage > 50) { ref.className = "progress-bar progress-bar-success"; } else if (percentage > 25) { ref.className = "progress-bar progress-bar-warning"; } else { ref.class = "progress-bar progress-bar-danger"; }
@@ -588,87 +562,6 @@ function twoDigits(value) {
     return value;
 }
 
-function initEventTable() {
-    var newlist = [];
-    for (var i = 0; i < data.length; i++) {
-        newlist[i] = {};
-        newlist[i].options = {};
-        newlist[i].value = {};
-        try {
-            var dup = JSON.parse(data[i]);
-            dup.uid = i + 1;
-        } catch (e) {
-            var dup = { "uid": i + 1, "type": "ERRO", "src": "SYS", "desc": "Error in log file", "data": data[i], "time": 1 }
-        }
-        newlist[i].value = dup;
-
-        var c = dup.type;
-        switch (c) {
-            case "WARN":
-                newlist[i].options.classes = "warning";
-                break;
-            case "INFO":
-                newlist[i].options.classes = "info";
-                break;
-            case "ERRO":
-                newlist[i].options.classes = "danger";
-                break;
-            default:
-                break;
-        }
-    }
-    jQuery(function ($) {
-        window.FooTable.init("#eventtable", {
-            columns: [{
-                "name": "uid",
-                "title": "ID",
-                "type": "text",
-                "sorted": true,
-                "direction": "DESC"
-            },
-            {
-                "name": "type",
-                "title": "Event Type",
-                "type": "text"
-            },
-            {
-                "name": "src",
-                "title": "Source"
-            },
-            {
-                "name": "desc",
-                "title": "Description"
-            },
-            {
-                "name": "data",
-                "title": "Additional Data",
-                "breakpoints": "xs sm"
-            },
-            {
-                "name": "time",
-                "title": "Date/Time",
-                "parser": function (value) {
-                    if (value < 1563300000) {
-                        return "(" + value + ")";
-                    } else {
-                        var vuepoch = new Date(value * 1000);
-                        var formatted = vuepoch.getUTCFullYear() +
-                            "-" + twoDigits(vuepoch.getUTCMonth() + 1) +
-                            "-" + twoDigits(vuepoch.getUTCDate()) +
-                            " " + twoDigits(vuepoch.getUTCHours()) +
-                            ":" + twoDigits(vuepoch.getUTCMinutes()) +
-                            ":" + twoDigits(vuepoch.getUTCSeconds());
-                        return formatted;
-                    }
-                },
-                "breakpoints": "xs sm"
-            }
-            ],
-            rows: newlist
-        });
-    });
-}
-
 function initMQTTLogTable() {
     var newlist = [];
     for (var i = 0; i < ajaxobj.mqttlog.length; i++) {
@@ -732,15 +625,6 @@ function socketMessageListener(evt) {
                 ajaxobj = obj;
                 getContent("#custom_statuscontent");
                 break;
-            case "eventlist":
-                haspages = obj.haspages;
-                if (haspages === 0) {
-                    document.getElementById("loading-img").style.display = "none";
-                    initEventTable();
-                    break;
-                }
-                builddata(obj);
-                break;
             case "gettime":
                 ntpSeconds = obj.epoch;
                 deviceTime();
@@ -758,26 +642,6 @@ function socketMessageListener(evt) {
                 break;
         }
     }
-
-    if (obj.hasOwnProperty("resultof")) {
-        switch (obj.resultof) {
-            case "eventlist":
-                if (page < haspages && obj.result === true) {
-                    getnextpage("geteventlog");
-                } else if (page === haspages) {
-                    initEventTable();
-                    document.getElementById("loading-img").style.display = "none";
-                }
-                break;
-            default:
-                break;
-        }
-    }
-}
-
-function clearevent() {
-    websock.send("{\"command\":\"clearevent\"}");
-    $("#eventlog").click();
 }
 
 function compareDestroy() {
@@ -990,7 +854,6 @@ $("#ntp").click(function () { getContent("#ntpcontent"); return false; });
 $("#backup").click(function () { getContent("#backupcontent"); return false; });
 $("#reset").click(function () { $("#destroy").modal("show"); return false; });
 $("#restart").click(function () { $("#reboot").modal("show"); return false; });
-$("#eventlog").click(function () { getContent("#eventcontent"); return false; });
 $(".noimp").on("click", function () { $("#noimp").modal("show"); });
 $("#update").on("shown.bs.modal", function (e) { getLatestReleaseInfo(); });
 
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index 968ab9d3c..c2f27bada 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -47,18 +47,6 @@ var networks = {
     ]
 }
 
-var eventlog = {
-    "command": "eventlist",
-    "page": 1,
-    "haspages": 1,
-    "list": [
-        "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #1\",\"time\": 1563371160}",
-        "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #2\",\"time\":0}",
-        "{\"type\":\"INFO\",\"src\":\"system\",\"desc\":\"System booted Local Time is 13:02:54 CET\",\"data\":\"\",\"time\":1572613374}",
-        "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #3\",\"time\":0}"
-    ]
-}
-
 var configfile = {
     "command": "configfile",
     "network": {
@@ -113,16 +101,6 @@ var custom_configfile = {
     }
 };
 
-function sendEventLog() {
-    wss.broadcast(eventlog);
-    var res = {
-        "command": "result",
-        "resultof": "eventlist",
-        "result": true
-    };
-    wss.broadcast(res);
-}
-
 function sendStatus() {
     var stats = {
         "command": "status",
@@ -252,24 +230,10 @@ wss.on('connection', function connection(ws) {
                 res.epoch = 1572613374; // this is 13:02:54 CET
                 wss.broadcast(res);
                 break;
-            case "settime":
-                console.log("[INFO] Setting time (fake)");
-                var res = {};
-                res.command = "gettime";
-                res.epoch = Math.floor((new Date).getTime() / 1000);
-                wss.broadcast(res);
-                break;
             case "getconf":
                 console.log("[INFO] Sending system configuration file (if set any)");
                 wss.broadcast(configfile);
                 break;
-            case "geteventlog":
-                console.log("[INFO] Sending eventlog");
-                sendEventLog();
-                break;
-            case "clearevent":
-                console.log("[INFO] Clearing eventlog");
-                break;
             case "restart":
                 console.log("[INFO] Restart");
                 break;

From bcf251452e2c75d460b2a962289d0f44985949c9 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 19 Nov 2019 23:55:57 +0100
Subject: [PATCH 092/120] updated circuit

---
 doc/schematics/Schematic_EMS-ESP-supercap.png | Bin 77294 -> 0 bytes
 doc/schematics/Schematic_EMS-ESP.png          | Bin 0 -> 75648 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 doc/schematics/Schematic_EMS-ESP-supercap.png
 create mode 100644 doc/schematics/Schematic_EMS-ESP.png

diff --git a/doc/schematics/Schematic_EMS-ESP-supercap.png b/doc/schematics/Schematic_EMS-ESP-supercap.png
deleted file mode 100644
index 561a5f46252f72e22979872dd4b294d1568d7e7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77294
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
WnnNF#7VLb1K!o`v_=<S6zW!frAEDp?

diff --git a/doc/schematics/Schematic_EMS-ESP.png b/doc/schematics/Schematic_EMS-ESP.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f08f387bbd781d86cb43aa61bc374707f6fa89
GIT binary patch
literal 75648
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%0AFq!r?a(fZ1~`8D#A-gqB_>}z
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
RJW-y0vFFl4*#cT0{~rr`r1t;-

literal 0
HcmV?d00001


From e26aaf3d1a11eb5093d46157b328f22043dfa97a Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 20 Nov 2019 21:26:43 +0100
Subject: [PATCH 093/120] syslog and removed footable

---
 platformio.ini                                |   1 +
 src/MyESP.cpp                                 | 102 +++++++++-----
 src/MyESP.h                                   |  31 +++--
 src/custom.htm                                |   1 +
 src/ems.cpp                                   |   2 +-
 src/version.h                                 |   2 +-
 .../css/footable.bootstrap-3.1.6.min.css      |   1 -
 src/websrc/3rdparty/js/footable-3.1.6.min.js  |  10 --
 src/websrc/index.html                         |   2 +-
 src/websrc/myesp.htm                          |  65 ++++-----
 src/websrc/myesp.js                           | 125 ++++++------------
 tools/webfilesbuilder/gulpfile.js             |   4 +-
 tools/wsemulator/wserver.js                   |   3 +-
 13 files changed, 176 insertions(+), 173 deletions(-)
 delete mode 100644 src/websrc/3rdparty/css/footable.bootstrap-3.1.6.min.css
 delete mode 100644 src/websrc/3rdparty/js/footable-3.1.6.min.js

diff --git a/platformio.ini b/platformio.ini
index c0976bdcf..f4d018ec4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -51,6 +51,7 @@ lib_deps =
   ArduinoJson@6.13.0
   ESPAsyncUDP
   ESPAsyncTCP@1.2.2
+  https://github.com/nomis/mcu-uuid-syslog.git
 upload_speed = 921600
 monitor_speed = 115200
 
diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index de6294244..7907ad10e 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -46,7 +46,8 @@ MyESP::MyESP() {
     _ota_post_callback_f = nullptr;
     _load_average        = 100;  // calculated load average
     _general_serial      = true; // serial is set to on as default
-    _general_log_events  = true; // all logs are written to an event log in SPIFFS
+    _general_log_events  = true; // all logs are sent to syslog
+    _general_log_ip      = nullptr;
     _have_ntp_time       = false;
 
     // telnet
@@ -830,6 +831,11 @@ void MyESP::_printSetCommands() {
     myDebug_P(PSTR("  ntp_timezone=%d"), _ntp_timezone);
 
     myDebug_P(PSTR("  log_events=%s"), (_general_log_events) ? "on" : "off");
+    if (_hasValue(_general_log_ip)) {
+        myDebug_P(PSTR("  log_ip=%s"), _general_log_ip);
+    } else {
+        myDebug_P(PSTR("  log_ip="));
+    }
 
     // print any custom settings
     if (_fs_setlist_callback_f) {
@@ -924,6 +930,8 @@ bool MyESP::_changeSetting(uint8_t wc, const char * setting, const char * value)
         save_config = fs_setSettingValue(&_ntp_timezone, value, NTP_TIMEZONE_DEFAULT);
     } else if (strcmp(setting, "log_events") == 0) {
         save_config = fs_setSettingValue(&_general_log_events, value, false);
+    } else if (strcmp(setting, "log_ip") == 0) {
+        save_config = fs_setSettingValue(&_general_log_ip, value, "");
     } else {
         // finally check for any custom commands
         if (_fs_setlist_callback_f) {
@@ -1722,6 +1730,7 @@ bool MyESP::_fs_loadConfig() {
     _ws->setAuthentication("admin", _general_password);
     _general_hostname   = strdup(general["hostname"]);
     _general_log_events = general["log_events"];
+    _general_log_ip     = strdup(general["log_ip"] | "");
 
     // serial is only on when booting
 #ifdef FORCE_SERIAL
@@ -1871,9 +1880,7 @@ bool MyESP::fs_saveCustomConfig(JsonObject root) {
         configFile.close();
 
         if (n) {
-            if (_general_log_events) {
-                _writeLogEvent("INFO", "system", "Custom config stored in the SPIFFS", "");
-            }
+            _writeLogEvent(MYESP_SYSLOG_INFO, "Custom config stored in the SPIFFS");
             ok = true;
         }
     }
@@ -1906,9 +1913,7 @@ bool MyESP::fs_saveConfig(JsonObject root) {
         configFile.close();
 
         if (n) {
-            if (_general_log_events) {
-                _writeLogEvent("INFO", "system", "System config stored in the SPIFFS", "");
-            }
+            _writeLogEvent(MYESP_SYSLOG_INFO, "System config stored in the SPIFFS");
             ok = true;
         }
 
@@ -1945,6 +1950,7 @@ bool MyESP::_fs_writeConfig() {
     general["serial"]     = _general_serial;
     general["hostname"]   = _general_hostname;
     general["log_events"] = _general_log_events;
+    general["log_ip"]     = _general_log_ip;
     general["version"]    = _app_version;
 
     JsonObject mqtt   = doc.createNestedObject("mqtt");
@@ -2013,22 +2019,20 @@ void MyESP::_fs_setup() {
         SPIFFS.remove(MYESP_OLD_CONFIG_FILE);
         myDebug_P(PSTR("[FS] Removed old config settings"));
     }
-
-    // see if old file exists and delete it
-    if (SPIFFS.exists(MYESP_OLD_CONFIG_FILE)) {
-        SPIFFS.remove(MYESP_OLD_CONFIG_FILE);
-        myDebug_P(PSTR("[FS] Removed old config settings"));
+    if (SPIFFS.exists(MYESP_OLD_EVENTLOG_FILE)) {
+        SPIFFS.remove(MYESP_OLD_EVENTLOG_FILE);
+        myDebug_P(PSTR("[FS] Removed old event log"));
     }
 
     // load the main system config file if we can. Otherwise create it and expect user to configure in web interface
     if (!_fs_loadConfig()) {
         myDebug_P(PSTR("[FS] Creating a new system config"));
-        _fs_writeConfig(); // create the initial config file
+        _fs_writeConfig();
     }
 
     // load system and custom config
     if (!_fs_loadCustomConfig()) {
-        _fs_createCustomConfig(); // create the initial config file
+        _fs_createCustomConfig();
     }
 
     if (_ota_post_callback_f) {
@@ -2253,11 +2257,23 @@ void MyESP::crashInfo() {
 #endif
 
 // write a log entry to SysLog via UDP
-// assumes we have "log_events" on
-void MyESP::_writeLogEvent(const char * type, const char * src, const char * desc, const char * data) {
-    // TODO: finish function
+void MyESP::_writeLogEvent(const uint8_t type, const char * msg) {
+    if (!_general_log_events) {
+        return;
+    }
+
+    static uuid::log::Logger logger{F("eventlog")};
+
+    // uuid::log::INFO
+    // uuid::log::ERROR
+    if (type == MYESP_SYSLOG_INFO) {
+        logger.info(msg);
+    } else if (type == MYESP_SYSLOG_ERROR) {
+        logger.err(msg);
+    }
+
 #ifdef MYESP_DEBUG
-    Serial.printf("%s: %s\n", type, desc);
+    Serial.printf("%d: %s\n", type, msg);
 #endif
 }
 
@@ -2569,10 +2585,10 @@ void MyESP::_webserver_setup() {
                        }
                        if (!index) {
                            ETS_UART_INTR_DISABLE(); // disable all UART interrupts to be safe
-                           _writeLogEvent("INFO", "system", "Firmware update started", "");
+                           //_writeLogEvent(MYESP_SYSLOG_INFO, "Firmware update started");
                            Update.runAsync(true);
                            if (!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)) {
-                               _writeLogEvent("ERRO", "system", "Not enough space to update", "");
+                //_writeLogEvent(MYESP_SYSLOG_ERROR, "Not enough space to update");
 #ifdef MYESP_DEBUG
                                Update.printError(Serial);
 #endif
@@ -2580,7 +2596,7 @@ void MyESP::_webserver_setup() {
                        }
                        if (!Update.hasError()) {
                            if (Update.write(data, len) != len) {
-                               _writeLogEvent("ERRO", "system", "Writing to flash failed", "");
+                //_writeLogEvent(MYESP_SYSLOG_ERROR, "Writing to flash failed");
 #ifdef MYESP_DEBUG
                                Update.printError(Serial);
 #endif
@@ -2588,10 +2604,10 @@ void MyESP::_webserver_setup() {
                        }
                        if (final) {
                            if (Update.end(true)) {
-                               _writeLogEvent("INFO", "system", "Firmware update finished", "");
+                               //_writeLogEvent(MYESP_SYSLOG_INFO, "Firmware update finished");
                                _shouldRestart = !Update.hasError();
                            } else {
-                               _writeLogEvent("ERRO", "system", "Firmware update failed", "");
+                //_writeLogEvent(MYESP_SYSLOG_ERROR, "Firmware update failed");
 #ifdef MYESP_DEBUG
                                Update.printError(Serial);
 #endif
@@ -2765,9 +2781,7 @@ void MyESP::_bootupSequence() {
     if (boot_status == MYESP_BOOTSTATUS_BOOTED) {
         if ((_ntp_enabled) && (now() > 10000) && !_have_ntp_time) {
             _have_ntp_time = true;
-            if (_general_log_events) {
-                _writeLogEvent("INFO", "system", "System booted", "");
-            }
+            _writeLogEvent(MYESP_SYSLOG_INFO, "System booted");
         }
         return;
     }
@@ -2797,13 +2811,32 @@ void MyESP::_bootupSequence() {
 
         // write a log message if we're not using NTP, otherwise wait for the internet time to arrive
         if (!_ntp_enabled) {
-            if (_general_log_events) {
-                _writeLogEvent("INFO", "system", "System booted", "");
-            }
+            _writeLogEvent(MYESP_SYSLOG_INFO, "System booted");
         }
     }
 }
 
+// set up SysLog
+void MyESP::_syslog_setup() {
+    // if not enabled or IP is empty, don't bother
+    if ( (!_hasValue(_general_log_ip)) || (!_general_log_events) ) {
+        return;
+    }
+
+    static uuid::log::Logger logger{F("setup")};
+
+    syslog.start();
+    syslog.hostname(_general_hostname);
+    syslog.log_level(uuid::log::DEBUG); // default log level
+    syslog.mark_interval(3600);
+
+    IPAddress syslog_ip;
+    syslog.destination(syslog_ip.fromString(_general_log_ip));
+
+    myDebug_P(PSTR("[SYSLOG] System event logging enabled"));
+
+}
+
 // setup MyESP
 void MyESP::begin(const char * app_hostname, const char * app_name, const char * app_version, const char * app_url, const char * app_url_api) {
     _general_hostname = strdup(app_hostname);
@@ -2815,7 +2848,6 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
     strlcpy(s, app_url_api, sizeof(s));
     strlcat(s, "/releases/latest", sizeof(s)); // append "/releases/latest"
     _app_updateurl = strdup(s);
-
     strlcpy(s, app_url_api, sizeof(s));
     strlcat(s, "/releases/tags/travis-dev-build", sizeof(s)); // append "/releases/tags/travis-dev-build"
     _app_updateurl_dev = strdup(s);
@@ -2825,6 +2857,8 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
     // print a welcome message
     myDebug_P(PSTR("\n\n* %s version %s"), _app_name, _app_version);
 
+    _syslog_setup(); // SysLog
+
     // set up onboard LED
     pinMode(LED_BUILTIN, OUTPUT);
     digitalWrite(LED_BUILTIN, HIGH);
@@ -2865,6 +2899,10 @@ void MyESP::loop() {
 
     _mqttConnect(); // MQTT
 
+    // SysLog
+    uuid::loop();
+    syslog.loop();
+
     if (_timerequest) {
         _timerequest = false;
         _sendTime();
@@ -2880,9 +2918,7 @@ void MyESP::loop() {
     }
 
     if (_shouldRestart) {
-        if (_general_log_events) {
-            _writeLogEvent("INFO", "system", "System is restarting", "");
-        }
+        _writeLogEvent(MYESP_SYSLOG_INFO, "System is restarting");
         myDebug("[SYSTEM] Restarting...");
         _deferredReset(500, CUSTOM_RESET_TERMINAL);
         ESP.restart();
diff --git a/src/MyESP.h b/src/MyESP.h
index f875b9d29..d6a72ba4a 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.20"
+#define MYESP_VERSION "1.2.21"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -18,6 +18,14 @@
 #include <FS.h>
 #include <JustWifi.h>
 
+// SysLog
+#include <uuid/common.h>
+#include <uuid/log.h>
+#include <uuid/syslog.h>
+static uuid::syslog::SyslogService syslog;
+enum MYESP_SYSLOG_LEVEL : uint8_t { MYESP_SYSLOG_INFO, MYESP_SYSLOG_ERROR };
+
+// local libraries
 #include "Ntp.h"
 #include "TelnetSpy.h" // modified from https://github.com/yasheena/telnetspy
 
@@ -53,8 +61,8 @@ extern struct rst_info resetInfo;
 
 #define MYESP_CONFIG_FILE "/myesp.json"
 #define MYESP_CUSTOMCONFIG_FILE "/customconfig.json"
-#define MYESP_EVENTLOG_FILE "/eventlog.json" // depreciated
-#define MYESP_OLD_CONFIG_FILE "/config.json" // depreciated
+#define MYESP_OLD_EVENTLOG_FILE "/eventlog.json" // depreciated
+#define MYESP_OLD_CONFIG_FILE "/config.json"     // depreciated
 
 #define MYESP_HTTP_USERNAME "admin" // HTTP username
 #define MYESP_HTTP_PASSWORD "admin" // default password
@@ -145,10 +153,9 @@ PROGMEM const char * const custom_reset_string[]   = {custom_reset_hardware, cus
 #define CUSTOM_RESET_FACTORY 5  // Factory reset
 #define CUSTOM_RESET_MAX 5
 
-// SPIFFS
+// SPIFFS - max allocation is 1000 KB
 // https://arduinojson.org/v6/assistant/
-#define MYESP_SPIFFS_MAXSIZE_CONFIG 800     // max size for a config file
-#define MYESP_SPIFFS_MAXSIZE_EVENTLOG 20000 // max size for the eventlog in bytes
+#define MYESP_SPIFFS_MAXSIZE_CONFIG 999 // max size for a config file
 
 // CRASH
 /**
@@ -266,9 +273,6 @@ class MyESP {
     MyESP();
     ~MyESP();
 
-    // write event called from within lambda class
-    static void _writeLogEvent(const char * type, const char * src, const char * desc, const char * data);
-
     // wifi
     void setWIFICallback(void (*callback)());
     void setWIFI(wifi_callback_f callback);
@@ -293,6 +297,9 @@ class MyESP {
     bool getUseSerial();
     void setUseSerial(bool toggle);
 
+    // syslog
+    void _writeLogEvent(const uint8_t type, const char * msg);
+
     // FS
     void setSettings(fs_loadsave_callback_f loadsave, fs_setlist_callback_f setlist, bool useSerial = true);
     bool fs_saveConfig(JsonObject root);
@@ -383,7 +390,7 @@ class MyESP {
     // crash
     void _eeprom_setup();
 
-    // telnet & debug
+    // telnet
     TelnetSpy                SerialAndTelnet;
     void                     _telnetConnected();
     void                     _telnetDisconnected();
@@ -397,6 +404,9 @@ class MyESP {
     telnet_callback_f        _telnet_callback_f;        // callback for connect/disconnect
     bool                     _changeSetting(uint8_t wc, const char * setting, const char * value);
 
+    // syslog
+    void _syslog_setup();
+
     // fs and settings
     void   _fs_setup();
     bool   _fs_loadConfig();
@@ -423,6 +433,7 @@ class MyESP {
     bool          _suspendOutput;
     bool          _general_serial;
     bool          _general_log_events;
+    char *        _general_log_ip;
     char *        _buildTime;
     bool          _timerequest;
     bool          _formatreq;
diff --git a/src/custom.htm b/src/custom.htm
index 5bef5d84f..ad1e4d745 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -259,4 +259,5 @@
     <div class="row form-group" style="text-align: center;">
         <button onclick="refreshCustomStatus()" class="btn btn-info">Refresh</button>
     </div>
+    <br>
 </div>
\ No newline at end of file
diff --git a/src/ems.cpp b/src/ems.cpp
index 302e27aeb..afc1db953 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -427,7 +427,7 @@ _EMS_SYS_LOGGING ems_getLogging() {
 }
 
 void ems_setLogging(_EMS_SYS_LOGGING loglevel, uint16_t type_id) {
-    if (loglevel <= EMS_SYS_LOGGING_WATCH) {
+    if (loglevel <= EMS_SYS_LOGGING_JABBER) {
         EMS_Sys_Status.emsLogging = loglevel;
 
         if (loglevel == EMS_SYS_LOGGING_NONE) {
diff --git a/src/version.h b/src/version.h
index c5b16f1ec..408a4ffa2 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b15"
+#define APP_VERSION "1.9.4b16"
diff --git a/src/websrc/3rdparty/css/footable.bootstrap-3.1.6.min.css b/src/websrc/3rdparty/css/footable.bootstrap-3.1.6.min.css
deleted file mode 100644
index 87841b27a..000000000
--- a/src/websrc/3rdparty/css/footable.bootstrap-3.1.6.min.css
+++ /dev/null
@@ -1 +0,0 @@
-table.footable-details,table.footable>thead>tr.footable-filtering>th div.form-group{margin-bottom:0}table.footable,table.footable-details{position:relative;width:100%;border-spacing:0;border-collapse:collapse}table.footable-hide-fouc{display:none}table>tbody>tr>td>span.footable-toggle{margin-right:8px;opacity:.3}table>tbody>tr>td>span.footable-toggle.last-column{margin-left:8px;float:right}table.table-condensed>tbody>tr>td>span.footable-toggle{margin-right:5px}table.footable-details>tbody>tr>th:nth-child(1){min-width:40px;width:120px}table.footable-details>tbody>tr>td:nth-child(2){word-break:break-all}table.footable-details>tbody>tr:first-child>td,table.footable-details>tbody>tr:first-child>th,table.footable-details>tfoot>tr:first-child>td,table.footable-details>tfoot>tr:first-child>th,table.footable-details>thead>tr:first-child>td,table.footable-details>thead>tr:first-child>th{border-top-width:0}table.footable-details.table-bordered>tbody>tr:first-child>td,table.footable-details.table-bordered>tbody>tr:first-child>th,table.footable-details.table-bordered>tfoot>tr:first-child>td,table.footable-details.table-bordered>tfoot>tr:first-child>th,table.footable-details.table-bordered>thead>tr:first-child>td,table.footable-details.table-bordered>thead>tr:first-child>th{border-top-width:1px}div.footable-loader{vertical-align:middle;text-align:center;height:300px;position:relative}div.footable-loader>span.fooicon{display:inline-block;opacity:.3;font-size:30px;line-height:32px;width:32px;height:32px;margin-top:-16px;margin-left:-16px;position:absolute;top:50%;left:50%;-webkit-animation:fooicon-spin-r 2s infinite linear;animation:fooicon-spin-r 2s infinite linear}table.footable>tbody>tr.footable-empty>td{vertical-align:middle;text-align:center;font-size:30px}table.footable>tbody>tr>td,table.footable>tbody>tr>th{display:none}table.footable>tbody>tr.footable-detail-row>td,table.footable>tbody>tr.footable-detail-row>th,table.footable>tbody>tr.footable-empty>td,table.footable>tbody>tr.footable-empty>th{display:table-cell}@-webkit-keyframes fooicon-spin-r{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fooicon-spin-r{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fooicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings'!important;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fooicon:after,.fooicon:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fooicon-loader:before{content:"\e030"}.fooicon-plus:before{content:"\2b"}.fooicon-minus:before{content:"\2212"}.fooicon-search:before{content:"\e003"}.fooicon-remove:before{content:"\e014"}.fooicon-sort:before{content:"\e150"}.fooicon-sort-asc:before{content:"\e155"}.fooicon-sort-desc:before{content:"\e156"}.fooicon-pencil:before{content:"\270f"}.fooicon-trash:before{content:"\e020"}.fooicon-eye-close:before{content:"\e106"}.fooicon-flash:before{content:"\e162"}.fooicon-cog:before{content:"\e019"}.fooicon-stats:before{content:"\e185"}table.footable>thead>tr.footable-filtering>th{border-bottom-width:1px;font-weight:400}.footable-filtering-external.footable-filtering-right,table.footable.footable-filtering-right>thead>tr.footable-filtering>th,table.footable>thead>tr.footable-filtering>th{text-align:right}.footable-filtering-external.footable-filtering-left,table.footable.footable-filtering-left>thead>tr.footable-filtering>th{text-align:left}.footable-filtering-external.footable-filtering-center,.footable-paging-external.footable-paging-center,table.footable-paging-center>tfoot>tr.footable-paging>td,table.footable.footable-filtering-center>thead>tr.footable-filtering>th,table.footable>tfoot>tr.footable-paging>td{text-align:center}table.footable>thead>tr.footable-filtering>th div.form-group+div.form-group{margin-top:5px}table.footable>thead>tr.footable-filtering>th div.input-group{width:100%}.footable-filtering-external ul.dropdown-menu>li>a.checkbox,table.footable>thead>tr.footable-filtering>th ul.dropdown-menu>li>a.checkbox{margin:0;display:block;position:relative}.footable-filtering-external ul.dropdown-menu>li>a.checkbox>label,table.footable>thead>tr.footable-filtering>th ul.dropdown-menu>li>a.checkbox>label{display:block;padding-left:20px}.footable-filtering-external ul.dropdown-menu>li>a.checkbox input[type=checkbox],table.footable>thead>tr.footable-filtering>th ul.dropdown-menu>li>a.checkbox input[type=checkbox]{position:absolute;margin-left:-20px}@media (min-width:768px){table.footable>thead>tr.footable-filtering>th div.input-group{width:auto}table.footable>thead>tr.footable-filtering>th div.form-group{margin-left:2px;margin-right:2px}table.footable>thead>tr.footable-filtering>th div.form-group+div.form-group{margin-top:0}}table.footable>tbody>tr>td.footable-sortable,table.footable>tbody>tr>th.footable-sortable,table.footable>tfoot>tr>td.footable-sortable,table.footable>tfoot>tr>th.footable-sortable,table.footable>thead>tr>td.footable-sortable,table.footable>thead>tr>th.footable-sortable{position:relative;padding-right:30px;cursor:pointer}td.footable-sortable>span.fooicon,th.footable-sortable>span.fooicon{position:absolute;right:6px;top:50%;margin-top:-7px;opacity:0;transition:opacity .3s ease-in}td.footable-sortable.footable-asc>span.fooicon,td.footable-sortable.footable-desc>span.fooicon,td.footable-sortable:hover>span.fooicon,th.footable-sortable.footable-asc>span.fooicon,th.footable-sortable.footable-desc>span.fooicon,th.footable-sortable:hover>span.fooicon{opacity:1}table.footable-sorting-disabled td.footable-sortable.footable-asc>span.fooicon,table.footable-sorting-disabled td.footable-sortable.footable-desc>span.fooicon,table.footable-sorting-disabled td.footable-sortable:hover>span.fooicon,table.footable-sorting-disabled th.footable-sortable.footable-asc>span.fooicon,table.footable-sorting-disabled th.footable-sortable.footable-desc>span.fooicon,table.footable-sorting-disabled th.footable-sortable:hover>span.fooicon{opacity:0;visibility:hidden}.footable-paging-external ul.pagination,table.footable>tfoot>tr.footable-paging>td>ul.pagination{margin:10px 0 0}.footable-paging-external span.label,table.footable>tfoot>tr.footable-paging>td>span.label{display:inline-block;margin:0 0 10px;padding:4px 10px}.footable-paging-external.footable-paging-left,table.footable-paging-left>tfoot>tr.footable-paging>td{text-align:left}.footable-paging-external.footable-paging-right,table.footable-editing-right td.footable-editing,table.footable-editing-right tr.footable-editing,table.footable-paging-right>tfoot>tr.footable-paging>td{text-align:right}ul.pagination>li.footable-page{display:none}ul.pagination>li.footable-page.visible{display:inline}td.footable-editing{width:90px;max-width:90px}table.footable-editing-no-delete td.footable-editing,table.footable-editing-no-edit td.footable-editing,table.footable-editing-no-view td.footable-editing{width:70px;max-width:70px}table.footable-editing-no-delete.footable-editing-no-view td.footable-editing,table.footable-editing-no-edit.footable-editing-no-delete td.footable-editing,table.footable-editing-no-edit.footable-editing-no-view td.footable-editing{width:50px;max-width:50px}table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view td.footable-editing,table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view th.footable-editing{width:0;max-width:0;display:none!important}table.footable-editing-left td.footable-editing,table.footable-editing-left tr.footable-editing{text-align:left}table.footable-editing button.footable-add,table.footable-editing button.footable-hide,table.footable-editing-show button.footable-show,table.footable-editing.footable-editing-always-show button.footable-hide,table.footable-editing.footable-editing-always-show button.footable-show,table.footable-editing.footable-editing-always-show.footable-editing-no-add tr.footable-editing{display:none}table.footable-editing.footable-editing-always-show button.footable-add,table.footable-editing.footable-editing-show button.footable-add,table.footable-editing.footable-editing-show button.footable-hide{display:inline-block}
\ No newline at end of file
diff --git a/src/websrc/3rdparty/js/footable-3.1.6.min.js b/src/websrc/3rdparty/js/footable-3.1.6.min.js
deleted file mode 100644
index 53398d182..000000000
--- a/src/websrc/3rdparty/js/footable-3.1.6.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.1.6
-* @link http://fooplugins.com
-* @copyright Steven Usher & Brad Vincent 2015
-* @license Released under the GPLv3 license.
-*/
-!function(a,b){window.console=window.console||{log:function(){},error:function(){}},a.fn.footable=function(a,c){return a=a||{},this.filter("table").each(function(d,e){b.init(e,a,c)})};var c={events:[]};b.__debug__=JSON.parse(localStorage.getItem("footable_debug"))||!1,b.__debug_options__=JSON.parse(localStorage.getItem("footable_debug_options"))||c,b.debug=function(d,e){return b.is["boolean"](d)?(b.__debug__=d,void(b.__debug__?(localStorage.setItem("footable_debug",JSON.stringify(b.__debug__)),b.__debug_options__=a.extend(!0,{},c,e||{}),b.is.hash(e)&&localStorage.setItem("footable_debug_options",JSON.stringify(b.__debug_options__))):(localStorage.removeItem("footable_debug"),localStorage.removeItem("footable_debug_options")))):b.__debug__},b.get=function(b){return a(b).first().data("__FooTable__")},b.init=function(a,c,d){var e=b.get(a);return e instanceof b.Table&&e.destroy(),new b.Table(a,c,d)},b.getRow=function(b){var c=a(b).closest("tr");return c.hasClass("footable-detail-row")&&(c=c.prev()),c.data("__FooTableRow__")}}(jQuery,FooTable=window.FooTable||{}),function(a){var b=function(){return!0};a.arr={},a.arr.each=function(b,c){if(a.is.array(b)&&a.is.fn(c))for(var d=0,e=b.length;e>d&&c(b[d],d)!==!1;d++);},a.arr.get=function(b,c){var d=[];if(!a.is.array(b))return d;if(!a.is.fn(c))return b;for(var e=0,f=b.length;f>e;e++)c(b[e],e)&&d.push(b[e]);return d},a.arr.any=function(c,d){if(!a.is.array(c))return!1;d=a.is.fn(d)?d:b;for(var e=0,f=c.length;f>e;e++)if(d(c[e],e))return!0;return!1},a.arr.contains=function(b,c){if(!a.is.array(b)||a.is.undef(c))return!1;for(var d=0,e=b.length;e>d;d++)if(b[d]==c)return!0;return!1},a.arr.first=function(c,d){if(!a.is.array(c))return null;d=a.is.fn(d)?d:b;for(var e=0,f=c.length;f>e;e++)if(d(c[e],e))return c[e];return null},a.arr.map=function(b,c){var d=[],e=null;if(!a.is.array(b)||!a.is.fn(c))return d;for(var f=0,g=b.length;g>f;f++)null!=(e=c(b[f],f))&&d.push(e);return d},a.arr.remove=function(b,c){var d=[],e=[];if(!a.is.array(b)||!a.is.fn(c))return e;for(var f=0,g=b.length;g>f;f++)c(b[f],f,e)&&(d.push(f),e.push(b[f]));for(d.sort(function(a,b){return b-a}),f=0,g=d.length;g>f;f++){var h=d[f]-f;b.splice(h,1)}return e},a.arr["delete"]=function(b,c){var d=-1,e=null;if(!a.is.array(b)||a.is.undef(c))return e;for(var f=0,g=b.length;g>f;f++)if(b[f]==c){d=f,e=b[f];break}return-1!=d&&b.splice(d,1),e},a.arr.replace=function(a,b,c){var d=a.indexOf(b);-1!==d&&(a[d]=c)}}(FooTable),function(a){a.is={},a.is.type=function(a,b){return typeof a===b},a.is.defined=function(a){return"undefined"!=typeof a},a.is.undef=function(a){return"undefined"==typeof a},a.is.array=function(a){return"[object Array]"===Object.prototype.toString.call(a)},a.is.date=function(a){return"[object Date]"===Object.prototype.toString.call(a)&&!isNaN(a.getTime())},a.is["boolean"]=function(a){return"[object Boolean]"===Object.prototype.toString.call(a)},a.is.string=function(a){return"[object String]"===Object.prototype.toString.call(a)},a.is.number=function(a){return"[object Number]"===Object.prototype.toString.call(a)&&!isNaN(a)},a.is.fn=function(b){return a.is.defined(window)&&b===window.alert||"[object Function]"===Object.prototype.toString.call(b)},a.is.error=function(a){return"[object Error]"===Object.prototype.toString.call(a)},a.is.object=function(a){return"[object Object]"===Object.prototype.toString.call(a)},a.is.hash=function(b){return a.is.object(b)&&b.constructor===Object&&!b.nodeType&&!b.setInterval},a.is.element=function(a){return"object"==typeof HTMLElement?a instanceof HTMLElement:a&&"object"==typeof a&&null!==a&&1===a.nodeType&&"string"==typeof a.nodeName},a.is.promise=function(b){return a.is.object(b)&&a.is.fn(b.then)&&a.is.fn(b.promise)},a.is.jq=function(b){return a.is.defined(window.jQuery)&&b instanceof jQuery&&b.length>0},a.is.moment=function(b){return a.is.defined(window.moment)&&a.is.object(b)&&a.is["boolean"](b._isAMomentObject)},a.is.emptyObject=function(b){if(!a.is.hash(b))return!1;for(var c in b)if(b.hasOwnProperty(c))return!1;return!0},a.is.emptyArray=function(b){return a.is.array(b)?0===b.length:!0},a.is.emptyString=function(b){return a.is.string(b)?0===b.length:!0}}(FooTable),function(a){a.str={},a.str.contains=function(b,c,d){return a.is.emptyString(b)||a.is.emptyString(c)?!1:c.length<=b.length&&-1!==(d?b.toUpperCase().indexOf(c.toUpperCase()):b.indexOf(c))},a.str.containsExact=function(b,c,d){return a.is.emptyString(b)||a.is.emptyString(c)||c.length>b.length?!1:new RegExp("\\b"+a.str.escapeRegExp(c)+"\\b",d?"i":"").test(b)},a.str.containsWord=function(b,c,d){if(a.is.emptyString(b)||a.is.emptyString(c)||b.length<c.length)return!1;for(var e=b.split(/\W/),f=0,g=e.length;g>f;f++)if(d?e[f].toUpperCase()==c.toUpperCase():e[f]==c)return!0;return!1},a.str.from=function(b,c){return a.is.emptyString(b)?b:a.str.contains(b,c)?b.substring(b.indexOf(c)+1):b},a.str.startsWith=function(b,c){return a.is.emptyString(b)?b==c:b.slice(0,c.length)==c},a.str.toCamelCase=function(b){return a.is.emptyString(b)?b:b.toUpperCase()===b?b.toLowerCase():b.replace(/^([A-Z])|[-\s_](\w)/g,function(b,c,d){return a.is.string(d)?d.toUpperCase():c.toLowerCase()})},a.str.random=function(b){return b=a.is.emptyString(b)?"":b,b+Math.random().toString(36).substr(2,9)},a.str.escapeRegExp=function(b){return a.is.emptyString(b)?b:b.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}}(FooTable),function(a){"use strict";function b(){}Object.create||(Object.create=function(){var b=function(){};return function(c){if(arguments.length>1)throw Error("Second argument not supported");if(!a.is.object(c))throw TypeError("Argument must be an object");b.prototype=c;var d=new b;return b.prototype=null,d}}());var c=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;b.__extend__=function(b,d,e,f){b[d]=a.is.fn(f)&&c.test(e)?function(a,b){return function(){var a,c;return a=this._super,this._super=f,c=b.apply(this,arguments),this._super=a,c}}(d,e):e},b.extend=function(d,e){function f(b,d,e,f){b[d]=a.is.fn(f)&&c.test(e)?function(a,b,c){return function(){var a,d;return a=this._super,this._super=c,d=b.apply(this,arguments),this._super=a,d}}(d,e,f):e}var g=Array.prototype.slice.call(arguments);if(d=g.shift(),e=g.shift(),a.is.hash(d)){var h=Object.create(this.prototype),i=this.prototype;for(var j in d)"__ctor__"!==j&&f(h,j,d[j],i[j]);var k=a.is.fn(h.__ctor__)?h.__ctor__:function(){if(!a.is.fn(this.construct))throw new SyntaxError('FooTable class objects must be constructed with the "new" keyword.');this.construct.apply(this,arguments)};return h.construct=a.is.fn(h.construct)?h.construct:function(){},k.prototype=h,h.constructor=k,k.extend=b.extend,k}a.is.string(d)&&a.is.fn(e)&&f(this.prototype,d,e,this.prototype[d])},a.Class=b,a.ClassFactory=a.Class.extend({construct:function(){this.registered={}},contains:function(b){return a.is.defined(this.registered[b])},names:function(){var a,b=[];for(a in this.registered)this.registered.hasOwnProperty(a)&&b.push(a);return b},register:function(b,c,d){if(a.is.string(b)&&a.is.fn(c)){var e=this.registered[b];this.registered[b]={name:b,klass:c,priority:a.is.number(d)?d:a.is.defined(e)?e.priority:0}}},load:function(b,c,d){var e,f,g=this,h=Array.prototype.slice.call(arguments),i=[],j=[];b=h.shift()||{};for(e in g.registered)if(g.registered.hasOwnProperty(e)){var k=g.registered[e];b.hasOwnProperty(e)&&(f=b[e],a.is.string(f)&&(f=a.getFnPointer(b[e])),a.is.fn(f)&&(k={name:e,klass:f,priority:g.registered[e].priority})),i.push(k)}for(e in b)b.hasOwnProperty(e)&&!g.registered.hasOwnProperty(e)&&(f=b[e],a.is.string(f)&&(f=a.getFnPointer(b[e])),a.is.fn(f)&&i.push({name:e,klass:f,priority:0}));return i.sort(function(a,b){return b.priority-a.priority}),a.arr.each(i,function(b){a.is.fn(b.klass)&&j.push(g._make(b.klass,h))}),j},make:function(b,c,d){var e,f=this,g=Array.prototype.slice.call(arguments);return b=g.shift(),e=f.registered[b],a.is.fn(e.klass)?f._make(e.klass,g):null},_make:function(a,b){function c(){return a.apply(this,b)}return c.prototype=a.prototype,new c}})}(FooTable),function(a,b){b.css2json=function(c){if(b.is.emptyString(c))return{};for(var d,e,f,g={},h=c.split(";"),i=0,j=h.length;j>i;i++)b.is.emptyString(h[i])||(d=h[i].split(":"),b.is.emptyString(d[0])||b.is.emptyString(d[1])||(e=b.str.toCamelCase(a.trim(d[0])),f=a.trim(d[1]),g[e]=f));return g},b.getFnPointer=function(a){if(b.is.emptyString(a))return null;var c=window,d=a.split(".");return b.arr.each(d,function(a){c[a]&&(c=c[a])}),b.is.fn(c)?c:null},b.checkFnValue=function(a,c,d){function e(a,c,d){return b.is.fn(c)?function(){return c.apply(a,arguments)}:d}return d=b.is.fn(d)?d:null,b.is.fn(c)?e(a,c,d):b.is.type(c,"string")?e(a,b.getFnPointer(c),d):d}}(jQuery,FooTable),function(a,b){b.Cell=b.Class.extend({construct:function(a,b,c,d){this.ft=a,this.row=b,this.column=c,this.created=!1,this.define(d)},define:function(c){this.$el=b.is.element(c)||b.is.jq(c)?a(c):null,this.$detail=null;var d=b.is.hash(c)&&b.is.hash(c.options)&&b.is.defined(c.value);this.value=this.column.parser.call(this.column,b.is.jq(this.$el)?this.$el:d?c.value:c,this.ft.o),this.o=a.extend(!0,{classes:null,style:null},d?c.options:{}),this.classes=b.is.jq(this.$el)&&this.$el.attr("class")?this.$el.attr("class").match(/\S+/g):b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.jq(this.$el)&&this.$el.attr("style")?b.css2json(this.$el.attr("style")):b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{}},$create:function(){this.created||((this.$el=b.is.jq(this.$el)?this.$el:a("<td/>")).data("value",this.value).contents().detach().end().append(this.format(this.value)),this._setClasses(this.$el),this._setStyle(this.$el),this.$detail=a("<tr/>").addClass(this.row.classes.join(" ")).data("__FooTableCell__",this).append(a("<th/>")).append(a("<td/>")),this.created=!0)},collapse:function(){this.created&&(this.$detail.children("th").html(this.column.title),this.$el.clone().attr("id",this.$el.attr("id")?this.$el.attr("id")+"-detail":void 0).css("display","table-cell").html("").append(this.$el.contents().detach()).replaceAll(this.$detail.children("td").first()),b.is.jq(this.$detail.parent())||this.$detail.appendTo(this.row.$details.find(".footable-details > tbody")))},restore:function(){if(this.created){if(b.is.jq(this.$detail.parent())){var a=this.$detail.children("td").first();this.$el.attr("class",a.attr("class")).attr("style",a.attr("style")).css("display",this.column.hidden||!this.column.visible?"none":"table-cell").append(a.contents().detach())}this.$detail.detach()}},parse:function(){return this.column.parser.call(this.column,this.$el,this.ft.o)},format:function(a){return this.column.formatter.call(this.column,a,this.ft.o,this.row.value)},val:function(c,d,e){if(b.is.undef(c))return this.value;var f=this,g=b.is.hash(c)&&b.is.hash(c.options)&&b.is.defined(c.value);if(this.o=a.extend(!0,{classes:f.classes,style:f.style},g?c.options:{}),this.value=g?c.value:c,this.classes=b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},e=b.is["boolean"](e)?e:!0,this.created&&e){this.$el.data("value",this.value).empty();var h=this.$detail.children("td").first().empty(),i=b.is.jq(this.$detail.parent())?h:this.$el;i.append(this.format(this.value)),this._setClasses(i),this._setStyle(i),(b.is["boolean"](d)?d:!0)&&this.row.draw()}},_setClasses:function(a){var c=!b.is.emptyArray(this.column.classes),d=!b.is.emptyArray(this.classes),e=null;a.removeAttr("class"),(c||d)&&(c&&d?e=this.classes.concat(this.column.classes).join(" "):c?e=this.column.classes.join(" "):d&&(e=this.classes.join(" ")),b.is.emptyString(e)||a.addClass(e))},_setStyle:function(c){var d=!b.is.emptyObject(this.column.style),e=!b.is.emptyObject(this.style),f=null;c.removeAttr("style"),(d||e)&&(d&&e?f=a.extend({},this.column.style,this.style):d?f=this.column.style:e&&(f=this.style),b.is.hash(f)&&c.css(f))}})}(jQuery,FooTable),function(a,b){b.Column=b.Class.extend({construct:function(a,c,d){this.ft=a,this.type=b.is.emptyString(d)?"text":d,this.virtual=b.is["boolean"](c.virtual)?c.virtual:!1,this.$el=b.is.jq(c.$el)?c.$el:null,this.index=b.is.number(c.index)?c.index:-1,this.internal=!1,this.define(c),this.$create()},define:function(a){this.hidden=b.is["boolean"](a.hidden)?a.hidden:!1,this.visible=b.is["boolean"](a.visible)?a.visible:!0,this.name=b.is.string(a.name)?a.name:null,null==this.name&&(this.name="col"+(a.index+1)),this.title=b.is.string(a.title)?a.title:null,!this.virtual&&null==this.title&&b.is.jq(this.$el)&&(this.title=this.$el.html()),null==this.title&&(this.title="Column "+(a.index+1)),this.style=b.is.hash(a.style)?a.style:b.is.string(a.style)?b.css2json(a.style):{},this.classes=b.is.array(a.classes)?a.classes:b.is.string(a.classes)?a.classes.match(/\S+/g):[],this.parser=b.checkFnValue(this,a.parser,this.parser),this.formatter=b.checkFnValue(this,a.formatter,this.formatter)},$create:function(){(this.$el=!this.virtual&&b.is.jq(this.$el)?this.$el:a("<th/>")).html(this.title).addClass(this.classes.join(" ")).css(this.style)},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("value");return b.is.defined(d)?d:a(c).html()}return b.is.defined(c)&&null!=c?c+"":null},formatter:function(a,b,c){return null==a?"":a},createCell:function(a){var c=b.is.jq(a.$el)?a.$el.children("td,th").get(this.index):null,d=b.is.hash(a.value)?a.value[this.name]:null;return new b.Cell(this.ft,a,this,c||d)}}),b.columns=new b.ClassFactory,b.columns.register("text",b.Column)}(jQuery,FooTable),function(a,b){b.Component=b.Class.extend({construct:function(a,c){if(!(a instanceof b.Table))throw new TypeError("The instance parameter must be an instance of FooTable.Table.");this.ft=a,this.enabled=b.is["boolean"](c)?c:!1},preinit:function(a){},init:function(){},destroy:function(){},predraw:function(){},draw:function(){},postdraw:function(){}}),b.components=new b.ClassFactory}(jQuery,FooTable),function(a,b){b.Defaults=function(){this.stopPropagation=!1,this.on=null},b.defaults=new b.Defaults}(jQuery,FooTable),function(a,b){b.Row=b.Class.extend({construct:function(a,b,c){this.ft=a,this.columns=b,this.created=!1,this.define(c)},define:function(c){this.$el=b.is.element(c)||b.is.jq(c)?a(c):null,this.$toggle=a("<span/>",{"class":"footable-toggle fooicon fooicon-plus"});var d=b.is.hash(c),e=d&&b.is.hash(c.options)&&b.is.hash(c.value);this.value=d?e?c.value:c:null,this.o=a.extend(!0,{expanded:!1,classes:null,style:null},e?c.options:{}),this.expanded=b.is.jq(this.$el)?this.$el.data("expanded")||this.o.expanded:this.o.expanded,this.classes=b.is.jq(this.$el)&&this.$el.attr("class")?this.$el.attr("class").match(/\S+/g):b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.jq(this.$el)&&this.$el.attr("style")?b.css2json(this.$el.attr("style")):b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},this.cells=this.createCells();var f=this;f.value={},b.arr.each(f.cells,function(a){f.value[a.column.name]=a.val()})},$create:function(){if(!this.created){(this.$el=b.is.jq(this.$el)?this.$el:a("<tr/>")).data("__FooTableRow__",this),this._setClasses(this.$el),this._setStyle(this.$el),"last"==this.ft.rows.toggleColumn&&this.$toggle.addClass("last-column"),this.$details=a("<tr/>",{"class":"footable-detail-row"}).append(a("<td/>",{colspan:this.ft.columns.visibleColspan}).append(a("<table/>",{"class":"footable-details "+this.ft.classes.join(" ")}).append("<tbody/>")));var c=this;b.arr.each(c.cells,function(a){a.created||a.$create(),c.$el.append(a.$el)}),c.$el.off("click.ft.row").on("click.ft.row",{self:c},c._onToggle),this.created=!0}},createCells:function(){var a=this;return b.arr.map(a.columns,function(b){return b.createCell(a)})},val:function(c,d,e){var f=this;if(!b.is.hash(c))return b.is.hash(this.value)&&!b.is.emptyObject(this.value)||(this.value={},b.arr.each(this.cells,function(a){a.column.internal||(f.value[a.column.name]=a.val())})),this.value;this.collapse(!1);var g=b.is.hash(c),h=g&&b.is.hash(c.options)&&b.is.hash(c.value);if(this.o=a.extend(!0,{expanded:f.expanded,classes:f.classes,style:f.style},h?c.options:{}),this.expanded=this.o.expanded,this.classes=b.is.array(this.o.classes)?this.o.classes:b.is.string(this.o.classes)?this.o.classes.match(/\S+/g):[],this.style=b.is.hash(this.o.style)?this.o.style:b.is.string(this.o.style)?b.css2json(this.o.style):{},g)if(h&&(c=c.value),b.is.hash(this.value))for(var i in c)c.hasOwnProperty(i)&&(this.value[i]=c[i]);else this.value=c;else this.value=null;e=b.is["boolean"](e)?e:!0,b.arr.each(this.cells,function(a){!a.column.internal&&b.is.defined(f.value[a.column.name])&&a.val(f.value[a.column.name],!1,e)}),this.created&&e&&(this._setClasses(this.$el),this._setStyle(this.$el),(b.is["boolean"](d)?d:!0)&&this.draw())},_setClasses:function(a){var c=!b.is.emptyArray(this.classes),d=null;a.removeAttr("class"),c&&(d=this.classes.join(" "),b.is.emptyString(d)||a.addClass(d))},_setStyle:function(a){var c=!b.is.emptyObject(this.style),d=null;a.removeAttr("style"),c&&(d=this.style,b.is.hash(d)&&a.css(d))},expand:function(){if(this.created){var a=this;a.ft.raise("expand.ft.row",[a]).then(function(){a.__hidden__=b.arr.map(a.cells,function(a){return a.column.hidden&&a.column.visible?a:null}),a.__hidden__.length>0&&(a.$details.insertAfter(a.$el).children("td").first().attr("colspan",a.ft.columns.visibleColspan),b.arr.each(a.__hidden__,function(a){a.collapse()})),a.$el.attr("data-expanded",!0),a.$toggle.removeClass("fooicon-plus").addClass("fooicon-minus"),a.expanded=!0,a.ft.raise("expanded.ft.row",[a])})}},collapse:function(a){if(this.created){var c=this;c.ft.raise("collapse.ft.row",[c]).then(function(){b.arr.each(c.__hidden__,function(a){a.restore()}),c.$details.detach(),c.$el.removeAttr("data-expanded"),c.$toggle.removeClass("fooicon-minus").addClass("fooicon-plus"),(b.is["boolean"](a)?a:!0)&&(c.expanded=!1),c.ft.raise("collapsed.ft.row",[c])})}},predraw:function(a){this.created&&(this.expanded&&this.collapse(!1),this.$toggle.detach(),a=b.is["boolean"](a)?a:!0,a&&this.$el.detach())},draw:function(a){this.created||this.$create(),b.is.jq(a)&&a.append(this.$el);var c=this;b.arr.each(c.cells,function(a){a.$el.css("display",a.column.hidden||!a.column.visible?"none":"table-cell"),c.ft.rows.showToggle&&c.ft.columns.hasHidden&&("first"==c.ft.rows.toggleColumn&&a.column.index==c.ft.columns.firstVisibleIndex||"last"==c.ft.rows.toggleColumn&&a.column.index==c.ft.columns.lastVisibleIndex)&&a.$el.prepend(c.$toggle),a.$el.add(a.column.$el).removeClass("footable-first-visible footable-last-visible"),a.column.index==c.ft.columns.firstVisibleIndex&&a.$el.add(a.column.$el).addClass("footable-first-visible"),a.column.index==c.ft.columns.lastVisibleIndex&&a.$el.add(a.column.$el).addClass("footable-last-visible")}),this.expanded&&this.expand()},toggle:function(){this.created&&this.ft.columns.hasHidden&&(this.expanded?this.collapse():this.expand())},_onToggle:function(b){var c=b.data.self;a(b.target).is(c.ft.rows.toggleSelector)&&c.toggle()}})}(jQuery,FooTable),function(a,b){b.instances=[],b.Table=b.Class.extend({construct:function(c,d,e){this._resizeTimeout=null,this.id=b.instances.push(this),this.initialized=!1,this.$el=(b.is.jq(c)?c:a(c)).first(),this.$loader=a("<div/>",{"class":"footable-loader"}).append(a("<span/>",{"class":"fooicon fooicon-loader"})),this.o=a.extend(!0,{},b.defaults,d),this.data=this.$el.data()||{},this.classes=[],this.components=b.components.load(b.is.hash(this.data.components)?this.data.components:this.o.components,this),this.breakpoints=this.use(FooTable.Breakpoints),this.columns=this.use(FooTable.Columns),this.rows=this.use(FooTable.Rows),this._construct(e)},_construct:function(a){var c=this;return this._preinit().then(function(){return c._init().then(function(){return c.raise("ready.ft.table").then(function(){b.is.fn(a)&&a.call(c,c)})})}).always(function(a){c.$el.show(),b.is.error(a)&&console.error("FooTable: unhandled error thrown during initialization.",a)})},_preinit:function(){var a=this;return this.raise("preinit.ft.table",[a.data]).then(function(){var c=(a.$el.attr("class")||"").match(/\S+/g)||[];a.o.ajax=b.checkFnValue(a,a.data.ajax,a.o.ajax),a.o.stopPropagation=b.is["boolean"](a.data.stopPropagation)?a.data.stopPropagation:a.o.stopPropagation;for(var d=0,e=c.length;e>d;d++)b.str.startsWith(c[d],"footable")||a.classes.push(c[d]);return a.$el.hide().after(a.$loader),a.execute(!1,!1,"preinit",a.data)})},_init:function(){var c=this;return c.raise("init.ft.table").then(function(){var d=c.$el.children("thead"),e=c.$el.children("tbody"),f=c.$el.children("tfoot");return c.$el.addClass("footable footable-"+c.id),b.is.hash(c.o.on)&&c.$el.on(c.o.on),0==f.length&&c.$el.append(f=a("<tfoot/>")),0==e.length&&c.$el.append("<tbody/>"),0==d.length&&c.$el.prepend(d=a("<thead/>")),c.execute(!1,!0,"init").then(function(){return c.$el.data("__FooTable__",c),0==f.children("tr").length&&f.remove(),0==d.children("tr").length&&d.remove(),c.raise("postinit.ft.table").then(function(){return c.draw()}).always(function(){a(window).off("resize.ft"+c.id,c._onWindowResize).on("resize.ft"+c.id,{self:c},c._onWindowResize),c.initialized=!0})})})},destroy:function(){var c=this;return c.raise("destroy.ft.table").then(function(){return c.execute(!0,!0,"destroy").then(function(){c.$el.removeData("__FooTable__").removeClass("footable-"+c.id),b.is.hash(c.o.on)&&c.$el.off(c.o.on),a(window).off("resize.ft"+c.id,c._onWindowResize),c.initialized=!1,b.instances[c.id]=null})}).fail(function(a){b.is.error(a)&&console.error("FooTable: unhandled error thrown while destroying the plugin.",a)})},raise:function(c,d){var e=this,f=b.__debug__&&(b.is.emptyArray(b.__debug_options__.events)||b.arr.any(b.__debug_options__.events,function(a){return b.str.contains(c,a)}));return d=d||[],d.unshift(this),a.Deferred(function(b){var g=a.Event(c);1==e.o.stopPropagation&&e.$el.one(c,function(a){a.stopPropagation()}),f&&console.log("FooTable:"+c+": ",d),e.$el.trigger(g,d),g.isDefaultPrevented()?(f&&console.log('FooTable: default prevented for the "'+c+'" event.'),b.reject(g)):b.resolve(g)})},use:function(a){for(var b=0,c=this.components.length;c>b;b++)if(this.components[b]instanceof a)return this.components[b];return null},draw:function(){var a=this,c=a.$el.clone().insertBefore(a.$el);return a.$el.detach(),a.execute(!1,!0,"predraw").then(function(){return a.raise("predraw.ft.table").then(function(){return a.execute(!1,!0,"draw").then(function(){return a.raise("draw.ft.table").then(function(){return a.execute(!1,!0,"postdraw").then(function(){return a.raise("postdraw.ft.table")})})})})}).fail(function(a){b.is.error(a)&&console.error("FooTable: unhandled error thrown during a draw operation.",a)}).always(function(){c.replaceWith(a.$el),a.$loader.remove()})},execute:function(a,c,d,e,f){var g=this,h=Array.prototype.slice.call(arguments);a=h.shift(),c=h.shift();var i=c?b.arr.get(g.components,function(a){return a.enabled}):g.components.slice(0);return h.unshift(a?i.reverse():i),g._execute.apply(g,h)},_execute:function(c,d,e,f){if(!c||!c.length)return a.when();var g,h=this,i=Array.prototype.slice.call(arguments);return c=i.shift(),d=i.shift(),g=c.shift(),b.is.fn(g[d])?a.Deferred(function(a){try{var c=g[d].apply(g,i);if(b.is.promise(c))return c.then(a.resolve,a.reject);a.resolve(c)}catch(e){a.reject(e)}}).then(function(){return h._execute.apply(h,[c,d].concat(i))}):h._execute.apply(h,[c,d].concat(i))},_onWindowResize:function(a){var b=a.data.self;null!=b._resizeTimeout&&clearTimeout(b._resizeTimeout),b._resizeTimeout=setTimeout(function(){b._resizeTimeout=null,b.raise("resize.ft.table").then(function(){b.breakpoints.check()})},300)}})}(jQuery,FooTable),function(a,b){b.ArrayColumn=b.Column.extend({construct:function(a,b){this._super(a,b,"array")},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c),e=d.data("value");if(b.is.array(e))return e;e=d.html();try{e=JSON.parse(e)}catch(f){e=null}return b.is.array(e)?e:null}return b.is.array(c)?c:null},formatter:function(a,c,d){return b.is.array(a)?JSON.stringify(a):""}}),b.columns.register("array",b.ArrayColumn)}(jQuery,FooTable),function(a,b){b.is.undef(window.moment)||(b.DateColumn=b.Column.extend({construct:function(a,c){this._super(a,c,"date"),this.formatString=b.is.string(c.formatString)?c.formatString:"MM-DD-YYYY"},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("value");c=b.is.defined(d)?d:a(c).text(),b.is.string(c)&&(c=isNaN(c)?c:+c)}if(b.is.date(c))return moment(c);if(b.is.object(c)&&b.is["boolean"](c._isAMomentObject))return c;if(b.is.string(c)){if(isNaN(c))return moment(c,this.formatString);c=+c}return b.is.number(c)?moment(c):null},formatter:function(a,c,d){return b.is.object(a)&&b.is["boolean"](a._isAMomentObject)&&a.isValid()?a.format(this.formatString):""},filterValue:function(c){if((b.is.element(c)||b.is.jq(c))&&(c=a(c).data("filterValue")||a(c).text()),b.is.hash(c)&&b.is.hash(c.options)&&(b.is.string(c.options.filterValue)&&(c=c.options.filterValue),b.is.defined(c.value)&&(c=c.value)),b.is.object(c)&&b.is["boolean"](c._isAMomentObject))return c.format(this.formatString);if(b.is.string(c)){if(isNaN(c))return c;c=+c}return b.is.number(c)||b.is.date(c)?moment(c).format(this.formatString):b.is.defined(c)&&null!=c?c+"":""}}),b.columns.register("date",b.DateColumn))}(jQuery,FooTable),function(a,b){b.HTMLColumn=b.Column.extend({construct:function(a,b){this._super(a,b,"html")},parser:function(c){if(b.is.string(c)&&(c=a(a.trim(c))),b.is.element(c)&&(c=a(c)),b.is.jq(c)){var d=c.prop("tagName").toLowerCase();if("td"==d||"th"==d){var e=c.data("value");return b.is.defined(e)?e:c.contents()}return c}return null}}),b.columns.register("html",b.HTMLColumn)}(jQuery,FooTable),function(a,b){b.NumberColumn=b.Column.extend({construct:function(a,c){this._super(a,c,"number"),this.decimalSeparator=b.is.string(c.decimalSeparator)?c.decimalSeparator:".",this.thousandSeparator=b.is.string(c.thousandSeparator)?c.thousandSeparator:",",this.decimalSeparatorRegex=new RegExp(b.str.escapeRegExp(this.decimalSeparator),"g"),this.thousandSeparatorRegex=new RegExp(b.str.escapeRegExp(this.thousandSeparator),"g"),this.cleanRegex=new RegExp("[^-0-9"+b.str.escapeRegExp(this.decimalSeparator)+"]","g")},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("value");c=b.is.defined(d)?d:a(c).text().replace(this.cleanRegex,"")}return b.is.string(c)&&(c=c.replace(this.thousandSeparatorRegex,"").replace(this.decimalSeparatorRegex,"."),c=parseFloat(c)),b.is.number(c)?c:null},formatter:function(a,b,c){if(null==a)return"";var d=(a+"").split(".");return 2==d.length&&d[0].length>3&&(d[0]=d[0].replace(/\B(?=(?:\d{3})+(?!\d))/g,this.thousandSeparator)),d.join(this.decimalSeparator)}}),b.columns.register("number",b.NumberColumn)}(jQuery,FooTable),function(a,b){b.ObjectColumn=b.Column.extend({construct:function(a,b){this._super(a,b,"object")},parser:function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c),e=d.data("value");if(b.is.object(e))return e;e=d.html();try{e=JSON.parse(e)}catch(f){e=null}return b.is.object(e)?e:null}return b.is.object(c)?c:null},formatter:function(a,c,d){return b.is.object(a)?JSON.stringify(a):""}}),b.columns.register("object",b.ObjectColumn)}(jQuery,FooTable),function(a,b){b.Breakpoint=b.Class.extend({construct:function(a,b){this.name=a,this.width=b}})}(jQuery,FooTable),function(a,b){b.Breakpoints=b.Component.extend({construct:function(a){this._super(a,!0),this.o=a.o,this.current=null,this.array=[],this.cascade=this.o.cascade,this.useParentWidth=this.o.useParentWidth,this.hidden=null,this._classNames="",this.getWidth=b.checkFnValue(this,this.o.getWidth,this.getWidth)},preinit:function(a){var c=this;return this.ft.raise("preinit.ft.breakpoints",[a]).then(function(){c.cascade=b.is["boolean"](a.cascade)?a.cascade:c.cascade,c.o.breakpoints=b.is.hash(a.breakpoints)?a.breakpoints:c.o.breakpoints,c.getWidth=b.checkFnValue(c,a.getWidth,c.getWidth),null==c.o.breakpoints&&(c.o.breakpoints={xs:480,sm:768,md:992,lg:1200});for(var d in c.o.breakpoints)c.o.breakpoints.hasOwnProperty(d)&&(c.array.push(new b.Breakpoint(d,c.o.breakpoints[d])),c._classNames+="breakpoint-"+d+" ");c.array.sort(function(a,b){return b.width-a.width})})},init:function(){var a=this;return this.ft.raise("init.ft.breakpoints").then(function(){a.current=a.get()})},draw:function(){this.ft.$el.removeClass(this._classNames).addClass("breakpoint-"+this.current.name)},calculate:function(){for(var a,c=this,d=null,e=[],f=null,g=c.getWidth(),h=0,i=c.array.length;i>h;h++)a=c.array[h],(!d&&h==i-1||g>=a.width&&(f instanceof b.Breakpoint?g<f.width:!0))&&(d=a),d||e.push(a.name),f=a;return e.push(d.name),c.hidden=e.join(" "),d},visible:function(a){if(b.is.emptyString(a))return!0;if("all"===a)return!1;for(var c=a.split(" "),d=0,e=c.length;e>d;d++)if(this.cascade?b.str.containsWord(this.hidden,c[d]):c[d]==this.current.name)return!1;return!0},check:function(){var a=this,c=a.get();c instanceof b.Breakpoint&&c!=a.current&&a.ft.raise("before.ft.breakpoints",[a.current,c]).then(function(){var b=a.current;return a.current=c,a.ft.draw().then(function(){a.ft.raise("after.ft.breakpoints",[a.current,b])})})},get:function(a){return b.is.undef(a)?this.calculate():a instanceof b.Breakpoint?a:b.is.string(a)?b.arr.first(this.array,function(b){return b.name==a}):b.is.number(a)&&a>=0&&a<this.array.length?this.array[a]:null},getWidth:function(){return b.is.fn(this.o.getWidth)?this.o.getWidth(this.ft):1==this.useParentWidth?this.getParentWidth():this.getViewportWidth()},getParentWidth:function(){return this.ft.$el.parent().width()},getViewportWidth:function(){return Math.max(document.documentElement.clientWidth,window.innerWidth,0)}}),b.components.register("breakpoints",b.Breakpoints,1e3)}(jQuery,FooTable),function(a){a.Column.prototype.breakpoints=null,a.Column.prototype.__breakpoints_define__=function(b){this.breakpoints=a.is.emptyString(b.breakpoints)?null:b.breakpoints},a.Column.extend("define",function(a){this._super(a),this.__breakpoints_define__(a)})}(FooTable),function(a){a.Defaults.prototype.breakpoints=null,a.Defaults.prototype.cascade=!1,a.Defaults.prototype.useParentWidth=!1,a.Defaults.prototype.getWidth=null}(FooTable),function(a,b){b.Columns=b.Component.extend({construct:function(a){this._super(a,!0),this.o=a.o,this.array=[],this.$header=null,this.showHeader=a.o.showHeader,this._fromHTML=b.is.emptyArray(a.o.columns)&&!b.is.promise(a.o.columns)},parse:function(c){var d=this;return a.Deferred(function(c){function e(c,d){var e=[];if(0==c.length||0==d.length)e=c.concat(d);else{var f=0;b.arr.each(c.concat(d),function(a){a.index>f&&(f=a.index)}),f++;for(var g,h,i=0;f>i;i++)g={},b.arr.each(c,function(a){return a.index==i?(g=a,!1):void 0}),h={},b.arr.each(d,function(a){return a.index==i?(h=a,!1):void 0}),e.push(a.extend(!0,{},g,h))}return e}var f,g,h=[],i=[],j=d.ft.$el.find("tr.footable-header, thead > tr:last:has([data-breakpoints]), tbody > tr:first:has([data-breakpoints]), thead > tr:last, tbody > tr:first").first();if(j.length>0){var k=j.parent().is("tbody")&&j.children().length==j.children("td").length;k||(d.$header=j.addClass("footable-header")),j.children("td,th").each(function(b,c){f=a(c),g=f.data(),g.index=b,g.$el=f,g.virtual=k,i.push(g)}),k&&(d.showHeader=!1)}b.is.array(d.o.columns)&&!b.is.emptyArray(d.o.columns)?(b.arr.each(d.o.columns,function(a,b){a.index=b,h.push(a)}),d.parseFinalize(c,e(h,i))):b.is.promise(d.o.columns)?d.o.columns.then(function(a){b.arr.each(a,function(a,b){a.index=b,h.push(a)}),d.parseFinalize(c,e(h,i))},function(a){c.reject(Error("Columns ajax request error: "+a.status+" ("+a.statusText+")"))}):d.parseFinalize(c,e(h,i))})},parseFinalize:function(a,c){var d,e=this,f=[];b.arr.each(c,function(a){(d=b.columns.contains(a.type)?b.columns.make(a.type,e.ft,a):new b.Column(e.ft,a))&&f.push(d)}),b.is.emptyArray(f)?a.reject(Error("No columns supplied.")):(f.sort(function(a,b){
-return a.index-b.index}),a.resolve(f))},preinit:function(a){var c=this;return c.ft.raise("preinit.ft.columns",[a]).then(function(){return c.parse(a).then(function(d){c.array=d,c.showHeader=b.is["boolean"](a.showHeader)?a.showHeader:c.showHeader})})},init:function(){var a=this;return this.ft.raise("init.ft.columns",[a.array]).then(function(){a.$create()})},destroy:function(){var a=this;this.ft.raise("destroy.ft.columns").then(function(){a._fromHTML||a.$header.remove()})},predraw:function(){var a=this,c=!0;a.visibleColspan=0,a.firstVisibleIndex=0,a.lastVisibleIndex=0,a.hasHidden=!1,b.arr.each(a.array,function(b){b.hidden=!a.ft.breakpoints.visible(b.breakpoints),!b.hidden&&b.visible&&(c&&(a.firstVisibleIndex=b.index,c=!1),a.lastVisibleIndex=b.index,a.visibleColspan++),b.hidden&&(a.hasHidden=!0)}),a.ft.$el.toggleClass("breakpoint",a.hasHidden)},draw:function(){b.arr.each(this.array,function(a){a.$el.css("display",a.hidden||!a.visible?"none":"table-cell")}),!this.showHeader&&b.is.jq(this.$header.parent())&&this.$header.detach()},$create:function(){var c=this;c.$header=b.is.jq(c.$header)?c.$header:a("<tr/>",{"class":"footable-header"}),c.$header.children("th,td").detach(),b.arr.each(c.array,function(a){c.$header.append(a.$el)}),c.showHeader&&!b.is.jq(c.$header.parent())&&c.ft.$el.children("thead").append(c.$header)},get:function(a){return a instanceof b.Column?a:b.is.string(a)?b.arr.first(this.array,function(b){return b.name==a}):b.is.number(a)?b.arr.first(this.array,function(b){return b.index==a}):b.is.fn(a)?b.arr.get(this.array,a):null},ensure:function(a){var c=this,d=[];return b.is.array(a)?(b.arr.each(a,function(a){d.push(c.get(a))}),d):d}}),b.components.register("columns",b.Columns,900)}(jQuery,FooTable),function(a){a.Defaults.prototype.columns=[],a.Defaults.prototype.showHeader=!0}(FooTable),function(a,b){b.Rows=b.Component.extend({construct:function(a){this._super(a,!0),this.o=a.o,this.array=[],this.all=[],this.showToggle=a.o.showToggle,this.toggleSelector=a.o.toggleSelector,this.toggleColumn=a.o.toggleColumn,this.emptyString=a.o.empty,this.expandFirst=a.o.expandFirst,this.expandAll=a.o.expandAll,this.$empty=null,this._fromHTML=b.is.emptyArray(a.o.rows)&&!b.is.promise(a.o.rows)},parse:function(){var c=this;return a.Deferred(function(a){var d=c.ft.$el.children("tbody").children("tr");b.is.array(c.o.rows)&&c.o.rows.length>0?c.parseFinalize(a,c.o.rows):b.is.promise(c.o.rows)?c.o.rows.then(function(b){c.parseFinalize(a,b)},function(b){a.reject(Error("Rows ajax request error: "+b.status+" ("+b.statusText+")"))}):b.is.jq(d)?(c.parseFinalize(a,d),d.detach()):c.parseFinalize(a,[])})},parseFinalize:function(c,d){var e=this,f=a.map(d,function(a){return new b.Row(e.ft,e.ft.columns.array,a)});c.resolve(f)},preinit:function(a){var c=this;return c.ft.raise("preinit.ft.rows",[a]).then(function(){return c.parse().then(function(d){c.all=d,c.array=c.all.slice(0),c.showToggle=b.is["boolean"](a.showToggle)?a.showToggle:c.showToggle,c.toggleSelector=b.is.string(a.toggleSelector)?a.toggleSelector:c.toggleSelector,c.toggleColumn=b.is.string(a.toggleColumn)?a.toggleColumn:c.toggleColumn,"first"!=c.toggleColumn&&"last"!=c.toggleColumn&&(c.toggleColumn="first"),c.emptyString=b.is.string(a.empty)?a.empty:c.emptyString,c.expandFirst=b.is["boolean"](a.expandFirst)?a.expandFirst:c.expandFirst,c.expandAll=b.is["boolean"](a.expandAll)?a.expandAll:c.expandAll})})},init:function(){var a=this;return a.ft.raise("init.ft.rows",[a.all]).then(function(){a.$create()})},destroy:function(){var a=this;this.ft.raise("destroy.ft.rows").then(function(){b.arr.each(a.array,function(b){b.predraw(!a._fromHTML)}),a.all=a.array=[]})},predraw:function(){b.arr.each(this.array,function(a){a.predraw()}),this.array=this.all.slice(0)},$create:function(){this.$empty=a("<tr/>",{"class":"footable-empty"}).append(a("<td/>").text(this.emptyString))},draw:function(){var a=this,c=a.ft.$el.children("tbody"),d=!0;a.array.length>0?(a.$empty.detach(),b.arr.each(a.array,function(b){(a.expandFirst&&d||a.expandAll)&&(b.expanded=!0,d=!1),b.draw(c)})):(a.$empty.children("td").attr("colspan",a.ft.columns.visibleColspan),c.append(a.$empty))},load:function(c,d){var e=this,f=a.map(c,function(a){return new b.Row(e.ft,e.ft.columns.array,a)});b.arr.each(this.array,function(a){a.predraw()}),this.all=(b.is["boolean"](d)?d:!1)?this.all.concat(f):f,this.array=this.all.slice(0),this.ft.draw()},expand:function(){b.arr.each(this.array,function(a){a.expand()})},collapse:function(){b.arr.each(this.array,function(a){a.collapse()})}}),b.components.register("rows",b.Rows,800)}(jQuery,FooTable),function(a){a.Defaults.prototype.rows=[],a.Defaults.prototype.empty="No results",a.Defaults.prototype.showToggle=!0,a.Defaults.prototype.toggleSelector="tr,td,.footable-toggle",a.Defaults.prototype.toggleColumn="first",a.Defaults.prototype.expandFirst=!1,a.Defaults.prototype.expandAll=!1}(FooTable),function(a){a.Table.prototype.loadRows=function(a,b){this.rows.load(a,b)}}(FooTable),function(a){a.Filter=a.Class.extend({construct:function(b,c,d,e,f,g,h){this.name=b,this.space=!a.is.string(e)||"OR"!=e&&"AND"!=e?"AND":e,this.connectors=a.is["boolean"](f)?f:!0,this.ignoreCase=a.is["boolean"](g)?g:!0,this.hidden=a.is["boolean"](h)?h:!1,this.query=c instanceof a.Query?c:new a.Query(c,this.space,this.connectors,this.ignoreCase),this.columns=d},match:function(b){return a.is.string(b)?(a.is.string(this.query)&&(this.query=new a.Query(this.query,this.space,this.connectors,this.ignoreCase)),this.query instanceof a.Query?this.query.match(b):!1):!1},matchRow:function(b){var c=this,d=a.arr.map(b.cells,function(b){return a.arr.contains(c.columns,b.column)?b.filterValue:null}).join(" ");return c.match(d)}})}(FooTable),function(a,b){b.Filtering=b.Component.extend({construct:function(a){this._super(a,a.o.filtering.enabled),this.filters=a.o.filtering.filters,this.delay=a.o.filtering.delay,this.min=a.o.filtering.min,this.space=a.o.filtering.space,this.connectors=a.o.filtering.connectors,this.ignoreCase=a.o.filtering.ignoreCase,this.exactMatch=a.o.filtering.exactMatch,this.placeholder=a.o.filtering.placeholder,this.dropdownTitle=a.o.filtering.dropdownTitle,this.position=a.o.filtering.position,this.focus=a.o.filtering.focus,this.container=a.o.filtering.container,this.$container=null,this.$row=null,this.$cell=null,this.$form=null,this.$dropdown=null,this.$input=null,this.$button=null,this._filterTimeout=null,this._exactRegExp=/^"(.*?)"$/},preinit:function(a){var c=this;return c.ft.raise("preinit.ft.filtering").then(function(){c.ft.$el.hasClass("footable-filtering")&&(c.enabled=!0),c.enabled=b.is["boolean"](a.filtering)?a.filtering:c.enabled,c.enabled&&(c.space=b.is.string(a.filterSpace)?a.filterSpace:c.space,c.min=b.is.number(a.filterMin)?a.filterMin:c.min,c.connectors=b.is["boolean"](a.filterConnectors)?a.filterConnectors:c.connectors,c.ignoreCase=b.is["boolean"](a.filterIgnoreCase)?a.filterIgnoreCase:c.ignoreCase,c.exactMatch=b.is["boolean"](a.filterExactMatch)?a.filterExactMatch:c.exactMatch,c.focus=b.is["boolean"](a.filterFocus)?a.filterFocus:c.focus,c.delay=b.is.number(a.filterDelay)?a.filterDelay:c.delay,c.placeholder=b.is.string(a.filterPlaceholder)?a.filterPlaceholder:c.placeholder,c.dropdownTitle=b.is.string(a.filterDropdownTitle)?a.filterDropdownTitle:c.dropdownTitle,c.container=b.is.string(a.filterContainer)?a.filterContainer:c.container,c.filters=b.is.array(a.filterFilters)?c.ensure(a.filterFilters):c.ensure(c.filters),c.ft.$el.hasClass("footable-filtering-left")&&(c.position="left"),c.ft.$el.hasClass("footable-filtering-center")&&(c.position="center"),c.ft.$el.hasClass("footable-filtering-right")&&(c.position="right"),c.position=b.is.string(a.filterPosition)?a.filterPosition:c.position)},function(){c.enabled=!1})},init:function(){var a=this;return a.ft.raise("init.ft.filtering").then(function(){a.$create()},function(){a.enabled=!1})},destroy:function(){var a=this;return a.ft.raise("destroy.ft.filtering").then(function(){a.ft.$el.removeClass("footable-filtering").find("thead > tr.footable-filtering").remove()})},$create:function(){var c,d=this,e=a("<div/>",{"class":"form-group footable-filtering-search"}).append(a("<label/>",{"class":"sr-only",text:"Search"})),f=a("<div/>",{"class":"input-group"}).appendTo(e),g=a("<div/>",{"class":"input-group-btn"}),h=a("<button/>",{type:"button","class":"btn btn-default dropdown-toggle"}).on("click",{self:d},d._onDropdownToggleClicked).append(a("<span/>",{"class":"caret"}));switch(d.position){case"left":c="footable-filtering-left";break;case"center":c="footable-filtering-center";break;default:c="footable-filtering-right"}d.ft.$el.addClass("footable-filtering").addClass(c),d.$container=null===d.container?a():a(d.container).first(),d.$container.length?d.$container.addClass("footable-filtering-external").addClass(c):(d.$row=a("<tr/>",{"class":"footable-filtering"}).prependTo(d.ft.$el.children("thead")),d.$cell=a("<th/>").attr("colspan",d.ft.columns.visibleColspan).appendTo(d.$row),d.$container=d.$cell),d.$form=a("<form/>",{"class":"form-inline"}).append(e).appendTo(d.$container),d.$input=a("<input/>",{type:"text","class":"form-control",placeholder:d.placeholder}),d.$button=a("<button/>",{type:"button","class":"btn btn-primary"}).on("click",{self:d},d._onSearchButtonClicked).append(a("<span/>",{"class":"fooicon fooicon-search"})),d.$dropdown=a("<ul/>",{"class":"dropdown-menu dropdown-menu-right"}),b.is.emptyString(d.dropdownTitle)||d.$dropdown.append(a("<li/>",{"class":"dropdown-header",text:d.dropdownTitle})),d.$dropdown.append(b.arr.map(d.ft.columns.array,function(b){return b.filterable?a("<li/>").append(a("<a/>",{"class":"checkbox"}).append(a("<label/>",{html:b.title}).prepend(a("<input/>",{type:"checkbox",checked:!0}).data("__FooTableColumn__",b)))):null})),d.delay>0&&(d.$input.on("keypress keyup paste",{self:d},d._onSearchInputChanged),d.$dropdown.on("click",'input[type="checkbox"]',{self:d},d._onSearchColumnClicked)),g.append(d.$button,h,d.$dropdown),f.append(d.$input,g)},predraw:function(){if(!b.is.emptyArray(this.filters)){var c=this;c.ft.rows.array=a.grep(c.ft.rows.array,function(a){return a.filtered(c.filters)})}},draw:function(){b.is.jq(this.$cell)&&this.$cell.attr("colspan",this.ft.columns.visibleColspan);var a=this.find("search");if(a instanceof b.Filter){var c=a.query.val();this.exactMatch&&this._exactRegExp.test(c)&&(c=c.replace(this._exactRegExp,"$1")),this.$input.val(c)}else this.$input.val(null);this.setButton(!b.arr.any(this.filters,function(a){return!a.hidden}))},addFilter:function(a,c,d,e,f,g,h){var i=this.createFilter(a,c,d,e,f,g,h);i instanceof b.Filter&&(this.removeFilter(i.name),this.filters.push(i))},removeFilter:function(a){b.arr.remove(this.filters,function(b){return b.name==a})},filter:function(a){var b=this;return b.filters=b.ensure(b.filters),b.ft.raise("before.ft.filtering",[b.filters]).then(function(){if(b.filters=b.ensure(b.filters),a)var c=b.$input.prop("selectionStart"),d=b.$input.prop("selectionEnd");return b.ft.draw().then(function(){a&&b.$input.focus().prop({selectionStart:c,selectionEnd:d}),b.ft.raise("after.ft.filtering",[b.filters])})})},clear:function(){return this.filters=b.arr.get(this.filters,function(a){return a.hidden}),this.filter(this.focus)},setButton:function(a){a?this.$button.children(".fooicon").removeClass("fooicon-remove").addClass("fooicon-search"):this.$button.children(".fooicon").removeClass("fooicon-search").addClass("fooicon-remove")},find:function(a){return b.arr.first(this.filters,function(b){return b.name==a})},columns:function(){return b.is.jq(this.$dropdown)?this.$dropdown.find("input:checked").map(function(){return a(this).data("__FooTableColumn__")}).get():this.ft.columns.get(function(a){return a.filterable})},ensure:function(a){var c=this,d=[],e=c.columns();return b.is.emptyArray(a)||b.arr.each(a,function(a){a=c._ensure(a,e),a instanceof b.Filter&&d.push(a)}),d},createFilter:function(a,c,d,e,f,g,h){return b.is.string(a)&&(a={name:a,query:c,columns:d,ignoreCase:e,connectors:f,space:g,hidden:h}),this._ensure(a,this.columns())},_ensure:function(a,c){return(b.is.hash(a)||a instanceof b.Filter)&&!b.is.emptyString(a.name)&&(!b.is.emptyString(a.query)||a.query instanceof b.Query)?(a.columns=b.is.emptyArray(a.columns)?c:this.ft.columns.ensure(a.columns),a.ignoreCase=b.is["boolean"](a.ignoreCase)?a.ignoreCase:this.ignoreCase,a.connectors=b.is["boolean"](a.connectors)?a.connectors:this.connectors,a.hidden=b.is["boolean"](a.hidden)?a.hidden:!1,a.space=!b.is.string(a.space)||"AND"!==a.space&&"OR"!==a.space?this.space:a.space,a.query=b.is.string(a.query)?new b.Query(a.query,a.space,a.connectors,a.ignoreCase):a.query,a instanceof b.Filter?a:new b.Filter(a.name,a.query,a.columns,a.space,a.connectors,a.ignoreCase,a.hidden)):null},_onSearchInputChanged:function(a){var c=a.data.self,d="keypress"==a.type&&!b.is.emptyString(String.fromCharCode(a.charCode)),e="keyup"==a.type&&(8==a.which||46==a.which),f="paste"==a.type;(d||e||f)&&(13==a.which&&a.preventDefault(),null!=c._filterTimeout&&clearTimeout(c._filterTimeout),c._filterTimeout=setTimeout(function(){c._filterTimeout=null;var a=c.$input.val();a.length>=c.min?(c.exactMatch&&!c._exactRegExp.test(a)&&(a='"'+a+'"'),c.addFilter("search",a),c.filter(c.focus)):b.is.emptyString(a)&&c.clear()},c.delay))},_onSearchButtonClicked:function(a){a.preventDefault();var b=a.data.self;null!=b._filterTimeout&&clearTimeout(b._filterTimeout);var c=b.$button.children(".fooicon");if(c.hasClass("fooicon-remove"))b.clear();else{var d=b.$input.val();d.length>=b.min&&(b.exactMatch&&!b._exactRegExp.test(d)&&(d='"'+d+'"'),b.addFilter("search",d),b.filter(b.focus))}},_onSearchColumnClicked:function(a){var b=a.data.self;null!=b._filterTimeout&&clearTimeout(b._filterTimeout),b._filterTimeout=setTimeout(function(){b._filterTimeout=null;var a=b.$button.children(".fooicon");a.hasClass("fooicon-remove")&&(a.removeClass("fooicon-remove").addClass("fooicon-search"),b.addFilter("search",b.$input.val()),b.filter())},b.delay)},_onDropdownToggleClicked:function(b){b.preventDefault(),b.stopPropagation();var c=b.data.self;c.$dropdown.parent().toggleClass("open"),c.$dropdown.parent().hasClass("open")?a(document).on("click.footable",{self:c},c._onDocumentClicked):a(document).off("click.footable",c._onDocumentClicked)},_onDocumentClicked:function(b){if(0==a(b.target).closest(".dropdown-menu").length){b.preventDefault();var c=b.data.self;c.$dropdown.parent().removeClass("open"),a(document).off("click.footable",c._onDocumentClicked)}}}),b.components.register("filtering",b.Filtering,500)}(jQuery,FooTable),function(a){a.Query=a.Class.extend({construct:function(b,c,d,e){this._original=null,this._value=null,this.space=!a.is.string(c)||"OR"!=c&&"AND"!=c?"AND":c,this.connectors=a.is["boolean"](d)?d:!0,this.ignoreCase=a.is["boolean"](e)?e:!0,this.left=null,this.right=null,this.parts=[],this.operator=null,this.val(b)},val:function(b){if(a.is.emptyString(b))return this._value;if(a.is.emptyString(this._original))this._original=b;else if(this._original==b)return;this._value=b,this._parse()},match:function(b){return a.is.emptyString(this.operator)||"OR"===this.operator?this._left(b,!1)||this._match(b,!1)||this._right(b,!1):"AND"===this.operator?this._left(b,!0)&&this._match(b,!0)&&this._right(b,!0):void 0},_match:function(b,c){var d=this,e=!1,f=a.is.emptyString(b);return a.is.emptyArray(d.parts)&&d.left instanceof a.Query?c:a.is.emptyArray(d.parts)?e:("OR"===d.space?a.arr.each(d.parts,function(c){if(c.empty&&f){if(e=!0,c.negate)return e=!1}else{var g=(c.exact?a.str.containsExact:a.str.contains)(b,c.query,d.ignoreCase);if(g&&!c.negate&&(e=!0),g&&c.negate)return e=!1}}):(e=!0,a.arr.each(d.parts,function(c){if(c.empty)return(!f&&!c.negate||f&&c.negate)&&(e=!1),e;var g=(c.exact?a.str.containsExact:a.str.contains)(b,c.query,d.ignoreCase);return(!g&&!c.negate||g&&c.negate)&&(e=!1),e})),e)},_left:function(b,c){return this.left instanceof a.Query?this.left.match(b):c},_right:function(b,c){return this.right instanceof a.Query?this.right.match(b):c},_parse:function(){if(!a.is.emptyString(this._value))if(/\sOR\s/.test(this._value)){this.operator="OR";var b=this._value.split(/(?:\sOR\s)(.*)?/);this.left=new a.Query(b[0],this.space,this.connectors,this.ignoreCase),this.right=new a.Query(b[1],this.space,this.connectors,this.ignoreCase)}else if(/\sAND\s/.test(this._value)){this.operator="AND";var c=this._value.split(/(?:\sAND\s)(.*)?/);this.left=new a.Query(c[0],this.space,this.connectors,this.ignoreCase),this.right=new a.Query(c[1],this.space,this.connectors,this.ignoreCase)}else{var d=this;this.parts=a.arr.map(this._value.match(/(?:[^\s"]+|"[^"]*")+/g),function(a){return d._part(a)})}},_part:function(b){var c={query:b,negate:!1,phrase:!1,exact:!1,empty:!1};return a.str.startsWith(c.query,"-")&&(c.query=a.str.from(c.query,"-"),c.negate=!0),/^"(.*?)"$/.test(c.query)?(c.query=c.query.replace(/^"(.*?)"$/,"$1"),c.phrase=!0,c.exact=!0):this.connectors&&/(?:\w)+?([-_\+\.])(?:\w)+?/.test(c.query)&&(c.query=c.query.replace(/(?:\w)+?([-_\+\.])(?:\w)+?/g,function(a,b){return a.replace(b," ")}),c.phrase=!0),c.empty=c.phrase&&a.is.emptyString(c.query),c}})}(FooTable),function(a){a.Cell.prototype.filterValue=null,a.Cell.prototype.__filtering_define__=function(a){this.filterValue=this.column.filterValue.call(this.column,a)},a.Cell.prototype.__filtering_val__=function(b){a.is.defined(b)&&(this.filterValue=this.column.filterValue.call(this.column,b))},a.Cell.extend("define",function(a){this._super(a),this.__filtering_define__(a)}),a.Cell.extend("val",function(a,b,c){var d=this._super(a,b,c);return this.__filtering_val__(a),d})}(FooTable),function(a,b){b.Column.prototype.filterable=!0,b.Column.prototype.filterValue=function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("filterValue");return b.is.defined(d)?""+d:a(c).text()}if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.filterValue))return c.options.filterValue;b.is.defined(c.value)&&(c=c.value)}return b.is.defined(c)&&null!=c?c+"":""},b.Column.prototype.__filtering_define__=function(a){this.filterable=b.is["boolean"](a.filterable)?a.filterable:this.filterable,this.filterValue=b.checkFnValue(this,a.filterValue,this.filterValue)},b.Column.extend("define",function(a){this._super(a),this.__filtering_define__(a)})}(jQuery,FooTable),function(a){a.Defaults.prototype.filtering={enabled:!1,filters:[],delay:1200,min:1,space:"AND",placeholder:"Search",dropdownTitle:null,position:"right",connectors:!0,ignoreCase:!0,exactMatch:!1,focus:!0,container:null}}(FooTable),function(a){a.Row.prototype.filtered=function(b){var c=!0,d=this;return a.arr.each(b,function(a){return 0==(c=a.matchRow(d))?!1:void 0}),c}}(FooTable),function(a,b){b.Sorter=b.Class.extend({construct:function(a,b){this.column=a,this.direction=b}})}(jQuery,FooTable),function(a,b){b.Sorting=b.Component.extend({construct:function(a){this._super(a,a.o.sorting.enabled),this.o=a.o.sorting,this.column=null,this.allowed=!0,this.initial=null},preinit:function(a){var c=this;this.ft.raise("preinit.ft.sorting",[a]).then(function(){c.ft.$el.hasClass("footable-sorting")&&(c.enabled=!0),c.enabled=b.is["boolean"](a.sorting)?a.sorting:c.enabled,c.enabled&&(c.column=b.arr.first(c.ft.columns.array,function(a){return a.sorted}))},function(){c.enabled=!1})},init:function(){var c=this;this.ft.raise("init.ft.sorting").then(function(){if(!c.initial){var d=!!c.column;c.initial={isset:d,rows:c.ft.rows.all.slice(0),column:d?c.column.name:null,direction:d?c.column.direction:null}}b.arr.each(c.ft.columns.array,function(b){b.sortable&&b.$el.addClass("footable-sortable").append(a("<span/>",{"class":"fooicon fooicon-sort"}))}),c.ft.$el.on("click.footable",".footable-sortable",{self:c},c._onSortClicked)},function(){c.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.paging").then(function(){a.ft.$el.off("click.footable",".footable-sortable",a._onSortClicked),a.ft.$el.children("thead").children("tr.footable-header").children(".footable-sortable").removeClass("footable-sortable footable-asc footable-desc").find("span.fooicon").remove()})},predraw:function(){if(this.column){var a=this,b=a.column;a.ft.rows.array.sort(function(a,c){return"DESC"==b.direction?b.sorter(c.cells[b.index].sortValue,a.cells[b.index].sortValue):b.sorter(a.cells[b.index].sortValue,c.cells[b.index].sortValue)})}},draw:function(){if(this.column){var a=this,b=a.ft.$el.find("thead > tr > .footable-sortable"),c=a.column.$el;b.removeClass("footable-asc footable-desc").children(".fooicon").removeClass("fooicon-sort fooicon-sort-asc fooicon-sort-desc"),b.not(c).children(".fooicon").addClass("fooicon-sort"),c.addClass("DESC"==a.column.direction?"footable-desc":"footable-asc").children(".fooicon").addClass("DESC"==a.column.direction?"fooicon-sort-desc":"fooicon-sort-asc")}},sort:function(a,b){return this._sort(a,b)},toggleAllowed:function(a){a=b.is["boolean"](a)?a:!this.allowed,this.allowed=a,this.ft.$el.toggleClass("footable-sorting-disabled",!this.allowed)},hasChanged:function(){return!(!this.initial||!this.column||this.column.name===this.initial.column&&(this.column.direction===this.initial.direction||null===this.initial.direction&&"ASC"===this.column.direction))},reset:function(){this.initial&&(this.initial.isset?this.sort(this.initial.column,this.initial.direction):(this.column&&(this.column.$el.removeClass("footable-asc footable-desc"),this.column=null),this.ft.rows.all=this.initial.rows,this.ft.draw()))},_sort:function(c,d){if(!this.allowed)return a.Deferred().reject("sorting disabled");var e=this,f=new b.Sorter(e.ft.columns.get(c),b.Sorting.dir(d));return e.ft.raise("before.ft.sorting",[f]).then(function(){return b.arr.each(e.ft.columns.array,function(a){a!=e.column&&(a.direction=null)}),e.column=e.ft.columns.get(f.column),e.column&&(e.column.direction=b.Sorting.dir(f.direction)),e.ft.draw().then(function(){e.ft.raise("after.ft.sorting",[f])})})},_onSortClicked:function(b){var c=b.data.self,d=a(this).closest("th,td"),e=d.is(".footable-asc, .footable-desc")?d.hasClass("footable-desc")?"ASC":"DESC":"ASC";c._sort(d.index(),e)}}),b.Sorting.dir=function(a){return!b.is.string(a)||"ASC"!=a&&"DESC"!=a?"ASC":a},b.components.register("sorting",b.Sorting,600)}(jQuery,FooTable),function(a){a.Cell.prototype.sortValue=null,a.Cell.prototype.__sorting_define__=function(a){this.sortValue=this.column.sortValue.call(this.column,a)},a.Cell.prototype.__sorting_val__=function(b){a.is.defined(b)&&(this.sortValue=this.column.sortValue.call(this.column,b))},a.Cell.extend("define",function(a){this._super(a),this.__sorting_define__(a)}),a.Cell.extend("val",function(a,b,c){var d=this._super(a,b,c);return this.__sorting_val__(a),d})}(FooTable),function(a,b){b.Column.prototype.direction=null,b.Column.prototype.sortable=!0,b.Column.prototype.sorted=!1,b.Column.prototype.sorter=function(a,b){return"string"==typeof a&&(a=a.toLowerCase()),"string"==typeof b&&(b=b.toLowerCase()),a===b?0:b>a?-1:1},b.Column.prototype.sortValue=function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("sortValue");return b.is.defined(d)?d:this.parser(c)}if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.sortValue))return c.options.sortValue;b.is.defined(c.value)&&(c=c.value)}return b.is.defined(c)&&null!=c?c:null},b.Column.prototype.__sorting_define__=function(a){this.sorter=b.checkFnValue(this,a.sorter,this.sorter),this.direction=b.is.type(a.direction,"string")?b.Sorting.dir(a.direction):null,this.sortable=b.is["boolean"](a.sortable)?a.sortable:!0,this.sorted=b.is["boolean"](a.sorted)?a.sorted:!1,this.sortValue=b.checkFnValue(this,a.sortValue,this.sortValue)},b.Column.extend("define",function(a){this._super(a),this.__sorting_define__(a)})}(jQuery,FooTable),function(a){a.Defaults.prototype.sorting={enabled:!1}}(FooTable),function(a,b){b.HTMLColumn.extend("__sorting_define__",function(c){this._super(c),this.sortUse=b.is.string(c.sortUse)&&-1!==a.inArray(c.sortUse,["html","text"])?c.sortUse:"html"}),b.HTMLColumn.prototype.sortValue=function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("sortValue");return b.is.defined(d)?d:this.parser(c)}if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.sortValue))return c.options.sortValue;b.is.defined(c.value)&&(c=c.value)}return b.is.defined(c)&&null!=c?c:null}}(jQuery,FooTable),function(a,b){b.NumberColumn.prototype.sortValue=function(c){if(b.is.element(c)||b.is.jq(c)){var d=a(c).data("sortValue");return b.is.number(d)?d:this.parser(c)}if(b.is.hash(c)&&b.is.hash(c.options)){if(b.is.string(c.options.sortValue))return this.parser(c);if(b.is.number(c.options.sortValue))return c.options.sortValue;if(b.is.number(c.value))return c.value}return b.is.string(c)?this.parser(c):b.is.number(c)?c:null}}(jQuery,FooTable),function(a){a.Table.prototype.sort=function(b,c){return this.use(a.Sorting).sort(b,c)}}(FooTable),function(a,b){b.Pager=b.Class.extend({construct:function(a,b,c,d,e){this.total=a,this.current=b,this.size=c,this.page=d,this.forward=e}})}(jQuery,FooTable),function(a,b){b.Paging=b.Component.extend({construct:function(a){this._super(a,a.o.paging.enabled),this.strings=a.o.paging.strings,this.current=a.o.paging.current,this.size=a.o.paging.size,this.limit=a.o.paging.limit,this.position=a.o.paging.position,this.countFormat=a.o.paging.countFormat,this.container=a.o.paging.container,this.total=-1,this.totalRows=0,this.previous=-1,this.formattedCount=null,this.$container=null,this.$wrapper=null,this.$row=null,this.$cell=null,this.$pagination=null,this.$count=null,this.detached=!0,this._createdLinks=0},preinit:function(a){var c=this;this.ft.raise("preinit.ft.paging",[a]).then(function(){c.ft.$el.hasClass("footable-paging")&&(c.enabled=!0),c.enabled=b.is["boolean"](a.paging)?a.paging:c.enabled,c.enabled&&(c.size=b.is.number(a.pagingSize)?a.pagingSize:c.size,c.current=b.is.number(a.pagingCurrent)?a.pagingCurrent:c.current,c.limit=b.is.number(a.pagingLimit)?a.pagingLimit:c.limit,c.ft.$el.hasClass("footable-paging-left")&&(c.position="left"),c.ft.$el.hasClass("footable-paging-center")&&(c.position="center"),c.ft.$el.hasClass("footable-paging-right")&&(c.position="right"),c.position=b.is.string(a.pagingPosition)?a.pagingPosition:c.position,c.countFormat=b.is.string(a.pagingCountFormat)?a.pagingCountFormat:c.countFormat,c.container=b.is.string(a.pagingContainer)?a.pagingContainer:c.container,c.total=Math.ceil(c.ft.rows.all.length/c.size))},function(){c.enabled=!1})},init:function(){var a=this;this.ft.raise("init.ft.paging").then(function(){a.$create()},function(){a.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.paging").then(function(){a.ft.$el.removeClass("footable-paging").find("tfoot > tr.footable-paging").remove(),a.detached=!0,a._createdLinks=0})},predraw:function(){this.total=Math.ceil(this.ft.rows.array.length/this.size),this.current=this.current>this.total?this.total:this.current<1?1:this.current,this.totalRows=this.ft.rows.array.length,this.totalRows>this.size&&(this.ft.rows.array=this.ft.rows.array.splice((this.current-1)*this.size,this.size)),this.formattedCount=this.format(this.countFormat)},draw:function(){if(this.total<=1)this.detached||(this.$row?this.$row.detach():this.$wrapper.detach(),this.detached=!0);else{if(this.detached){if(this.$row){var c=this.ft.$el.children("tfoot");0==c.length&&(c=a("<tfoot/>"),this.ft.$el.append(c)),this.$row.appendTo(c)}else this.$wrapper.appendTo(this.$container);this.detached=!1}b.is.jq(this.$cell)&&this.$cell.attr("colspan",this.ft.columns.visibleColspan),this._createLinks(),this._setVisible(this.current,this.current>this.previous),this._setNavigation(!0),this.$count.text(this.formattedCount)}},$create:function(){this._createdLinks=0;var c="footable-paging-center";switch(this.position){case"left":c="footable-paging-left";break;case"right":c="footable-paging-right"}if(this.ft.$el.addClass("footable-paging").addClass(c),this.$container=null===this.container?null:a(this.container).first(),b.is.jq(this.$container))this.$container.addClass("footable-paging-external").addClass(c);else{var d=this.ft.$el.children("tfoot");0==d.length&&(d=a("<tfoot/>"),this.ft.$el.append(d)),this.$row=a("<tr/>",{"class":"footable-paging"}).prependTo(d),this.$container=this.$cell=a("<td/>").attr("colspan",this.ft.columns.visibleColspan).appendTo(this.$row)}this.$wrapper=a("<div/>",{"class":"footable-pagination-wrapper"}).appendTo(this.$container),this.$pagination=a("<ul/>",{"class":"pagination"}).on("click.footable","a.footable-page-link",{self:this},this._onPageClicked),this.$count=a("<span/>",{"class":"label label-default"}),this.$wrapper.append(this.$pagination,a("<div/>",{"class":"divider"}),this.$count),this.detached=!1},format:function(a){var b=this.size*(this.current-1)+1,c=this.size*this.current;return 0==this.ft.rows.array.length?(b=0,c=0):c=c>this.totalRows?this.totalRows:c,a.replace(/\{CP}/g,this.current).replace(/\{TP}/g,this.total).replace(/\{PF}/g,b).replace(/\{PL}/g,c).replace(/\{TR}/g,this.totalRows)},first:function(){return this._set(1)},prev:function(){return this._set(this.current-1>0?this.current-1:1)},next:function(){return this._set(this.current+1<this.total?this.current+1:this.total)},last:function(){return this._set(this.total)},"goto":function(a){return this._set(a>this.total?this.total:1>a?1:a)},prevPages:function(){var a=this.$pagination.children("li.footable-page.visible:first").data("page")-1;this._setVisible(a,!0),this._setNavigation(!1)},nextPages:function(){var a=this.$pagination.children("li.footable-page.visible:last").data("page")+1;this._setVisible(a,!1),this._setNavigation(!1)},pageSize:function(a){return a=parseInt(a),isNaN(a)?this.size:(this.size=a,this.total=Math.ceil(this.ft.rows.all.length/this.size),b.is.jq(this.$wrapper)&&(this.$container.is("td")?this.$row.remove():this.$wrapper.remove()),this.$create(),void this.ft.draw())},_set:function(c){var d=this,e=new b.Pager(d.total,d.current,d.size,c,c>d.current);return d.ft.raise("before.ft.paging",[e]).then(function(){return e.page=e.page>e.total?e.total:e.page,e.page=e.page<1?1:e.page,d.current==c?a.when():(d.previous=d.current,d.current=e.page,d.ft.draw().then(function(){d.ft.raise("after.ft.paging",[e])}))})},_createLinks:function(){if(this._createdLinks!==this.total){var b=this,c=b.total>1,d=function(b,c,d){return a("<li/>",{"class":d}).attr("data-page",b).append(a("<a/>",{"class":"footable-page-link",href:"#"}).data("page",b).html(c))};b.$pagination.empty(),c&&(b.$pagination.append(d("first",b.strings.first,"footable-page-nav")),b.$pagination.append(d("prev",b.strings.prev,"footable-page-nav")),b.limit>0&&b.limit<b.total&&b.$pagination.append(d("prev-limit",b.strings.prevPages,"footable-page-nav")));for(var e,f=0;f<b.total;f++)e=d(f+1,f+1,"footable-page"),b.$pagination.append(e);c&&(b.limit>0&&b.limit<b.total&&b.$pagination.append(d("next-limit",b.strings.nextPages,"footable-page-nav")),b.$pagination.append(d("next",b.strings.next,"footable-page-nav")),b.$pagination.append(d("last",b.strings.last,"footable-page-nav"))),b._createdLinks=b.total}},_setNavigation:function(a){1==this.current?this.$pagination.children('li[data-page="first"],li[data-page="prev"]').addClass("disabled"):this.$pagination.children('li[data-page="first"],li[data-page="prev"]').removeClass("disabled"),this.current==this.total?this.$pagination.children('li[data-page="next"],li[data-page="last"]').addClass("disabled"):this.$pagination.children('li[data-page="next"],li[data-page="last"]').removeClass("disabled"),1==(this.$pagination.children("li.footable-page.visible:first").data("page")||1)?this.$pagination.children('li[data-page="prev-limit"]').addClass("disabled"):this.$pagination.children('li[data-page="prev-limit"]').removeClass("disabled"),(this.$pagination.children("li.footable-page.visible:last").data("page")||this.limit)==this.total?this.$pagination.children('li[data-page="next-limit"]').addClass("disabled"):this.$pagination.children('li[data-page="next-limit"]').removeClass("disabled"),this.limit>0&&this.total<this.limit?this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').css("display","none"):this.$pagination.children('li[data-page="prev-limit"],li[data-page="next-limit"]').css("display",""),
-a&&this.$pagination.children("li.footable-page").removeClass("active").filter('li[data-page="'+this.current+'"]').addClass("active")},_setVisible:function(a,b){if(this.limit>0&&this.total>this.limit){if(!this.$pagination.children('li.footable-page[data-page="'+a+'"]').hasClass("visible")){var c=0,d=0;1==b?(d=a>this.total?this.total:a,c=d-this.limit):(c=1>a?0:a-1,d=c+this.limit),0>c&&(c=0,d=this.limit>this.total?this.total:this.limit),d>this.total&&(d=this.total,c=this.total-this.limit<0?0:this.total-this.limit),this.$pagination.children("li.footable-page").removeClass("visible").slice(c,d).addClass("visible")}}else this.$pagination.children("li.footable-page").removeClass("visible").slice(0,this.total).addClass("visible")},_onPageClicked:function(b){if(b.preventDefault(),!a(b.target).closest("li").is(".active,.disabled")){var c=b.data.self,d=a(this).data("page");switch(d){case"first":return void c.first();case"prev":return void c.prev();case"next":return void c.next();case"last":return void c.last();case"prev-limit":return void c.prevPages();case"next-limit":return void c.nextPages();default:return void c._set(d)}}}}),b.components.register("paging",b.Paging,400)}(jQuery,FooTable),function(a){a.Defaults.prototype.paging={enabled:!1,countFormat:"{CP} of {TP}",current:1,limit:5,position:"center",size:10,container:null,strings:{first:"&laquo;",prev:"&lsaquo;",next:"&rsaquo;",last:"&raquo;",prevPages:"...",nextPages:"..."}}}(FooTable),function(a){a.Table.prototype.gotoPage=function(b){return this.use(a.Paging)["goto"](b)},a.Table.prototype.nextPage=function(){return this.use(a.Paging).next()},a.Table.prototype.prevPage=function(){return this.use(a.Paging).prev()},a.Table.prototype.firstPage=function(){return this.use(a.Paging).first()},a.Table.prototype.lastPage=function(){return this.use(a.Paging).last()},a.Table.prototype.nextPages=function(){return this.use(a.Paging).nextPages()},a.Table.prototype.prevPages=function(){return this.use(a.Paging).prevPages()},a.Table.prototype.pageSize=function(b){return this.use(a.Paging).pageSize(b)}}(FooTable),function(a,b){b.Editing=b.Component.extend({construct:function(c){this._super(c,c.o.editing.enabled),this.pageToNew=c.o.editing.pageToNew,this.alwaysShow=c.o.editing.alwaysShow,this.column=a.extend(!0,{},c.o.editing.column,{visible:this.alwaysShow}),this.position=c.o.editing.position,this.showText=c.o.editing.showText,this.hideText=c.o.editing.hideText,this.addText=c.o.editing.addText,this.editText=c.o.editing.editText,this.deleteText=c.o.editing.deleteText,this.viewText=c.o.editing.viewText,this.allowAdd=c.o.editing.allowAdd,this.allowEdit=c.o.editing.allowEdit,this.allowDelete=c.o.editing.allowDelete,this.allowView=c.o.editing.allowView,this._$buttons=null,this.callbacks={addRow:b.checkFnValue(this,c.o.editing.addRow),editRow:b.checkFnValue(this,c.o.editing.editRow),deleteRow:b.checkFnValue(this,c.o.editing.deleteRow),viewRow:b.checkFnValue(this,c.o.editing.viewRow)}},preinit:function(c){var d=this;this.ft.raise("preinit.ft.editing",[c]).then(function(){if(d.ft.$el.hasClass("footable-editing")&&(d.enabled=!0),d.enabled=b.is["boolean"](c.editing)?c.editing:d.enabled,d.enabled){if(d.pageToNew=b.is["boolean"](c.editingPageToNew)?c.editingPageToNew:d.pageToNew,d.alwaysShow=b.is["boolean"](c.editingAlwaysShow)?c.editingAlwaysShow:d.alwaysShow,d.position=b.is.string(c.editingPosition)?c.editingPosition:d.position,d.showText=b.is.string(c.editingShowText)?c.editingShowText:d.showText,d.hideText=b.is.string(c.editingHideText)?c.editingHideText:d.hideText,d.addText=b.is.string(c.editingAddText)?c.editingAddText:d.addText,d.editText=b.is.string(c.editingEditText)?c.editingEditText:d.editText,d.deleteText=b.is.string(c.editingDeleteText)?c.editingDeleteText:d.deleteText,d.viewText=b.is.string(c.editingViewText)?c.editingViewText:d.viewText,d.allowAdd=b.is["boolean"](c.editingAllowAdd)?c.editingAllowAdd:d.allowAdd,d.allowEdit=b.is["boolean"](c.editingAllowEdit)?c.editingAllowEdit:d.allowEdit,d.allowDelete=b.is["boolean"](c.editingAllowDelete)?c.editingAllowDelete:d.allowDelete,d.allowView=b.is["boolean"](c.editingAllowView)?c.editingAllowView:d.allowView,d.column=new b.EditingColumn(d.ft,d,a.extend(!0,{},d.column,c.editingColumn,{visible:d.alwaysShow})),d.ft.$el.hasClass("footable-editing-left")&&(d.position="left"),d.ft.$el.hasClass("footable-editing-right")&&(d.position="right"),"right"===d.position)d.column.index=d.ft.columns.array.length;else{d.column.index=0;for(var e=0,f=d.ft.columns.array.length;f>e;e++)d.ft.columns.array[e].index+=1}d.ft.columns.array.push(d.column),d.ft.columns.array.sort(function(a,b){return a.index-b.index}),d.callbacks.addRow=b.checkFnValue(d,c.editingAddRow,d.callbacks.addRow),d.callbacks.editRow=b.checkFnValue(d,c.editingEditRow,d.callbacks.editRow),d.callbacks.deleteRow=b.checkFnValue(d,c.editingDeleteRow,d.callbacks.deleteRow),d.callbacks.viewRow=b.checkFnValue(d,c.editingViewRow,d.callbacks.viewRow)}},function(){d.enabled=!1})},init:function(){var a=this;this.ft.raise("init.ft.editing").then(function(){a.$create()},function(){a.enabled=!1})},destroy:function(){var a=this;this.ft.raise("destroy.ft.editing").then(function(){a.ft.$el.removeClass("footable-editing footable-editing-always-show footable-editing-no-add footable-editing-no-edit footable-editing-no-delete footable-editing-no-view").off("click.ft.editing").find("tfoot > tr.footable-editing").remove()})},$create:function(){var b=this,c="right"===b.position?"footable-editing-right":"footable-editing-left";b.ft.$el.addClass("footable-editing").addClass(c).on("click.ft.editing",".footable-show",{self:b},b._onShowClick).on("click.ft.editing",".footable-hide",{self:b},b._onHideClick).on("click.ft.editing",".footable-edit",{self:b},b._onEditClick).on("click.ft.editing",".footable-delete",{self:b},b._onDeleteClick).on("click.ft.editing",".footable-view",{self:b},b._onViewClick).on("click.ft.editing",".footable-add",{self:b},b._onAddClick),b.$cell=a("<td/>").attr("colspan",b.ft.columns.visibleColspan).append(b.$buttonShow()),b.allowAdd&&b.$cell.append(b.$buttonAdd()),b.$cell.append(b.$buttonHide()),b.alwaysShow&&b.ft.$el.addClass("footable-editing-always-show"),b.allowAdd||b.ft.$el.addClass("footable-editing-no-add"),b.allowEdit||b.ft.$el.addClass("footable-editing-no-edit"),b.allowDelete||b.ft.$el.addClass("footable-editing-no-delete"),b.allowView||b.ft.$el.addClass("footable-editing-no-view");var d=b.ft.$el.children("tfoot");0==d.length&&(d=a("<tfoot/>"),b.ft.$el.append(d)),b.$row=a("<tr/>",{"class":"footable-editing"}).append(b.$cell).appendTo(d)},$buttonShow:function(){return'<button type="button" class="btn btn-primary footable-show">'+this.showText+"</button>"},$buttonHide:function(){return'<button type="button" class="btn btn-default footable-hide">'+this.hideText+"</button>"},$buttonAdd:function(){return'<button type="button" class="btn btn-primary footable-add">'+this.addText+"</button> "},$buttonEdit:function(){return'<button type="button" class="btn btn-default footable-edit">'+this.editText+"</button> "},$buttonDelete:function(){return'<button type="button" class="btn btn-default footable-delete">'+this.deleteText+"</button>"},$buttonView:function(){return'<button type="button" class="btn btn-default footable-view">'+this.viewText+"</button> "},$rowButtons:function(){return b.is.jq(this._$buttons)?this._$buttons.clone():(this._$buttons=a('<div class="btn-group btn-group-xs" role="group"></div>'),this.allowView&&this._$buttons.append(this.$buttonView()),this.allowEdit&&this._$buttons.append(this.$buttonEdit()),this.allowDelete&&this._$buttons.append(this.$buttonDelete()),this._$buttons)},draw:function(){this.$cell.attr("colspan",this.ft.columns.visibleColspan)},_onEditClick:function(c){c.preventDefault();var d=c.data.self,e=a(this).closest("tr").data("__FooTableRow__");e instanceof b.Row&&d.ft.raise("edit.ft.editing",[e]).then(function(){d.callbacks.editRow.call(d.ft,e)})},_onDeleteClick:function(c){c.preventDefault();var d=c.data.self,e=a(this).closest("tr").data("__FooTableRow__");e instanceof b.Row&&d.ft.raise("delete.ft.editing",[e]).then(function(){d.callbacks.deleteRow.call(d.ft,e)})},_onViewClick:function(c){c.preventDefault();var d=c.data.self,e=a(this).closest("tr").data("__FooTableRow__");e instanceof b.Row&&d.ft.raise("view.ft.editing",[e]).then(function(){d.callbacks.viewRow.call(d.ft,e)})},_onAddClick:function(a){a.preventDefault();var b=a.data.self;b.ft.raise("add.ft.editing").then(function(){b.callbacks.addRow.call(b.ft)})},_onShowClick:function(a){a.preventDefault();var b=a.data.self;b.ft.raise("show.ft.editing").then(function(){b.ft.$el.addClass("footable-editing-show"),b.column.visible=!0,b.ft.draw()})},_onHideClick:function(a){a.preventDefault();var b=a.data.self;b.ft.raise("hide.ft.editing").then(function(){b.ft.$el.removeClass("footable-editing-show"),b.column.visible=!1,b.ft.draw()})}}),b.components.register("editing",b.Editing,850)}(jQuery,FooTable),function(a,b){b.EditingColumn=b.Column.extend({construct:function(a,b,c){this._super(a,c,"editing"),this.editing=b,this.internal=!0},$create:function(){(this.$el=!this.virtual&&b.is.jq(this.$el)?this.$el:a("<th/>",{"class":"footable-editing"})).html(this.title)},parser:function(c){if(b.is.string(c)&&(c=a(a.trim(c))),b.is.element(c)&&(c=a(c)),b.is.jq(c)){var d=c.prop("tagName").toLowerCase();return"td"==d||"th"==d?c.data("value")||c.contents():c}return null},createCell:function(c){var d=this.editing.$rowButtons(),e=a("<td/>").append(d);return b.is.jq(c.$el)&&(0===this.index?e.prependTo(c.$el):e.insertAfter(c.$el.children().eq(this.index-1))),new b.Cell(this.ft,c,this,e||e.html())}}),b.columns.register("editing",b.EditingColumn)}(jQuery,FooTable),function(a,b){b.Defaults.prototype.editing={enabled:!1,pageToNew:!0,position:"right",alwaysShow:!1,addRow:function(){},editRow:function(a){},deleteRow:function(a){},viewRow:function(a){},showText:'<span class="fooicon fooicon-pencil" aria-hidden="true"></span> Edit rows',hideText:"Cancel",addText:"New row",editText:'<span class="fooicon fooicon-pencil" aria-hidden="true"></span>',deleteText:'<span class="fooicon fooicon-trash" aria-hidden="true"></span>',viewText:'<span class="fooicon fooicon-stats" aria-hidden="true"></span>',allowAdd:!0,allowEdit:!0,allowDelete:!0,allowView:!1,column:{classes:"footable-editing",name:"editing",title:"",filterable:!1,sortable:!1}}}(jQuery,FooTable),function(a,b){b.is.defined(b.Paging)&&(b.Paging.prototype.unpaged=[],b.Paging.extend("predraw",function(){this.unpaged=this.ft.rows.array.slice(0),this._super()}))}(jQuery,FooTable),function(a,b){b.Row.prototype.add=function(c){c=b.is["boolean"](c)?c:!0;var d=this;return a.Deferred(function(a){var b=d.ft.rows.all.push(d)-1;return c?d.ft.draw().then(function(){a.resolve(b)}):void a.resolve(b)})},b.Row.prototype["delete"]=function(c){c=b.is["boolean"](c)?c:!0;var d=this;return a.Deferred(function(a){var e=d.ft.rows.all.indexOf(d);return b.is.number(e)&&e>=0&&e<d.ft.rows.all.length&&(d.ft.rows.all.splice(e,1),c)?d.ft.draw().then(function(){a.resolve(d)}):void a.resolve(d)})},b.is.defined(b.Paging)&&b.Row.extend("add",function(a){a=b.is["boolean"](a)?a:!0;var c,d=this,e=this._super(a),f=d.ft.use(b.Editing);return f&&f.pageToNew&&(c=d.ft.use(b.Paging))&&a?e.then(function(){var a=c.unpaged.indexOf(d),b=Math.ceil((a+1)/c.size);return c.current!==b?c["goto"](b):void 0}):e}),b.is.defined(b.Sorting)&&b.Row.extend("val",function(a,c){c=b.is["boolean"](c)?c:!0;var d=this._super(a);if(!b.is.hash(a))return d;var e=this;return c&&e.ft.draw().then(function(){var a,c=e.ft.use(b.Editing);if(b.is.defined(b.Paging)&&c&&c.pageToNew&&(a=e.ft.use(b.Paging))){var d=a.unpaged.indexOf(e),f=Math.ceil((d+1)/a.size);if(a.current!==f)return a["goto"](f)}}),d})}(jQuery,FooTable),function(a){a.Rows.prototype.add=function(b,c){var d=b;a.is.hash(b)&&(d=new FooTable.Row(this.ft,this.ft.columns.array,b)),d instanceof FooTable.Row&&d.add(c)},a.Rows.prototype.update=function(b,c,d){var e=this.ft.rows.all.length,f=b;a.is.number(b)&&b>=0&&e>b&&(f=this.ft.rows.all[b]),f instanceof FooTable.Row&&a.is.hash(c)&&f.val(c,d)},a.Rows.prototype["delete"]=function(b,c){var d=this.ft.rows.all.length,e=b;a.is.number(b)&&b>=0&&d>b&&(e=this.ft.rows.all[b]),e instanceof FooTable.Row&&e["delete"](c)}}(FooTable),function(a,b){var c=0,d=function(a){var b,c,d=2166136261;for(b=0,c=a.length;c>b;b++)d^=a.charCodeAt(b),d+=(d<<1)+(d<<4)+(d<<7)+(d<<8)+(d<<24);return d>>>0}(location.origin+location.pathname);b.State=b.Component.extend({construct:function(a){this._super(a,a.o.state.enabled),this._key="1",this.key=this._key+(b.is.string(a.o.state.key)?a.o.state.key:this._uid()),this.filtering=b.is["boolean"](a.o.state.filtering)?a.o.state.filtering:!0,this.paging=b.is["boolean"](a.o.state.paging)?a.o.state.paging:!0,this.sorting=b.is["boolean"](a.o.state.sorting)?a.o.state.sorting:!0},preinit:function(a){var c=this;this.ft.raise("preinit.ft.state",[a]).then(function(){c.enabled=b.is["boolean"](a.state)?a.state:c.enabled,c.enabled&&(c.key=c._key+(b.is.string(a.stateKey)?a.stateKey:c.key),c.filtering=b.is["boolean"](a.stateFiltering)?a.stateFiltering:c.filtering,c.paging=b.is["boolean"](a.statePaging)?a.statePaging:c.paging,c.sorting=b.is["boolean"](a.stateSorting)?a.stateSorting:c.sorting)},function(){c.enabled=!1})},get:function(a){return JSON.parse(localStorage.getItem(this.key+":"+a))},set:function(a,b){localStorage.setItem(this.key+":"+a,JSON.stringify(b))},remove:function(a){localStorage.removeItem(this.key+":"+a)},read:function(){this.ft.execute(!1,!0,"readState")},write:function(){this.ft.execute(!1,!0,"writeState")},clear:function(){this.ft.execute(!1,!0,"clearState")},_uid:function(){var a=this.ft.$el.attr("id");return d+"_"+(b.is.string(a)?a:++c)}}),b.components.register("state",b.State,700)}(jQuery,FooTable),function(a){a.Component.prototype.readState=function(){},a.Component.prototype.writeState=function(){},a.Component.prototype.clearState=function(){}}(FooTable),function(a){a.Defaults.prototype.state={enabled:!1,filtering:!0,paging:!0,sorting:!0,key:null}}(FooTable),function(a){a.Filtering&&(a.Filtering.prototype.readState=function(){if(this.ft.state.filtering){var b=this.ft.state.get("filtering");a.is.hash(b)&&!a.is.emptyArray(b.filters)&&(this.filters=this.ensure(b.filters))}},a.Filtering.prototype.writeState=function(){if(this.ft.state.filtering){var b=a.arr.map(this.filters,function(b){return{name:b.name,query:b.query instanceof a.Query?b.query.val():b.query,columns:a.arr.map(b.columns,function(a){return a.name}),hidden:b.hidden,space:b.space,connectors:b.connectors,ignoreCase:b.ignoreCase}});this.ft.state.set("filtering",{filters:b})}},a.Filtering.prototype.clearState=function(){this.ft.state.filtering&&this.ft.state.remove("filtering")})}(FooTable),function(a){a.Paging&&(a.Paging.prototype.readState=function(){if(this.ft.state.paging){var b=this.ft.state.get("paging");a.is.hash(b)&&(this.current=b.current,this.size=b.size)}},a.Paging.prototype.writeState=function(){this.ft.state.paging&&this.ft.state.set("paging",{current:this.current,size:this.size})},a.Paging.prototype.clearState=function(){this.ft.state.paging&&this.ft.state.remove("paging")})}(FooTable),function(a){a.Sorting&&(a.Sorting.prototype.readState=function(){if(this.ft.state.sorting){var b=this.ft.state.get("sorting");if(a.is.hash(b)){var c=this.ft.columns.get(b.column);c instanceof a.Column&&(this.column=c,this.column.direction=b.direction)}}},a.Sorting.prototype.writeState=function(){this.ft.state.sorting&&this.column instanceof a.Column&&this.ft.state.set("sorting",{column:this.column.name,direction:this.column.direction})},a.Sorting.prototype.clearState=function(){this.ft.state.sorting&&this.ft.state.remove("sorting")})}(FooTable),function(a){a.Table.extend("_construct",function(a){return this.state=this.use(FooTable.State),this._super(a)}),a.Table.extend("_preinit",function(){var a=this;return a._super().then(function(){a.state.enabled&&a.state.read()})}),a.Table.extend("draw",function(){var a=this;return a._super().then(function(){a.state.enabled&&a.state.write()})})}(FooTable),function(a,b){b.Export=b.Component.extend({construct:function(a){this._super(a,!0),this.snapshot=[]},predraw:function(){this.snapshot=this.ft.rows.array.slice(0)},columns:function(){var a=[];return b.arr.each(this.ft.columns.array,function(b){b.internal||a.push({type:b.type,name:b.name,title:b.title,visible:b.visible,hidden:b.hidden,classes:b.classes,style:b.style})}),a},rows:function(a){a=b.is["boolean"](a)?a:!1;var c=a?this.ft.rows.all:this.snapshot,d=[];return b.arr.each(c,function(a){d.push(a.val())}),d},json:function(a){return JSON.parse(JSON.stringify({columns:this.columns(),rows:this.rows(a)}))},csv:function(a){var c,d,e="",f=this.columns();b.arr.each(f,function(a,b){d='"'+a.title.replace(/"/g,'""')+'"',e+=0===b?d:","+d}),e+="\n";var g=a?this.ft.rows.all:this.snapshot;return b.arr.each(g,function(a){b.arr.each(a.cells,function(a,b){a.column.internal||(c=a.column.stringify.call(a.column,a.value,a.ft.o,a.row.value),d='"'+c.replace(/"/g,'""')+'"',e+=0===b?d:","+d)}),e+="\n"}),e}}),b.components.register("export",b.Export,490)}(jQuery,FooTable),function(a){a.Column.prototype.__export_define__=function(b){this.stringify=a.checkFnValue(this,b.stringify,this.stringify)},a.Column.extend("define",function(a){this._super(a),this.__export_define__(a)}),a.Column.prototype.stringify=function(a,b,c){return a+""},a.is.defined(a.DateColumn)&&(a.DateColumn.prototype.stringify=function(b,c,d){return a.is.object(b)&&a.is["boolean"](b._isAMomentObject)&&b.isValid()?b.format(this.formatString):""}),a.ObjectColumn.prototype.stringify=function(b,c,d){return a.is.object(b)?JSON.stringify(b):""},a.ArrayColumn.prototype.stringify=function(b,c,d){return a.is.array(b)?JSON.stringify(b):""}}(FooTable),function(a){a.Table.prototype.toJSON=function(b){return this.use(a.Export).json(b)},a.Table.prototype.toCSV=function(b){return this.use(a.Export).csv(b)}}(FooTable);
\ No newline at end of file
diff --git a/src/websrc/index.html b/src/websrc/index.html
index 913e8d81c..e5391c8f5 100644
--- a/src/websrc/index.html
+++ b/src/websrc/index.html
@@ -192,7 +192,7 @@
                         <div class="modal-body">
                             <div>
                                 <div>
-                                    <button id="updateb" onclick="switchfirmware()" type="submit" class="btn btn-success btn-sm pull-right">Official Release</button>
+                                    <button id="updateb" onclick="switchfirmware()" type="submit" class="btn btn-success btn-sm pull-right">Release</button>
                                 </div>
 
                                 <div id="onlineupdate">
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index b23e0c091..a14e1e422 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -100,7 +100,6 @@
         </span>
         <br>
     </div>
-
     <div class="row form-group">
         <label class="col-xs-3">Serial Port<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
@@ -115,7 +114,6 @@
         </div>
         <br>
     </div>
-
     <div class="row form-group">
         <label class="col-xs-3">Event Logging<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
@@ -128,16 +126,26 @@
                     <input type="radio" value="0" name="logeventsenabled" checked>Disabled</label>
             </form>
         </div>
-        <br>
-        <br>
-        <div class="col-xs-9 col-md-8">
-            <button onclick="savegeneral()" class="btn btn-primary btn-sm pull-right">Save</button>
-        </div>
     </div>
-    <div style="clear:both;">
-        <br>
-        <br>
+    <div class="row form-group">
+        <label class="col-xs-3">Event Log Server IP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                data-content="IP address of the SysLog server"></i></label>
+        <span class="col-xs-9">
+            <input class="form-control input-sm" value="" style="display:inline;max-width:185px" id="log_ip"
+                type="text">
+        </span>
     </div>
+    <br>
+    <br>
+    <div class="col-xs-9 col-md-8">
+        <button onclick="savegeneral()" class="btn btn-primary btn-sm pull-right">Save</button>
+    </div>
+</div>
+<div style="clear:both;">
+    <br>
+    <br>
+</div>
 </div>
 <br>
 </div>
@@ -304,7 +312,8 @@
         </span>
 
         <br><br>
-        <h6 style="margin-left: 10px;" class="text-muted">If you're not using DHCP and want a fixed IP address enter the values below:</h6>
+        <h6 style="margin-left: 10px;" class="text-muted">If you're not using DHCP and want a fixed IP address enter the
+            values below:</h6>
 
         <br>
         <label class="col-xs-3">Static IP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
@@ -494,26 +503,22 @@
                     </tr>
                 </table>
             </div>
-            <div class="panel panel-default table-responsive">
-                <table class="table">
-                    <caption>MQTT</caption>
-                    <tr>
-                        <td>
-                            <div id="mqttconnected"></div>
-                        </td>
-                        <td>
-                            <div id="mqttheartbeat"></div>
-                        </td>
-                    </tr>
-                </table>
 
-                <div class="panel-heading">
-                    <div class="panel-title" id="mqttloghdr"></div>
-                </div>
-                <div>
-                    <table id="mqttlogtable" class="table" data-paging="false" data-filtering="false"
-                        data-sorting="false" data-editing="false" data-state="true"></table>
-                </div>
+            <div class="panel panel-default table-responsive">
+                <table class="table table-hover table-striped table-condensed" border=1>
+                    <caption>MQTT&nbsp;&nbsp;<div id="mqttconnected"></div>&nbsp;<div id="mqttheartbeat"></div>
+                    </caption>
+                    <thead>
+                        <tr>
+                            <th>Time</th>
+                            <th>Topic<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+                                    aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
+                                    id="mqttloghdr"></i></th>
+                            <th>Payload</th>
+                        </tr>
+                    </thead>
+                    <tbody id="mqttlog"></tbody>
+                </table>
             </div>
         </div>
     </div>
diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index f1a92ed5c..04a07161a 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -3,7 +3,6 @@ var version = "";
 var websock = null;
 var wsUri = "ws://" + window.location.host + "/ws";
 var ntpSeconds;
-var data = [];
 var ajaxobj;
 
 var custom_config = {};
@@ -11,8 +10,6 @@ var custom_config = {};
 var xDown = null;
 var yDown = null;
 
-var page = 1;
-var haspages;
 var file = {};
 var backupstarted = false;
 var updateurl = "";
@@ -122,6 +119,8 @@ function savegeneral() {
         config.general.log_events = true;
     }
 
+    config.general.log_ip = document.getElementById("log_ip").value;
+
     saveconfig();
 }
 
@@ -287,6 +286,9 @@ function listgeneral() {
     if (config.general.log_events) {
         $("input[name=\"logeventsenabled\"][value=\"1\"]").prop("checked", true);
     }
+
+    document.getElementById("log_ip").value = config.general.log_ip;
+
 }
 
 function listmqtt() {
@@ -346,20 +348,6 @@ function isVisible(e) {
     return !!(e.offsetWidth || e.offsetHeight || e.getClientRects().length);
 }
 
-function getnextpage(mode) {
-    if (!backupstarted) {
-        document.getElementById("loadpages").innerHTML = "Loading " + page + "/" + haspages;
-    }
-
-    if (page < haspages) {
-        page = page + 1;
-        var commandtosend = {};
-        commandtosend.command = mode;
-        commandtosend.page = page;
-        websock.send(JSON.stringify(commandtosend));
-    }
-}
-
 function colorStatusbar(ref) {
     var percentage = ref.style.width.slice(0, -1);
     if (percentage > 50) { ref.className = "progress-bar progress-bar-success"; } else if (percentage > 25) { ref.className = "progress-bar progress-bar-warning"; } else { ref.class = "progress-bar progress-bar-danger"; }
@@ -403,8 +391,40 @@ function listStats() {
         document.getElementById("mqttheartbeat").className = "label label-primary";
     }
 
-    document.getElementById("mqttloghdr").innerHTML = "MQTT Publish Log: (topics are prefixed with <b>" + ajaxobj.mqttloghdr + "</b>)";
+    document.getElementById("mqttloghdr").setAttribute('data-content', "Topics are prefixed with " + ajaxobj.mqttloghdr);
 
+    var mtable = document.getElementById("mqttlog");
+    var obj = ajaxobj.mqttlog;
+    var tr, td;
+
+    for (var i = 0; i < obj.length; i++) {
+        tr = document.createElement("tr");
+
+        td = document.createElement("td");
+
+        if (obj[i].time < 1563300000) {
+            td.innerHTML = "(" + obj[i].time + ")";
+        } else {
+            var vuepoch = new Date(obj[i].time * 1000);
+            td.innerHTML = vuepoch.getUTCFullYear() +
+                "-" + twoDigits(vuepoch.getUTCMonth() + 1) +
+                "-" + twoDigits(vuepoch.getUTCDate()) +
+                " " + twoDigits(vuepoch.getUTCHours()) +
+                ":" + twoDigits(vuepoch.getUTCMinutes()) +
+                ":" + twoDigits(vuepoch.getUTCSeconds());
+        }
+        tr.appendChild(td);
+
+        td = document.createElement("td");
+        td.innerHTML = obj[i].topic
+        tr.appendChild(td);
+
+        td = document.createElement("td");
+        td.innerHTML = obj[i].payload
+        tr.appendChild(td);
+
+        mtable.appendChild(tr);
+    }
 }
 
 function getContent(contentname) {
@@ -430,19 +450,6 @@ function getContent(contentname) {
                 case "#networkcontent":
                     listnetwork();
                     break;
-                case "#eventcontent":
-                    page = 1;
-                    data = [];
-                    getEvents();
-
-                    if (config.general.log_events) {
-                        document.getElementById("logevents").style.display = "none";
-                    } else {
-                        document.getElementById("logevents").style.display = "block";
-                    }
-
-                    break;
-
                 case "#customcontent":
                     listcustom();
                     break;
@@ -562,60 +569,12 @@ function twoDigits(value) {
     return value;
 }
 
-function initMQTTLogTable() {
-    var newlist = [];
-    for (var i = 0; i < ajaxobj.mqttlog.length; i++) {
-        var data = JSON.stringify(ajaxobj.mqttlog[i]);
-        newlist[i] = {};
-        newlist[i].options = {};
-        newlist[i].value = {};
-        newlist[i].value = JSON.parse(data);
-        newlist[i].options.classes = "warning";
-        newlist[i].options.style = "color: blue";
-    }
-    jQuery(function ($) {
-        window.FooTable.init("#mqttlogtable", {
-            columns: [{
-                "name": "time",
-                "title": "Last Published",
-                "style": { "min-width": "160px" },
-                "parser": function (value) {
-                    if (value < 1563300000) {
-                        return "(" + value + ")";
-                    } else {
-                        var vuepoch = new Date(value * 1000);
-                        var formatted = vuepoch.getUTCFullYear() +
-                            "-" + twoDigits(vuepoch.getUTCMonth() + 1) +
-                            "-" + twoDigits(vuepoch.getUTCDate()) +
-                            " " + twoDigits(vuepoch.getUTCHours()) +
-                            ":" + twoDigits(vuepoch.getUTCMinutes()) +
-                            ":" + twoDigits(vuepoch.getUTCSeconds());
-                        return formatted;
-                    }
-                },
-                "breakpoints": "xs sm"
-            },
-            {
-                "name": "topic",
-                "title": "Topic",
-            },
-            {
-                "name": "payload",
-                "title": "Payload",
-            },
-            ],
-            rows: newlist
-        });
-    });
-}
-
 function socketMessageListener(evt) {
     var obj = JSON.parse(evt.data);
     if (obj.hasOwnProperty("command")) {
         switch (obj.command) {
             case "status":
                 ajaxobj = obj;
-                initMQTTLogTable();
                 getContent("#statuscontent");
                 break;
             case "custom_settings":
@@ -757,13 +716,13 @@ function login() {
     }
 }
 
-function switchfirmware() {
+function getfirmware() {
     if (use_beta_firmware) {
         use_beta_firmware = false;
-        document.getElementById("updateb").innerHTML = "Official Release";
+        document.getElementById("updateb").innerHTML = "Switch to Development build";
     } else {
         use_beta_firmware = true;
-        document.getElementById("updateb").innerHTML = "Development Build";
+        document.getElementById("updateb").innerHTML = "Switch to Stable release";
     }
     getLatestReleaseInfo();
 }
@@ -855,7 +814,7 @@ $("#backup").click(function () { getContent("#backupcontent"); return false; });
 $("#reset").click(function () { $("#destroy").modal("show"); return false; });
 $("#restart").click(function () { $("#reboot").modal("show"); return false; });
 $(".noimp").on("click", function () { $("#noimp").modal("show"); });
-$("#update").on("shown.bs.modal", function (e) { getLatestReleaseInfo(); });
+$("#update").on("shown.bs.modal", function (e) { getfirmware(); });
 
 document.addEventListener("touchstart", handleTouchStart, false);
 document.addEventListener("touchmove", handleTouchMove, false);
diff --git a/tools/webfilesbuilder/gulpfile.js b/tools/webfilesbuilder/gulpfile.js
index 883411742..974e741b5 100644
--- a/tools/webfilesbuilder/gulpfile.js
+++ b/tools/webfilesbuilder/gulpfile.js
@@ -100,7 +100,7 @@ gulp.task('myespjs', function () {
 });
 
 gulp.task('requiredjs', function () {
-    return gulp.src(['../../src/websrc/3rdparty/js/jquery-1.12.4.min.js', '../../src/websrc/3rdparty/js/bootstrap-3.4.1.min.js', '../../src/websrc/3rdparty/js/footable-3.1.6.min.js'])
+    return gulp.src(['../../src/websrc/3rdparty/js/jquery-1.12.4.min.js', '../../src/websrc/3rdparty/js/bootstrap-3.4.1.min.js'])
         .pipe(concat({
             path: 'required.js',
             stat: {
@@ -117,7 +117,7 @@ gulp.task('requiredjs', function () {
 
 
 gulp.task('requiredcss', function () {
-    return gulp.src(['../../src/websrc/3rdparty/css/bootstrap-3.4.1.min.css', '../../src/websrc/3rdparty/css/footable.bootstrap-3.1.6.min.css', '../../src/websrc/3rdparty/css/sidebar.css'])
+    return gulp.src(['../../src/websrc/3rdparty/css/bootstrap-3.4.1.min.css', '../../src/websrc/3rdparty/css/sidebar.css'])
         .pipe(concat({
             path: 'required.css',
             stat: {
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index c2f27bada..8f5353f82 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -64,7 +64,8 @@ var configfile = {
         "password": "admin",
         "serial": true,
         "version": "1.0.0",
-        "log_events": true
+        "log_events": false,
+        "log_ip": "10.11.12.13"
     },
     "mqtt": {
         "enabled": false,

From 01504729d874009ca55a4c60ac256c12cbcc3f61 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 20 Nov 2019 22:40:04 +0100
Subject: [PATCH 094/120] syslog replacing event log -
 https://github.com/proddy/EMS-ESP/issues/242

---
 src/MyESP.cpp        | 31 ++++++++++++++++---------------
 src/MyESP.h          |  2 +-
 src/ems.cpp          | 22 ++++++++++++++++------
 src/websrc/myesp.htm |  2 +-
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 7907ad10e..6c3f97e7b 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -44,9 +44,9 @@ MyESP::MyESP() {
     _suspendOutput       = false;
     _ota_pre_callback_f  = nullptr;
     _ota_post_callback_f = nullptr;
-    _load_average        = 100;  // calculated load average
-    _general_serial      = true; // serial is set to on as default
-    _general_log_events  = true; // all logs are sent to syslog
+    _load_average        = 100;   // calculated load average
+    _general_serial      = true;  // serial is set to on as default
+    _general_log_events  = false; // all logs are not sent to syslog by default
     _general_log_ip      = nullptr;
     _have_ntp_time       = false;
 
@@ -1729,7 +1729,7 @@ bool MyESP::_fs_loadConfig() {
     _general_password  = strdup(general["password"] | MYESP_HTTP_PASSWORD);
     _ws->setAuthentication("admin", _general_password);
     _general_hostname   = strdup(general["hostname"]);
-    _general_log_events = general["log_events"];
+    _general_log_events = general["log_events"] | false;
     _general_log_ip     = strdup(general["log_ip"] | "");
 
     // serial is only on when booting
@@ -1880,7 +1880,7 @@ bool MyESP::fs_saveCustomConfig(JsonObject root) {
         configFile.close();
 
         if (n) {
-            _writeLogEvent(MYESP_SYSLOG_INFO, "Custom config stored in the SPIFFS");
+            writeLogEvent(MYESP_SYSLOG_INFO, "Custom config stored in the SPIFFS");
             ok = true;
         }
     }
@@ -1913,7 +1913,7 @@ bool MyESP::fs_saveConfig(JsonObject root) {
         configFile.close();
 
         if (n) {
-            _writeLogEvent(MYESP_SYSLOG_INFO, "System config stored in the SPIFFS");
+            writeLogEvent(MYESP_SYSLOG_INFO, "System config stored in the SPIFFS");
             ok = true;
         }
 
@@ -2257,7 +2257,7 @@ void MyESP::crashInfo() {
 #endif
 
 // write a log entry to SysLog via UDP
-void MyESP::_writeLogEvent(const uint8_t type, const char * msg) {
+void MyESP::writeLogEvent(const uint8_t type, const char * msg) {
     if (!_general_log_events) {
         return;
     }
@@ -2781,7 +2781,7 @@ void MyESP::_bootupSequence() {
     if (boot_status == MYESP_BOOTSTATUS_BOOTED) {
         if ((_ntp_enabled) && (now() > 10000) && !_have_ntp_time) {
             _have_ntp_time = true;
-            _writeLogEvent(MYESP_SYSLOG_INFO, "System booted");
+            writeLogEvent(MYESP_SYSLOG_INFO, "System booted");
         }
         return;
     }
@@ -2811,7 +2811,7 @@ void MyESP::_bootupSequence() {
 
         // write a log message if we're not using NTP, otherwise wait for the internet time to arrive
         if (!_ntp_enabled) {
-            _writeLogEvent(MYESP_SYSLOG_INFO, "System booted");
+            writeLogEvent(MYESP_SYSLOG_INFO, "System booted");
         }
     }
 }
@@ -2819,7 +2819,7 @@ void MyESP::_bootupSequence() {
 // set up SysLog
 void MyESP::_syslog_setup() {
     // if not enabled or IP is empty, don't bother
-    if ( (!_hasValue(_general_log_ip)) || (!_general_log_events) ) {
+    if ((!_hasValue(_general_log_ip)) || (!_general_log_events)) {
         return;
     }
 
@@ -2831,10 +2831,12 @@ void MyESP::_syslog_setup() {
     syslog.mark_interval(3600);
 
     IPAddress syslog_ip;
-    syslog.destination(syslog_ip.fromString(_general_log_ip));
+    syslog_ip.fromString("192.168.1.4");
+    syslog.destination(syslog_ip);
+
+    logger.info(F("Application started"));
 
     myDebug_P(PSTR("[SYSLOG] System event logging enabled"));
-
 }
 
 // setup MyESP
@@ -2857,8 +2859,6 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
     // print a welcome message
     myDebug_P(PSTR("\n\n* %s version %s"), _app_name, _app_version);
 
-    _syslog_setup(); // SysLog
-
     // set up onboard LED
     pinMode(LED_BUILTIN, OUTPUT);
     digitalWrite(LED_BUILTIN, HIGH);
@@ -2870,6 +2870,7 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
     _wifi_setup();         // WIFI setup
     _mqtt_setup();         // MQTT setup
     _ota_setup();          // init OTA
+    _syslog_setup();       // SysLog
     _webserver_setup();    // init web server
 
     _setSystemCheck(false); // reset system check
@@ -2918,7 +2919,7 @@ void MyESP::loop() {
     }
 
     if (_shouldRestart) {
-        _writeLogEvent(MYESP_SYSLOG_INFO, "System is restarting");
+        writeLogEvent(MYESP_SYSLOG_INFO, "System is restarting");
         myDebug("[SYSTEM] Restarting...");
         _deferredReset(500, CUSTOM_RESET_TERMINAL);
         ESP.restart();
diff --git a/src/MyESP.h b/src/MyESP.h
index d6a72ba4a..851eb433c 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -298,7 +298,7 @@ class MyESP {
     void setUseSerial(bool toggle);
 
     // syslog
-    void _writeLogEvent(const uint8_t type, const char * msg);
+    void writeLogEvent(const uint8_t type, const char * msg);
 
     // FS
     void setSettings(fs_loadsave_callback_f loadsave, fs_setlist_callback_f setlist, bool useSerial = true);
diff --git a/src/ems.cpp b/src/ems.cpp
index afc1db953..f3d093b3b 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -531,7 +531,9 @@ void _debugPrintTelegram(const char * prefix, _EMS_RxTelegram * EMS_RxTelegram,
     }
 
     strlcpy(output_str, "(", sizeof(output_str));
-    strlcat(output_str, COLOR_CYAN, sizeof(output_str));
+
+    if (!raw)
+        strlcat(output_str, COLOR_CYAN, sizeof(output_str));
 
     strlcat(output_str, _smallitoa(t_hour, buffer), sizeof(output_str));
     strlcat(output_str, ":", sizeof(output_str));
@@ -545,9 +547,14 @@ void _debugPrintTelegram(const char * prefix, _EMS_RxTelegram * EMS_RxTelegram,
         strlcat(output_str, _smallitoa3(t_msec, buffer), sizeof(output_str));
     }
 
-    strlcat(output_str, COLOR_RESET, sizeof(output_str));
+    if (!raw)
+        strlcat(output_str, COLOR_RESET, sizeof(output_str));
+
     strlcat(output_str, ") ", sizeof(output_str));
-    strlcat(output_str, color, sizeof(output_str));
+
+    if (!raw)
+        strlcat(output_str, color, sizeof(output_str));
+
     strlcat(output_str, prefix, sizeof(output_str));
 
     if (!raw) {
@@ -569,9 +576,12 @@ void _debugPrintTelegram(const char * prefix, _EMS_RxTelegram * EMS_RxTelegram,
             strlcat(output_str, " #data=", sizeof(output_str));
             strlcat(output_str, itoa(data_len, buffer, 10), sizeof(output_str));
         }
-    }
 
-    strlcat(output_str, COLOR_RESET, sizeof(output_str));
+        strlcat(output_str, COLOR_RESET, sizeof(output_str));
+    } else {
+        // send it the SysLog
+        myESP.writeLogEvent(MYESP_SYSLOG_INFO, output_str);
+    }
 
     myDebug(output_str);
 }
@@ -910,7 +920,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
     }
 
     // if we are in raw logging mode then just print out the telegram as it is
-    // or if we're watching a specific type ID show it
+    // else if we're watching a specific type ID show it and also log an event to the SysLog
     // but still continue to process it
     if ((EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_RAW)) {
         _debugPrintTelegram("", &EMS_RxTelegram, COLOR_WHITE, true);
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index a14e1e422..2ada3ff59 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -130,7 +130,7 @@
     <div class="row form-group">
         <label class="col-xs-3">Event Log Server IP<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="IP address of the SysLog server"></i></label>
+                data-content="IP address of the SysLog server running on UDP port 514"></i></label>
         <span class="col-xs-9">
             <input class="form-control input-sm" value="" style="display:inline;max-width:185px" id="log_ip"
                 type="text">

From 0d6ef68f5fc733f19be457e5c0336916eee8c132 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 20 Nov 2019 22:41:34 +0100
Subject: [PATCH 095/120] trying to optimize memory

---
 platformio.ini | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index f4d018ec4..afc055eeb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,7 +16,6 @@ default_envs = release
 ;custom_flags = -DFORCE_SERIAL -DMYESP_DEBUG
 custom_flags =
 
-#
 # Available lwIP variants (macros):
 #    -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH  = v1.4 Higher Bandwidth (default)
 #    -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY       = v2 Lower Memory
@@ -27,7 +26,8 @@ custom_flags =
 #    -DVTABLES_IN_FLASH
 #    -DNO_GLOBAL_EEPROM
 #    -DBEARSSL_SSL_BASIC 
-general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DBEARSSL_SSL_BASIC -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -DVTABLES_IN_FLASH
+;general_flags =
 
 # From https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld
 #  eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer 
@@ -66,6 +66,7 @@ upload_port = ems-esp.local
 #
 # These following targets are used by TravisCI to build the firmware versions on Release
 # Do not modify
+#
 [env:travis]
 board = esp12e
 build_flags = ${common.build_flags}
@@ -92,7 +93,7 @@ build_flags = ${common.build_flags}
 extra_scripts = scripts/main_script.py
 
 #
-# These two targets (release and debug) can be modified below
+# These two targets below (release and debug) can be modified
 #
 [env:debug]
 board = d1_mini

From c8e85a140f629149484048436d7f5e48b27cd484 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 22 Nov 2019 21:14:38 +0100
Subject: [PATCH 096/120] memory optimizations

---
 platformio.ini | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index afc055eeb..499abe5cd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -26,8 +26,7 @@ custom_flags =
 #    -DVTABLES_IN_FLASH
 #    -DNO_GLOBAL_EEPROM
 #    -DBEARSSL_SSL_BASIC 
-general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -DVTABLES_IN_FLASH
-;general_flags =
+general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DVTABLES_IN_FLASH
 
 # From https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld
 #  eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer 
@@ -39,6 +38,8 @@ build_flags = ${common.general_flags} ${common.build_flags_4m1m}
 [env]
 framework = arduino
 platform = espressif8266
+;platform = https://github.com/platformio/platform-espressif8266#develop
+;platform = https://github.com/platformio/platform-espressif8266#feature/stage
 lib_deps =
   https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
@@ -109,4 +110,4 @@ build_type = release
 build_flags = ${common.build_flags} ${common.custom_flags}
 extra_scripts = 
   pre:scripts/pre_script.py
-  scripts/main_script.py
\ No newline at end of file
+  scripts/main_script.py

From 719755127b0424928704e40cce25eb7ebc43607d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 22 Nov 2019 21:15:07 +0100
Subject: [PATCH 097/120] move buffers off heap

---
 src/MyESP.cpp   | 62 ++++++++++++++++++++++++-------------------------
 src/MyESP.h     | 17 +++++---------
 src/TelnetSpy.h |  2 +-
 src/emsuart.h   |  2 +-
 src/version.h   |  2 +-
 5 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 6c3f97e7b..a01222dc6 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -27,6 +27,8 @@ union system_rtcmem_t {
 static char * _general_password = nullptr;
 static bool   _shouldRestart    = false;
 
+static char _debug_buffer[TELNET_MAX_BUFFER_LENGTH];
+
 uint8_t RtcmemSize = (sizeof(RtcmemData) / 4u);
 auto    Rtcmem     = reinterpret_cast<volatile RtcmemData *>(RTCMEM_ADDR);
 
@@ -142,14 +144,14 @@ void MyESP::myDebug(const char * format, ...) {
     char test[1];
 
     int len = ets_vsnprintf(test, 1, format, args) + 1;
+    if (len > TELNET_MAX_BUFFER_LENGTH - 1) {
+        len = TELNET_MAX_BUFFER_LENGTH;
+    }
 
-    char * buffer = new char[len];
-    ets_vsnprintf(buffer, len, format, args);
+    ets_vsnprintf(_debug_buffer, len, format, args);
     va_end(args);
 
-    SerialAndTelnet.println(buffer);
-
-    delete[] buffer;
+    SerialAndTelnet.println(_debug_buffer);
 }
 
 // for flashmemory. Must use PSTR()
@@ -164,9 +166,11 @@ void MyESP::myDebug_P(PGM_P format_P, ...) {
     va_start(args, format_P);
     char test[1];
     int  len = ets_vsnprintf(test, 1, format, args) + 1;
+    if (len > TELNET_MAX_BUFFER_LENGTH - 1) {
+        len = TELNET_MAX_BUFFER_LENGTH;
+    }
 
-    char * buffer = new char[len];
-    ets_vsnprintf(buffer, len, format, args);
+    ets_vsnprintf(_debug_buffer, len, format, args);
 
     va_end(args);
 
@@ -177,9 +181,7 @@ void MyESP::myDebug_P(PGM_P format_P, ...) {
     SerialAndTelnet.print(timestamp);
 #endif
 
-    SerialAndTelnet.println(buffer);
-
-    delete[] buffer;
+    SerialAndTelnet.println(_debug_buffer);
 }
 
 // use Serial?
@@ -450,7 +452,7 @@ void MyESP::_mqttOnConnect() {
     mqttPublish(MQTT_TOPIC_START, MQTT_TOPIC_START_PAYLOAD, false);
 
     // send heartbeat if enabled
-    _heartbeatCheck(true);
+    _heartbeatCheck();
 
     // call custom function to handle mqtt receives
     (_mqtt_callback_f)(MQTT_CONNECT_EVENT, nullptr, nullptr);
@@ -684,13 +686,13 @@ void MyESP::_kick() {
     }
 
     // kick web
-    myDebug_P(PSTR(" - Restart web server and web sockets"));
+    myDebug_P(PSTR(" - Restarting web server and web sockets"));
     _ws->enable(false);
     //_webServer->reset();
     _ws->enable(true);
 
     // kick mqtt
-    myDebug_P(PSTR(" - Restart MQTT"));
+    myDebug_P(PSTR(" - Restarting MQTT"));
     mqttClient.disconnect();
 }
 
@@ -848,8 +850,8 @@ void MyESP::_printSetCommands() {
 // reset / restart
 void MyESP::resetESP() {
     myDebug_P(PSTR("* Restart ESP..."));
-    _deferredReset(500, CUSTOM_RESET_TERMINAL);
     end();
+    _deferredReset(500, CUSTOM_RESET_TERMINAL);
 #if defined(ARDUINO_ARCH_ESP32)
     ESP.restart();
 #else
@@ -1440,16 +1442,7 @@ void MyESP::showSystemStats() {
     myDebug_P(PSTR(" [MEM] Firmware size: %d"), ESP.getSketchSize());
     myDebug_P(PSTR(" [MEM] Max OTA size: %d"), (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000);
     myDebug_P(PSTR(" [MEM] OTA Reserved: %d"), 4 * SPI_FLASH_SEC_SIZE);
-
-    uint32_t total_memory = _getInitialFreeHeap();
-    uint32_t free_memory  = ESP.getFreeHeap();
-
-    myDebug(" [MEM] Free Heap: %d bytes initially | %d bytes used (%2u%%) | %d bytes free (%2u%%)",
-            total_memory,
-            total_memory - free_memory,
-            100 * (total_memory - free_memory) / total_memory,
-            free_memory,
-            100 * free_memory / total_memory);
+    _printHeap(" [MEM]");
 
     myDebug_P(PSTR(""));
 }
@@ -1457,14 +1450,19 @@ void MyESP::showSystemStats() {
 /*
  * Send heartbeat via MQTT with all system data
  */
-void MyESP::_heartbeatCheck(bool force = false) {
+void MyESP::_heartbeatCheck(bool force) {
     static uint32_t last_heartbeat = 0;
 
     if ((millis() - last_heartbeat > MYESP_HEARTBEAT_INTERVAL) || force) {
         last_heartbeat = millis();
 
+        // print to log if force is set, so at bootup
+        if (force) {
+            _printHeap("[SYSTEM]");
+        }
+
 #ifdef MYESP_DEBUG
-        _printHeap("HEARTBEAT");
+        _printHeap("[HEARTBEAT] ");
 #endif
         if (!isMQTTConnected() || !(_mqtt_heartbeat)) {
             return;
@@ -2666,12 +2664,12 @@ void MyESP::_webserver_setup() {
 }
 
 // print memory
-void MyESP::_printHeap(const char * s) {
+void MyESP::_printHeap(const char * prefix) {
     uint32_t total_memory = _getInitialFreeHeap();
     uint32_t free_memory  = ESP.getFreeHeap();
 
-    myDebug(" [%s] Free Heap: %d bytes initially | %d bytes used (%2u%%) | %d bytes free (%2u%%)",
-            s,
+    myDebug("%s Free Heap: %d bytes initially | %d bytes used (%2u%%) | %d bytes free (%2u%%)",
+            prefix,
             total_memory,
             total_memory - free_memory,
             100 * (total_memory - free_memory) / total_memory,
@@ -2831,7 +2829,7 @@ void MyESP::_syslog_setup() {
     syslog.mark_interval(3600);
 
     IPAddress syslog_ip;
-    syslog_ip.fromString("192.168.1.4");
+    syslog_ip.fromString(_general_log_ip);
     syslog.destination(syslog_ip);
 
     logger.info(F("Application started"));
@@ -2874,7 +2872,7 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
     _webserver_setup();    // init web server
 
     _setSystemCheck(false); // reset system check
-    _heartbeatCheck(true);  // force heartbeat
+    _heartbeatCheck(true);  // force heartbeat, will send out message to log too
 
     _setSystemDropoutCounter(0); // reset # TCP dropouts
 
@@ -2925,7 +2923,7 @@ void MyESP::loop() {
         ESP.restart();
     }
 
-    delay(MYESP_DELAY); // some time to WiFi and everything else to catch up, and prevent overheating
+    delay(MYESP_DELAY); // some time to WiFi and everything else to catch up, calls yield, and also prevent overheating
 }
 
 MyESP myESP;
diff --git a/src/MyESP.h b/src/MyESP.h
index 851eb433c..614775b5d 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -9,7 +9,7 @@
 #ifndef MyESP_h
 #define MyESP_h
 
-#define MYESP_VERSION "1.2.21"
+#define MYESP_VERSION "1.2.22"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
@@ -113,6 +113,7 @@ extern struct rst_info resetInfo;
 // Telnet
 #define TELNET_SERIAL_BAUD 115200
 #define TELNET_MAX_COMMAND_LENGTH 80 // length of a command
+#define TELNET_MAX_BUFFER_LENGTH 300 // max length of telnet string
 #define TELNET_EVENT_CONNECT 1
 #define TELNET_EVENT_DISCONNECT 0
 #define TELNET_EVENT_SHOWCMD 10
@@ -252,12 +253,9 @@ constexpr size_t ArraySize(T (&)[N]) {
 }
 
 #define MYESP_UPTIME_OVERFLOW 4294967295 // Uptime overflow value
-
-// web min and max length of wifi ssid and password
-#define MYESP_MAX_STR_LEN 16
-
-#define MYESP_BOOTUP_FLASHDELAY 50 // flash duration for LED at bootup sequence
-#define MYESP_BOOTUP_DELAY 2000    // time before we open the window to reset. This is to stop resetting values when uploading firmware via USB
+#define MYESP_MAX_STR_LEN 16             // web min and max length of wifi ssid and password
+#define MYESP_BOOTUP_FLASHDELAY 50       // flash duration for LED at bootup sequence
+#define MYESP_BOOTUP_DELAY 2000          // time before we open the window to reset. This is to stop resetting values when uploading firmware via USB
 
 // class definition
 class MyESP {
@@ -480,7 +478,7 @@ class MyESP {
     uint32_t _getUsedHeap();
 
     // heartbeat
-    void _heartbeatCheck(bool force);
+    void _heartbeatCheck(bool force = false);
 
     // web
     web_callback_f _web_callback_f;
@@ -494,9 +492,6 @@ class MyESP {
     void _printScanResult(int networksFound);
     void _sendTime();
     void _webserver_setup();
-    void _webRootPage();
-    void _webResetPage();
-    void _webResetAllPage();
 
     // ntp
     char *   _ntp_server;
diff --git a/src/TelnetSpy.h b/src/TelnetSpy.h
index 1f7b901c7..2b57d0490 100644
--- a/src/TelnetSpy.h
+++ b/src/TelnetSpy.h
@@ -151,7 +151,7 @@
 #ifndef TelnetSpy_h
 #define TelnetSpy_h
 
-#define TELNETSPY_BUFFER_LEN 3000
+#define TELNETSPY_BUFFER_LEN 1000 // was 3000
 #define TELNETSPY_MIN_BLOCK_SIZE 64
 #define TELNETSPY_COLLECTING_TIME 100
 #define TELNETSPY_MAX_BLOCK_SIZE 512
diff --git a/src/emsuart.h b/src/emsuart.h
index 3e3e5550d..99198562f 100644
--- a/src/emsuart.h
+++ b/src/emsuart.h
@@ -13,7 +13,7 @@
 #define EMSUART_CONFIG 0x1C // 8N1 (8 bits, no stop bits, 1 parity)
 #define EMSUART_BAUD 9600   // uart baud rate for the EMS circuit
 
-#define EMS_MAXBUFFERS 5                                // buffers for circular filling to avoid collisions
+#define EMS_MAXBUFFERS 3                                // buffers for circular filling to avoid collisions
 #define EMS_MAXBUFFERSIZE (EMS_MAX_TELEGRAM_LENGTH + 2) // max size of the buffer. EMS packets are max 32 bytes, plus extra 2 for BRKs
 
 #define EMSUART_BIT_TIME 104 // bit time @9600 baud
diff --git a/src/version.h b/src/version.h
index 408a4ffa2..c38a882f1 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b16"
+#define APP_VERSION "1.9.4b17"

From bf901a5dc8a6c76637be95cd1bab1fb52885401c Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 26 Nov 2019 23:33:10 +0100
Subject: [PATCH 098/120] removed tapwater and heating sensors -
 https://github.com/proddy/EMS-ESP/issues/247

---
 doc/home assistant/sensor.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/doc/home assistant/sensor.yaml b/doc/home assistant/sensor.yaml
index f63171665..c91d367d8 100644
--- a/doc/home assistant/sensor.yaml	
+++ b/doc/home assistant/sensor.yaml	
@@ -20,16 +20,6 @@
 
   # boiler
 
-- platform: mqtt
-  state_topic: 'home/ems-esp/boiler_data'
-  name: 'Tap Water'
-  value_template: '{{ value_json.tapwaterActive }}'
-
-- platform: mqtt
-  state_topic: 'home/ems-esp/boiler_data'
-  name: 'Heating'
-  value_template: '{{ value_json.heatingActive }}'
-
 - platform: mqtt
   state_topic: 'home/ems-esp/boiler_data'
   name: 'Warm Water selected temperature'

From 439e0f2400904bc8a1d492c1c83f24cae1d74a1b Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 26 Nov 2019 23:33:28 +0100
Subject: [PATCH 099/120] added example lovelace config that matches the
 screenshot

---
 doc/home assistant/ui-lovelace.yaml | 87 +++++++++++++++++------------
 1 file changed, 50 insertions(+), 37 deletions(-)

diff --git a/doc/home assistant/ui-lovelace.yaml b/doc/home assistant/ui-lovelace.yaml
index 59f96d36e..4f4458658 100644
--- a/doc/home assistant/ui-lovelace.yaml	
+++ b/doc/home assistant/ui-lovelace.yaml	
@@ -1,20 +1,26 @@
-title: Home
-views:
-  
-  - title: Heating
+  - id: ems-esp_id0
+    title: Heating
     cards:
-      - type: entities
+      - id: ems-esp_id1
+        type: glance
+        entities:
+          - entity: binary_sensor.tap_water
+            icon: mdi:fire
+          - entity: binary_sensor.heating
+            icon: mdi:radiator
+      - id: ems-esp_id2
+        type: entities
         title: Boiler
         show_header_toggle: false
         entities:
           - sensor.boiler_boottime
           - sensor.boiler_updated
+          - sensor.ems_esp_status
           - type: divider
           - sensor.warm_water_selected_temperature
           - sensor.warm_water_current_temperature
           - sensor.warm_water_activated
           - sensor.warm_water_3_way_valve
-          - sensor.warm_water_tapwater_flow_rate
           - type: divider
           - sensor.boiler_temperature
           - sensor.return_temperature
@@ -27,36 +33,43 @@ views:
           - sensor.system_pressure
           - sensor.burner_max_power
           - sensor.burner_current_power
-          
-      - type: vertical-stack
+
+      - id: ems-esp_id3
+        type: vertical-stack
         cards:
-        - type: entities
-          title: Shower Monitor
-          show_header_toggle: false
-          entities:
-            - switch.shower_timer
-            - switch.long_shower_alert
-            - type: divider
-            - sensor.last_shower_duration
-            - sensor.showertime_time
-        - type: entity-button
-          icon: mdi:shower-head
-          name: send a cold shot of shower water
-          entity: script.shower_coldshot
-          tap_action:
-            action: call-service
-            service: script.turn_on
-            service_data:
-              entity_id: script.shower_coldshot
+          - type: entities
+            title: Shower Monitor
+            show_header_toggle: false
+            entities:
+              - switch.shower_timer
+              - switch.long_shower_alert
+              - type: divider
+              - sensor.last_shower_duration
+              - sensor.showertime_time
+          - type: entity-button
+            icon: mdi:shower-head
+            name: send a cold shot of shower water
+            entity: script.shower_coldshot
+            tap_action:
+              action: call-service
+              service: script.turn_on
+              service_data:
+                entity_id: script.shower_coldshot
+                
+          - type: history-graph
+            entities:
+              - sensor.ems_esp_wifi
+              - sensor.ems_esp_freemem
             
-      - type: vertical-stack
-        cards:       
-        - type: history-graph
-          entities:
-            - sensor.current_room_temperature
-            - sensor.dark_sky_temperature
-        - type: thermostat
-          entity: climate.thermostat
-        - type: thermostat
-          name: WarmWater
-          entity: climate.boiler
+      - id: ems-esp_id4
+        type: vertical-stack
+        cards:
+          - type: history-graph
+            entities:
+              - sensor.pc_room_sensor_temperature
+              - sensor.current_room_temperature
+              - sensor.dark_sky_temperature
+          - type: thermostat
+            entity: climate.thermostat
+          - type: thermostat
+            entity: climate.boiler

From 5c8377f429bb7ebc1d094a17bbaf5214cce96ea5 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 27 Nov 2019 21:51:43 +0100
Subject: [PATCH 100/120] fix to older arduino core until webui fixed

---
 platformio.ini    |  2 +-
 src/TelnetSpy.cpp | 21 ---------------------
 src/TelnetSpy.h   |  2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 499abe5cd..a4a5b260c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -37,7 +37,7 @@ build_flags = ${common.general_flags} ${common.build_flags_4m1m}
 
 [env]
 framework = arduino
-platform = espressif8266
+platform = espressif8266@2.2.3
 ;platform = https://github.com/platformio/platform-espressif8266#develop
 ;platform = https://github.com/platformio/platform-espressif8266#feature/stage
 lib_deps =
diff --git a/src/TelnetSpy.cpp b/src/TelnetSpy.cpp
index 07b625c7d..dfda8af91 100644
--- a/src/TelnetSpy.cpp
+++ b/src/TelnetSpy.cpp
@@ -24,16 +24,6 @@ extern "C" {
 
 static TelnetSpy * actualObject = NULL;
 
-static void TelnetSpy_putc(char c) {
-    if (actualObject) {
-        actualObject->write(c);
-    }
-}
-
-static void TelnetSpy_ignore_putc(char c) {
-    ;
-}
-
 TelnetSpy::TelnetSpy() {
     port               = TELNETSPY_PORT;
     telnetServer       = NULL;
@@ -437,19 +427,8 @@ void TelnetSpy::setDebugOutput(bool en) {
 
     if (debugOutput) {
         actualObject = this;
-
-#ifdef ESP8266
-        os_install_putc1((void *)TelnetSpy_putc); // Set system printing (os_printf) to TelnetSpy
-        system_set_os_print(true);
-#endif
-
     } else {
         if (actualObject == this) {
-#ifdef ESP8266
-            system_set_os_print(false);
-            os_install_putc1((void *)TelnetSpy_ignore_putc); // Ignore system printing
-#endif
-
             actualObject = NULL;
         }
     }
diff --git a/src/TelnetSpy.h b/src/TelnetSpy.h
index 2b57d0490..a7884adeb 100644
--- a/src/TelnetSpy.h
+++ b/src/TelnetSpy.h
@@ -157,7 +157,7 @@
 #define TELNETSPY_MAX_BLOCK_SIZE 512
 #define TELNETSPY_PING_TIME 1500
 #define TELNETSPY_PORT 23
-#define TELNETSPY_CAPTURE_OS_PRINT true
+#define TELNETSPY_CAPTURE_OS_PRINT false
 #define TELNETSPY_WELCOME_MSG "Connection established via Telnet.\n"
 #define TELNETSPY_REJECT_MSG "Telnet: Only one connection possible.\n"
 

From 47c7c2edc2b0254ed5349876bb78297bc8884575 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Thu, 28 Nov 2019 09:31:23 +0100
Subject: [PATCH 101/120] rollback to arduino core 2.5.2 to fix web reload
 issue - https://github.com/proddy/EMS-ESP/issues/244

---
 platformio.ini | 25 ++++++++++++-------------
 src/version.h  |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index a4a5b260c..2468d31c9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -26,7 +26,7 @@ custom_flags =
 #    -DVTABLES_IN_FLASH
 #    -DNO_GLOBAL_EEPROM
 #    -DBEARSSL_SSL_BASIC 
-general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DVTABLES_IN_FLASH
+general_flags = -DNO_GLOBAL_EEPROM
 
 # From https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld
 #  eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer 
@@ -37,22 +37,21 @@ build_flags = ${common.general_flags} ${common.build_flags_4m1m}
 
 [env]
 framework = arduino
-platform = espressif8266@2.2.3
+platform = espressif8266@2.2.2 ; arduino core 2.5.2
 ;platform = https://github.com/platformio/platform-espressif8266#develop
 ;platform = https://github.com/platformio/platform-espressif8266#feature/stage
 lib_deps =
   https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
   https://github.com/me-no-dev/ESPAsyncWebServer
-  ;https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
   https://github.com/bakercp/CRC32
-  JustWifi@2.0.2
-  AsyncMqttClient@0.8.2
-  EEPROM_Rotate@0.9.2
-  ArduinoJson@6.13.0
-  ESPAsyncUDP
-  ESPAsyncTCP@1.2.2
-  https://github.com/nomis/mcu-uuid-syslog.git
+  https://github.com/nomis/mcu-uuid-syslog
+  JustWifi@2.0.2 ; https://github.com/xoseperez/justwifi
+  AsyncMqttClient@0.8.2 ; https://github.com/marvinroger/async-mqtt-client
+  EEPROM_Rotate@0.9.2 ; https://github.com/xoseperez/eeprom_rotate
+  ArduinoJson@6.13.0 ; https://github.com/bblanchon/ArduinoJson
+  ESPAsyncTCP@1.2.2 ; https://github.com/me-no-dev/ESPAsyncTCP 
+  https://github.com/me-no-dev/ESPAsyncUDP
 upload_speed = 921600
 monitor_speed = 115200
 
@@ -60,9 +59,9 @@ monitor_speed = 115200
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
 
-; comment out these next 2 lines if not using OTA and going direct via USB
-upload_protocol = espota
-upload_port = ems-esp.local
+; uncomment these next 2 lines if using OTA instead of going direct via USB
+;upload_protocol = espota
+;upload_port = ems-esp.local
 
 #
 # These following targets are used by TravisCI to build the firmware versions on Release
diff --git a/src/version.h b/src/version.h
index c38a882f1..f53eaaf41 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b17"
+#define APP_VERSION "1.9.4b18"

From 2d009894ba4f5d2c88dab37417354af1202bfb6a Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Thu, 28 Nov 2019 22:00:31 +0100
Subject: [PATCH 102/120] fix boiltemp again -
 https://github.com/proddy/EMS-ESP/issues/206

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

diff --git a/src/ems.cpp b/src/ems.cpp
index f3d093b3b..9143ed1d9 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1370,7 +1370,11 @@ void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
         EMS_Boiler.extTemp = _toShort(0);
     }
 
-    EMS_Boiler.boilTemp    = _toShort(2); // 0x8000 if not available
+    // set boiler temp only if we actually have a real value
+    if (_toShort(2) != EMS_VALUE_USHORT_NOTSET) {
+        EMS_Boiler.boilTemp = _toShort(2); // 0x8000 if not available
+    }
+
     EMS_Boiler.pumpMod     = _toByte(9);
     EMS_Boiler.burnStarts  = _toLong(10);
     EMS_Boiler.burnWorkMin = _toLong(13);
diff --git a/src/version.h b/src/version.h
index f53eaaf41..82ceb481e 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b18"
+#define APP_VERSION "1.9.4b19"

From e6556557cf5497a28593ae413db0b5f35a00aa06 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Fri, 29 Nov 2019 20:37:19 +0100
Subject: [PATCH 103/120] fix publish_time to always send when it has a 0 value

---
 platformio.ini  |  6 +++---
 src/ems-esp.cpp | 12 +++++++-----
 src/version.h   |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 2468d31c9..da681e846 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -59,9 +59,9 @@ monitor_speed = 115200
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
 
-; uncomment these next 2 lines if using OTA instead of going direct via USB
-;upload_protocol = espota
-;upload_port = ems-esp.local
+; comment out this section if using USB and not OTA for firmware uploads
+upload_protocol = espota
+upload_port = ems-esp.local
 
 #
 # These following targets are used by TravisCI to build the firmware versions on Release
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 50a61b1ac..69cd55363 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -572,10 +572,8 @@ void publishEMSValues(bool force) {
         return; // EMS bus is not connected
     }
 
-    // override force id not on automatic mode. Always send values is there is a publish_time set
-    if (EMSESP_Settings.publish_time != 0) {
-        force = true;
-    }
+    // Always send values is there is a publish_time is set to 0
+    force = !EMSESP_Settings.publish_time;
 
     char                                      s[20] = {0}; // for formatting strings
     StaticJsonDocument<MQTT_MAX_PAYLOAD_SIZE> doc;
@@ -1186,7 +1184,11 @@ bool SetListCallback(MYESP_FSACTION_t action, uint8_t wc, const char * setting,
         myDebug_P(PSTR("  listen_mode=%s"), EMSESP_Settings.listen_mode ? "on" : "off");
         myDebug_P(PSTR("  shower_timer=%s"), EMSESP_Settings.shower_timer ? "on" : "off");
         myDebug_P(PSTR("  shower_alert=%s"), EMSESP_Settings.shower_alert ? "on" : "off");
-        myDebug_P(PSTR("  publish_time=%d"), EMSESP_Settings.publish_time);
+        if (EMSESP_Settings.publish_time) {
+            myDebug_P(PSTR("  publish_time=%d"), EMSESP_Settings.publish_time);
+        } else {
+            myDebug_P(PSTR("  publish_time=0 (always publish when data received)"), EMSESP_Settings.publish_time);
+        }
     }
 
     return ok;
diff --git a/src/version.h b/src/version.h
index 82ceb481e..15759c73e 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b19"
+#define APP_VERSION "1.9.4b20"

From ccc9fd358ac0265351b7d1fc67b50968d7f37c08 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Fri, 29 Nov 2019 22:06:11 +0100
Subject: [PATCH 104/120] added W-B Sense II

---
 src/ems_devices.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ems_devices.h b/src/ems_devices.h
index 07f7e73f8..1a0533204 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -276,14 +276,14 @@ static const _EMS_Device EMS_Devices[] = {
     {157, EMS_DEVICE_TYPE_THERMOSTAT, "Buderus RC200/Bosch CW100/Junkers CW100", EMS_DEVICE_FLAG_NO_WRITE},                    // 0x18, cannot write
 
     // Buderus/Nefit
-    {79, EMS_DEVICE_TYPE_THERMOSTAT, "RC10/Moduline 100", EMS_DEVICE_FLAG_RC10},                                // 0x17
-    {77, EMS_DEVICE_TYPE_THERMOSTAT, "RC20/Moduline 300", EMS_DEVICE_FLAG_RC20},                                // 0x17
-    {93, EMS_DEVICE_TYPE_THERMOSTAT, "RC20RF", EMS_DEVICE_FLAG_RC20},                                           // 0x18
-    {67, EMS_DEVICE_TYPE_THERMOSTAT, "RC30", EMS_DEVICE_FLAG_RC30},                                             // 0x10
-    {78, EMS_DEVICE_TYPE_THERMOSTAT, "RC30/Moduline 400", EMS_DEVICE_FLAG_RC30},                                // 0x10
-    {86, EMS_DEVICE_TYPE_THERMOSTAT, "RC35", EMS_DEVICE_FLAG_RC35},                                             // 0x10
-    {158, EMS_DEVICE_TYPE_THERMOSTAT, "RC300/RC310/Moduline 3000/Bosch CW400", EMS_DEVICE_FLAG_RC300},          // 0x10
-    {165, EMS_DEVICE_TYPE_THERMOSTAT, "RC100/Moduline 1010", EMS_DEVICE_FLAG_RC300 | EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write
+    {79, EMS_DEVICE_TYPE_THERMOSTAT, "RC10/Moduline 100", EMS_DEVICE_FLAG_RC10},                                    // 0x17
+    {77, EMS_DEVICE_TYPE_THERMOSTAT, "RC20/Moduline 300", EMS_DEVICE_FLAG_RC20},                                    // 0x17
+    {93, EMS_DEVICE_TYPE_THERMOSTAT, "RC20RF", EMS_DEVICE_FLAG_RC20},                                               // 0x18
+    {67, EMS_DEVICE_TYPE_THERMOSTAT, "RC30", EMS_DEVICE_FLAG_RC30},                                                 // 0x10
+    {78, EMS_DEVICE_TYPE_THERMOSTAT, "RC30/Moduline 400", EMS_DEVICE_FLAG_RC30},                                    // 0x10
+    {86, EMS_DEVICE_TYPE_THERMOSTAT, "RC35", EMS_DEVICE_FLAG_RC35},                                                 // 0x10
+    {158, EMS_DEVICE_TYPE_THERMOSTAT, "RC300/RC310/Moduline 3000/Bosch CW400/W-B Sense II", EMS_DEVICE_FLAG_RC300}, // 0x10
+    {165, EMS_DEVICE_TYPE_THERMOSTAT, "RC100/Moduline 1010", EMS_DEVICE_FLAG_RC300 | EMS_DEVICE_FLAG_NO_WRITE},     // 0x18, cannot write
 
     // Sieger
     {076, EMS_DEVICE_TYPE_THERMOSTAT, "Sieger ES73", EMS_DEVICE_FLAG_RC35}, // 0x10

From 3736d722f7868033c8fb9d517f2816f50c10c652 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 30 Nov 2019 13:45:58 +0100
Subject: [PATCH 105/120] increase telnet buffer for mqttlog

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

diff --git a/src/MyESP.h b/src/MyESP.h
index 614775b5d..899a35a96 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -113,7 +113,7 @@ extern struct rst_info resetInfo;
 // Telnet
 #define TELNET_SERIAL_BAUD 115200
 #define TELNET_MAX_COMMAND_LENGTH 80 // length of a command
-#define TELNET_MAX_BUFFER_LENGTH 300 // max length of telnet string
+#define TELNET_MAX_BUFFER_LENGTH 700 // max length of telnet string
 #define TELNET_EVENT_CONNECT 1
 #define TELNET_EVENT_DISCONNECT 0
 #define TELNET_EVENT_SHOWCMD 10

From 95f88017b5188ac194585189eb57b8f52199ba99 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 30 Nov 2019 13:46:06 +0100
Subject: [PATCH 106/120] bump

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

diff --git a/src/version.h b/src/version.h
index 15759c73e..3abff063c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b20"
+#define APP_VERSION "1.9.4b21"

From b6084c8c6caa3a6b31c7eb0e891576f8464e0db6 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 30 Nov 2019 13:46:43 +0100
Subject: [PATCH 107/120] add telegram length check -
 https://github.com/proddy/EMS-ESP/issues/248

---
 src/ems.cpp | 410 ++++++++++++++++++++++++++++------------------------
 1 file changed, 219 insertions(+), 191 deletions(-)

diff --git a/src/ems.cpp b/src/ems.cpp
index 9143ed1d9..28d5138b1 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -25,12 +25,6 @@ CircularBuffer<_EMS_TxTelegram, EMS_TX_TELEGRAM_QUEUE_MAX> EMS_TxQueue; // FIFO
 // for storing all detected EMS devices
 std::list<_Detected_Device> Devices;
 
-// macros used in the _process* functions
-#define _toByte(i) (EMS_RxTelegram->data[i])
-#define _toShort(i) ((EMS_RxTelegram->data[i] << 8) + EMS_RxTelegram->data[i + 1])
-#define _toLong(i) ((EMS_RxTelegram->data[i] << 16) + (EMS_RxTelegram->data[i + 1] << 8) + (EMS_RxTelegram->data[i + 2]))
-#define _bitRead(i, bit) (((EMS_RxTelegram->data[i]) >> (bit)) & 0x01)
-
 //
 // process callbacks per type
 //
@@ -478,6 +472,65 @@ uint8_t _crcCalculator(uint8_t * data, uint8_t len) {
     return crc;
 }
 
+// unsigned short
+void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint16_t * param_op, uint8_t index) {
+    if (index >= EMS_RxTelegram->data_length) {
+        return;
+    }
+
+    uint16_t value = (EMS_RxTelegram->data[index] << 8) + EMS_RxTelegram->data[index + 1];
+
+    // check for undefined/unset values, 0x8000
+    if (value == EMS_VALUE_USHORT_NOTSET) {
+        return;
+    }
+
+    *param_op = value;
+}
+
+// signed short
+void _setValue(_EMS_RxTelegram * EMS_RxTelegram, int16_t * param_op, uint8_t index) {
+    if (index >= EMS_RxTelegram->data_length) {
+        return;
+    }
+
+    int16_t value = (EMS_RxTelegram->data[index] << 8) + EMS_RxTelegram->data[index + 1];
+
+    // check for undefined/unset values, 0x8000
+    if ((value == EMS_VALUE_SHORT_NOTSET) || (EMS_RxTelegram->data[index] == 0x7D)) {
+        return;
+    }
+
+    *param_op = value;
+}
+
+// Byte
+void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint8_t * param_op, uint8_t index) {
+    if (index >= EMS_RxTelegram->data_length) {
+        return;
+    }
+
+    *param_op = (uint8_t)EMS_RxTelegram->data[index];
+}
+
+// Long
+void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint32_t * param_op, uint8_t index) {
+    if (index >= EMS_RxTelegram->data_length) {
+        return;
+    }
+
+    *param_op = (uint32_t)((EMS_RxTelegram->data[index] << 16) + (EMS_RxTelegram->data[index + 1] << 8) + (EMS_RxTelegram->data[index + 2]));
+}
+
+// bit from a byte
+void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint8_t * param_op, uint8_t index, uint8_t bit) {
+    if (index >= EMS_RxTelegram->data_length) {
+        return;
+    }
+
+    *param_op = (uint8_t)(((EMS_RxTelegram->data[index]) >> (bit)) & 0x01);
+}
+
 /**
  * Find the pointer to the EMS_Types array for a given type ID
  * or -1 if not found
@@ -1226,11 +1279,12 @@ void _checkActive() {
  * received only after requested (not broadcasted)
  */
 void _process_UBAParameterWW(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.wWActivated   = (_toByte(1) == 0xFF); // 0xFF means on
-    EMS_Boiler.wWSelTemp     = _toByte(2);
-    EMS_Boiler.wWCircPump    = (_toByte(6) == 0xFF); // 0xFF means on
-    EMS_Boiler.wWDesiredTemp = _toByte(8);
-    EMS_Boiler.wWComfort     = _toByte(EMS_OFFSET_UBAParameterWW_wwComfort);
+    EMS_Boiler.wWActivated = (EMS_RxTelegram->data[1] == 0xFF); // 0xFF means on
+    EMS_Boiler.wWCircPump  = (EMS_RxTelegram->data[6] == 0xFF); // 0xFF means on
+
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWSelTemp, 2);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWDesiredTemp, 8);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWComfort, EMS_OFFSET_UBAParameterWW_wwComfort);
 
     EMS_Sys_Status.emsRefreshed = true; // when we receieve this, lets force an MQTT publish
 }
@@ -1240,7 +1294,7 @@ void _process_UBAParameterWW(_EMS_RxTelegram * EMS_RxTelegram) {
  * received only after requested (not broadcasted)
  */
 void _process_UBATotalUptimeMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.UBAuptime        = _toLong(0);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.UBAuptime, 0);
     EMS_Sys_Status.emsRefreshed = true; // when we receieve this, lets force an MQTT publish
 }
 
@@ -1248,9 +1302,9 @@ void _process_UBATotalUptimeMessage(_EMS_RxTelegram * EMS_RxTelegram) {
  * UBAParametersMessage - type 0x16
  */
 void _process_UBAParametersMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.heating_temp = _toByte(1);
-    EMS_Boiler.pump_mod_max = _toByte(9);
-    EMS_Boiler.pump_mod_min = _toByte(10);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.heating_temp, 1);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.pump_mod_max, 9);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.pump_mod_min, 10);
 }
 
 /**
@@ -1258,11 +1312,11 @@ void _process_UBAParametersMessage(_EMS_RxTelegram * EMS_RxTelegram) {
  * received every 10 seconds
  */
 void _process_UBAMonitorWWMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.wWCurTmp  = _toShort(1);
-    EMS_Boiler.wWStarts  = _toLong(13);
-    EMS_Boiler.wWWorkM   = _toLong(10);
-    EMS_Boiler.wWOneTime = _bitRead(5, 1);
-    EMS_Boiler.wWCurFlow = _toByte(9);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWCurTmp, 1);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWStarts, 13);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWWorkM, 10);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWOneTime, 5, 1);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWCurFlow, 9);
 }
 
 /**
@@ -1292,37 +1346,30 @@ void ems_setWarmWaterOnetime(bool activated) {
  * received every 10 seconds
  */
 void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.selFlowTemp = _toByte(0);
-    EMS_Boiler.curFlowTemp = _toShort(1);
-    EMS_Boiler.retTemp     = _toShort(13);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.selFlowTemp, 0);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.curFlowTemp, 1);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.selBurnPow, 3); // burn power max setting
+    _setValue(EMS_RxTelegram, &EMS_Boiler.curBurnPow, 4);
 
-    EMS_Boiler.burnGas = _bitRead(7, 0);
-    EMS_Boiler.fanWork = _bitRead(7, 2);
-    EMS_Boiler.ignWork = _bitRead(7, 3);
-    EMS_Boiler.heatPmp = _bitRead(7, 5);
-    EMS_Boiler.wWHeat  = _bitRead(7, 6);
-    EMS_Boiler.wWCirc  = _bitRead(7, 7);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.burnGas, 7, 0);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.fanWork, 7, 2);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.ignWork, 7, 3);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.heatPmp, 7, 5);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWHeat, 7, 6);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWCirc, 7, 7);
 
-    EMS_Boiler.curBurnPow = _toByte(4);
-    EMS_Boiler.selBurnPow = _toByte(3); // burn power max setting
-
-    // set boiler temp only if we actually have a real value
-    if (_toShort(11) != EMS_VALUE_USHORT_NOTSET) {
-        EMS_Boiler.boilTemp = _toShort(11); // 0x8000 if not available
-    }
-
-    EMS_Boiler.flameCurr = _toShort(15);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.boilTemp, 11); // 0x8000 if not available
+    _setValue(EMS_RxTelegram, &EMS_Boiler.retTemp, 13);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.flameCurr, 15);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.serviceCode, 20);
 
     // system pressure. FF means missing
-    EMS_Boiler.sysPress = _toByte(17); // this is *10
+    _setValue(EMS_RxTelegram, &EMS_Boiler.sysPress, 17); // is *10
 
     // read the service code / installation status as appears on the display
-    EMS_Boiler.serviceCodeChar[0] = char(_toByte(18)); // ascii character 1
-    EMS_Boiler.serviceCodeChar[1] = char(_toByte(19)); // ascii character 2
-    EMS_Boiler.serviceCodeChar[2] = '\0';              // null terminate string
-
-    // read error code
-    EMS_Boiler.serviceCode = _toShort(20);
+    EMS_Boiler.serviceCodeChar[0] = char(EMS_RxTelegram->data[18]); // ascii character 1
+    EMS_Boiler.serviceCodeChar[1] = char(EMS_RxTelegram->data[19]); // ascii character 2
+    EMS_Boiler.serviceCodeChar[2] = '\0';                           // null terminate string
 
     // at this point do a quick check to see if the hot water or heating is active
     _checkActive();
@@ -1332,24 +1379,18 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
  * UBAMonitorFast2 - type 0xE4 - central heating monitor
  */
 void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.selFlowTemp = _toByte(6);
-
-    EMS_Boiler.burnGas = _bitRead(11, 0);
-    EMS_Boiler.wWHeat  = _bitRead(11, 2);
-
-    EMS_Boiler.curBurnPow = _toByte(10);
-    EMS_Boiler.selBurnPow = _toByte(9); // burn power max setting
-
-    if (_toShort(7) != EMS_VALUE_USHORT_NOTSET) {
-        EMS_Boiler.curFlowTemp = _toShort(7); // 0x8000 if not available
-    }
-
-    EMS_Boiler.flameCurr = _toShort(19);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.selFlowTemp, 6);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.burnGas, 11, 0);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWHeat, 11, 2);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.curBurnPow, 10);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.selBurnPow, 9);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.curFlowTemp, 7); // 0x8000 if not available
+    _setValue(EMS_RxTelegram, &EMS_Boiler.flameCurr, 19);
 
     // read the service code / installation status as appears on the display
-    EMS_Boiler.serviceCodeChar[0] = char(_toByte(4)); // ascii character 1
-    EMS_Boiler.serviceCodeChar[1] = char(_toByte(5)); // ascii character 2
-    EMS_Boiler.serviceCodeChar[2] = '\0';             // null terminate string
+    EMS_Boiler.serviceCodeChar[0] = char(EMS_RxTelegram->data[4]); // ascii character 1
+    EMS_Boiler.serviceCodeChar[1] = char(EMS_RxTelegram->data[5]); // ascii character 2
+    EMS_Boiler.serviceCodeChar[2] = '\0';
 
     // still to figure out:
     //  EMS_Boiler.serviceCode
@@ -1364,46 +1405,38 @@ void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
  * UBAMonitorSlow - type 0x19 - central heating monitor part 2 (27 bytes long)
  * received every 60 seconds
  * e.g. 08 00 19 00 80 00 02 41 80 00 00 00 00 00 03 91 7B 05 B8 40 00 00 00 04 92 AD 00 5E EE 80 00 (CRC=C9) #data=27
+ *      08 0B 19 00 FF EA 02 47 80 00 00 00 00 62 03 CA 24 2C D6 23 00 00 00 27 4A B6 03 6E 43 
+ *                  00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 17 19 20 21 22 23 24
  */
 void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram) {
-    if (_toShort(0) != EMS_VALUE_USHORT_NOTSET) { // 0x8000 if not available
-        EMS_Boiler.extTemp = _toShort(0);
-    }
-
-    // set boiler temp only if we actually have a real value
-    if (_toShort(2) != EMS_VALUE_USHORT_NOTSET) {
-        EMS_Boiler.boilTemp = _toShort(2); // 0x8000 if not available
-    }
-
-    EMS_Boiler.pumpMod     = _toByte(9);
-    EMS_Boiler.burnStarts  = _toLong(10);
-    EMS_Boiler.burnWorkMin = _toLong(13);
-    EMS_Boiler.heatWorkMin = _toLong(19);
-    EMS_Boiler.switchTemp  = _toShort(25);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.extTemp, 0);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.boilTemp, 2);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.switchTemp, 25); // only if there is a mixer
+    _setValue(EMS_RxTelegram, &EMS_Boiler.pumpMod, 9);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.burnStarts, 10);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.burnWorkMin, 13);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.heatWorkMin, 19);
 }
 
 /**
  * UBAMonitorSlow2 - type 0xE5 - central heating monitor
  */
 void _process_UBAMonitorSlow2(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.fanWork = _bitRead(2, 2);
-    EMS_Boiler.ignWork = _bitRead(2, 3);
-    EMS_Boiler.heatPmp = _bitRead(2, 5);
-    EMS_Boiler.wWCirc  = _bitRead(2, 7);
-
-    EMS_Boiler.burnStarts  = _toLong(10);
-    EMS_Boiler.burnWorkMin = _toLong(13);
-    EMS_Boiler.heatWorkMin = _toLong(19);
-    EMS_Boiler.pumpMod     = _toByte(25); // or is it switchTemp ?
+    _setValue(EMS_RxTelegram, &EMS_Boiler.fanWork, 2, 2);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.ignWork, 2, 3);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.heatPmp, 2, 5);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWCirc, 2, 7);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.burnStarts, 10);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.burnWorkMin, 13);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.heatWorkMin, 19);
+    _setValue(EMS_RxTelegram, &EMS_Boiler.pumpMod, 25); // or is it switchTemp ?
 }
 
 /**
  * UBAOutdoorTemp - type 0xD1 - external temperature
  */
 void _process_UBAOutdoorTemp(_EMS_RxTelegram * EMS_RxTelegram) {
-    if (_toShort(0) != EMS_VALUE_USHORT_NOTSET) { // 0x8000 if not available
-        EMS_Boiler.extTemp = _toShort(0);
-    }
+    _setValue(EMS_RxTelegram, &EMS_Boiler.extTemp, 0);
 }
 
 /**
@@ -1415,9 +1448,10 @@ void _process_UBAOutdoorTemp(_EMS_RxTelegram * EMS_RxTelegram) {
 void _process_RC10StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
 
-    EMS_Thermostat.hc[hc].active            = true;
-    EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(EMS_OFFSET_RC10StatusMessage_setpoint); // is * 2
-    EMS_Thermostat.hc[hc].curr_roomTemp     = _toShort(EMS_OFFSET_RC10StatusMessage_curr);    // is * 10
+    EMS_Thermostat.hc[hc].active = true;
+
+    EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC10StatusMessage_setpoint]; // store as a byte, is * 2
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC10StatusMessage_curr);    // is * 10
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1430,9 +1464,10 @@ void _process_RC10StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 void _process_RC20StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
 
-    EMS_Thermostat.hc[hc].active            = true;
-    EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(EMS_OFFSET_RC20StatusMessage_setpoint); // is * 2
-    EMS_Thermostat.hc[hc].curr_roomTemp     = _toShort(EMS_OFFSET_RC20StatusMessage_curr);    // is * 10
+    EMS_Thermostat.hc[hc].active = true;
+
+    EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC20StatusMessage_setpoint]; // store as a byte, is * 2
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC20StatusMessage_curr);    // is * 10
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1444,9 +1479,10 @@ void _process_RC20StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 void _process_RC30StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
 
-    EMS_Thermostat.hc[hc].active            = true;
-    EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(EMS_OFFSET_RC30StatusMessage_setpoint); // is * 2
-    EMS_Thermostat.hc[hc].curr_roomTemp     = _toShort(EMS_OFFSET_RC30StatusMessage_curr);    // note, its 2 bytes here
+    EMS_Thermostat.hc[hc].active = true;
+
+    EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC30StatusMessage_setpoint]; // store as a byte, is * 2
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC30StatusMessage_curr);
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1492,19 +1528,17 @@ void _process_RC35StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 
     // ignore if the value is 0 (see https://github.com/proddy/EMS-ESP/commit/ccc30738c00f12ae6c89177113bd15af9826b836)
     if (EMS_RxTelegram->data[EMS_OFFSET_RC35StatusMessage_setpoint] != 0x00) {
-        EMS_Thermostat.hc[hc_num].setpoint_roomTemp = _toByte(EMS_OFFSET_RC35StatusMessage_setpoint); // is * 2
+        EMS_Thermostat.hc[hc_num].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC35StatusMessage_setpoint]; // is * 2
     }
 
     // ignore if the value is unset. Hopefully it will be picked up via a later message
-    if (EMS_RxTelegram->data[EMS_OFFSET_RC35StatusMessage_curr] != 0x7D) {
-        EMS_Thermostat.hc[hc_num].curr_roomTemp = _toShort(EMS_OFFSET_RC35StatusMessage_curr); // is * 10
-    }
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].curr_roomTemp, EMS_OFFSET_RC35StatusMessage_curr); // is * 10
 
-    EMS_Thermostat.hc[hc_num].day_mode     = _bitRead(EMS_OFFSET_RC35StatusMessage_mode, 1);  // get day mode flag
-    EMS_Thermostat.hc[hc_num].summer_mode  = _bitRead(EMS_OFFSET_RC35StatusMessage_mode, 0);  // summer mode?
-    EMS_Thermostat.hc[hc_num].holiday_mode = _bitRead(EMS_OFFSET_RC35StatusMessage_mode1, 5); // holiday mode?
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].day_mode, EMS_OFFSET_RC35StatusMessage_mode, 1);
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].summer_mode, EMS_OFFSET_RC35StatusMessage_mode, 0);
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].holiday_mode, EMS_OFFSET_RC35StatusMessage_mode1, 5);
 
-    EMS_Thermostat.hc[hc_num].circuitcalctemp = _toByte(EMS_OFFSET_RC35Set_circuitcalctemp); // calculated temperature
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].circuitcalctemp, EMS_OFFSET_RC35Set_circuitcalctemp);
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1516,9 +1550,10 @@ void _process_RC35StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 void _process_EasyStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
 
-    EMS_Thermostat.hc[hc].active            = true;
-    EMS_Thermostat.hc[hc].curr_roomTemp     = _toShort(EMS_OFFSET_EasyStatusMessage_curr);     // is *100
-    EMS_Thermostat.hc[hc].setpoint_roomTemp = _toShort(EMS_OFFSET_EasyStatusMessage_setpoint); // is *100
+    EMS_Thermostat.hc[hc].active = true;
+
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_EasyStatusMessage_curr);         // is * 100
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_EasyStatusMessage_setpoint); // is * 100
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1532,9 +1567,9 @@ void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 
     if (EMS_RxTelegram->data_length == 1) {
     } else if (EMS_RxTelegram->data_length > 8) {
-        EMS_Mixing.hc[hc].flowTemp    = _toShort(EMS_OFFSET_MMPLUSStatusMessage_flow_temp);
-        EMS_Mixing.hc[hc].pumpMod     = _toByte(EMS_OFFSET_MMPLUSStatusMessage_pump_mod);
-        EMS_Mixing.hc[hc].valveStatus = _toByte(EMS_OFFSET_MMPLUSStatusMessage_valve_status);
+        _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowTemp, EMS_OFFSET_MMPLUSStatusMessage_flow_temp);
+        _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].pumpMod, EMS_OFFSET_MMPLUSStatusMessage_pump_mod);
+        _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].valveStatus, EMS_OFFSET_MMPLUSStatusMessage_valve_status);
     }
 }
 
@@ -1550,25 +1585,24 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     }
     EMS_Thermostat.hc[hc].active = true;
 
-    // handle single data values
+    // handle single data values. data will always be a single byte a position data[0]
     if (EMS_RxTelegram->data_length == 1) {
         switch (EMS_RxTelegram->offset) {
-        case EMS_OFFSET_RCPLUSStatusMessage_curr:              // setpoint target temp
-            EMS_Thermostat.hc[hc].curr_roomTemp = _toShort(0); // value is * 10
+        case EMS_OFFSET_RCPLUSStatusMessage_curr:                               // setpoint target temp
+            _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, 0); // value is * 10
             break;
-        case EMS_OFFSET_RCPLUSStatusMessage_setpoint:             // current target temp
-            EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(0); // value is * 2
+        case EMS_OFFSET_RCPLUSStatusMessage_setpoint:                          // current target temp
+            EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[0]; // convert to single byte, value is * 2
             break;
-        case EMS_OFFSET_RCPLUSStatusMessage_currsetpoint:         // current setpoint temp,  e.g. Thermostat -> all, telegram: 10 00 FF 06 01 A5 22
-            EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(0); // value is * 2
+        case EMS_OFFSET_RCPLUSStatusMessage_currsetpoint:                      // current setpoint temp,  e.g. Thermostat -> all, telegram: 10 00 FF 06 01 A5 22
+            EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[0]; // convert to single byte, value is * 2
             break;
         case EMS_OFFSET_RCPLUSStatusMessage_mode: // thermostat mode auto/manual
                                                   // manual : 10 00 FF 0A 01 A5 02
-                                                  // auto : Thermostat -> all, type 0x01A5 telegram: 10 00 FF 0A 01 A5 03
-
-            // Note this may be bit 2 instead of 1 on an RC300 - still to validate
-            EMS_Thermostat.hc[hc].mode     = _bitRead(0, 0); // bit 1, mode (auto=1 or manual=0)
-            EMS_Thermostat.hc[hc].day_mode = _bitRead(0, 1); // get day mode flag
+                                                  // auto :   10 00 FF 0A 01 A5 03
+            _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, 0,
+                      0); // bit 1, mode (auto=1 or manual=0). Note this may be bit 2 - still need to validate
+            _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].day_mode, 0, 1); // get day mode flag
 
             break;
         }
@@ -1576,10 +1610,11 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
         // the whole telegram
         // e.g. Thermostat -> all, telegram: 10 00 FF 00 01 A5 00 D7 21 00 00 00 00 30 01 84 01 01 03 01 84 01 F1 00 00 11 01 00 08 63 00
         //                                   10 00 FF 00 01 A5 80 00 01 30 28 00 30 28 01 54 03 03 01 01 54 02 A8 00 00 11 01 03 FF FF 00
-        EMS_Thermostat.hc[hc].curr_roomTemp     = _toShort(EMS_OFFSET_RCPLUSStatusMessage_curr);    // value is * 10
-        EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(EMS_OFFSET_RCPLUSStatusMessage_setpoint); // value is * 2
-        EMS_Thermostat.hc[hc].day_mode          = _bitRead(EMS_OFFSET_RCPLUSStatusMessage_mode, 1); // get day mode flag
-        EMS_Thermostat.hc[hc].mode              = _bitRead(EMS_OFFSET_RCPLUSStatusMessage_mode, 0); // bit 1, mode (auto=1 or manual=0)
+
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_curr);    // value is * 10
+        EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RCPLUSStatusMessage_setpoint]; // convert to single byte, value is * 2
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].day_mode, EMS_OFFSET_RCPLUSStatusMessage_mode, 1);
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RCPLUSStatusMessage_mode, 0); // bit 1, mode (auto=1 or manual=0)
     }
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
@@ -1589,25 +1624,23 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
  * type 0x01AF - summer/winter mode from the Nefit RC1010 thermostat (0x18) and RC300/310s on 0x10
  */
 void _process_RCPLUSStatusMode(_EMS_RxTelegram * EMS_RxTelegram) {
-    // _toByte(0); // 0x00=OFF 0x01=Automatic 0x02=Forced
+    // data[0] // 0x00=OFF 0x01=Automatic 0x02=Forced
 }
 
 /**
  * FR10/FR50/FR100 Junkers - type x006F
+ *    e.g. for FR10:  90 00 FF 00 00 6F   03 01 00 BE 00 BF
+ *         for FW100: 90 00 FF 00 00 6F   03 02 00 D7 00 DA F3 34 00 C4
  */
 void _process_JunkersStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     if (EMS_RxTelegram->offset == 0 && EMS_RxTelegram->data_length > 1) {
         uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
         EMS_Thermostat.hc[hc].active = true;
 
-        // e.g. for FR10:  90 00 FF 00 00 6F   03 01 00 BE 00 BF
-        // e.g. for FW100: 90 00 FF 00 00 6F   03 02 00 D7 00 DA F3 34 00 C4
-
-        EMS_Thermostat.hc[hc].curr_roomTemp     = _toShort(EMS_OFFSET_JunkersStatusMessage_curr);     // value is * 10
-        EMS_Thermostat.hc[hc].setpoint_roomTemp = _toShort(EMS_OFFSET_JunkersStatusMessage_setpoint); // value is * 10
-
-        EMS_Thermostat.hc[hc].day_mode = _toByte(EMS_OFFSET_JunkersStatusMessage_daymode); // 3 = day, 2 = night
-        EMS_Thermostat.hc[hc].mode     = _toByte(EMS_OFFSET_JunkersStatusMessage_mode);    // 1 = manual, 2 = auto
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_JunkersStatusMessage_curr);         // value is * 10
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_JunkersStatusMessage_setpoint); // value is * 10
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].day_mode, EMS_OFFSET_JunkersStatusMessage_daymode);           // 3 = day, 2 = night
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_JunkersStatusMessage_mode);                  // 1 = manual, 2 = auto
 
         EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
     }
@@ -1627,16 +1660,16 @@ void _process_RCPLUSSetMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 
     // check for single values
     // but ignore values of 0xFF, e.g.  10 00 FF 08 01 B9 FF
-    if ((EMS_RxTelegram->data_length == 1) && (_toByte(0) != 0xFF)) {
-        // check for setpoint temps, e.g. Thermostat -> all, type 0x01B9, telegram: 10 00 FF 08 01 B9 26 (CRC=1A) #data=1
+    if ((EMS_RxTelegram->data_length == 1) && (EMS_RxTelegram->data[0] != 0xFF)) {
+        // check for setpoint temps, e.g. Thermostat -> all, type 0x01B9, telegram: 10 00 FF 08 01 B9 26
         if ((EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_temp_setpoint) || (EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_manual_setpoint)) {
-            EMS_Thermostat.hc[hc].setpoint_roomTemp = _toByte(0); // value is * 2
-            EMS_Sys_Status.emsRefreshed             = true;       // triggers a send the values back via MQTT
+            EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[0]; // single byte conversion, value is * 2
+            EMS_Sys_Status.emsRefreshed             = true;                    // triggers a send the values back via MQTT
 
             // check for mode, eg.  10 00 FF 08 01 B9 FF
         } else if (EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_mode) {
-            EMS_Thermostat.hc[hc].mode  = (_toByte(0) == 0xFF); // Auto = xFF, Manual = x00   (auto=1 or manual=0)
-            EMS_Sys_Status.emsRefreshed = true;                 // triggers a send the values back via MQTT
+            EMS_Thermostat.hc[hc].mode  = (EMS_RxTelegram->data[0] == 0xFF); // Auto = xFF, Manual = x00   (auto=1 or manual=0)
+            EMS_Sys_Status.emsRefreshed = true;                              // triggers a send the values back via MQTT
         }
 
         return; // quit
@@ -1644,10 +1677,11 @@ void _process_RCPLUSSetMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 
     // check for long broadcasts
     if (EMS_RxTelegram->offset == 0) {
-        EMS_Thermostat.hc[hc].mode      = _toByte(EMS_OFFSET_RCPLUSSet_mode);
-        EMS_Thermostat.hc[hc].daytemp   = _toByte(EMS_OFFSET_RCPLUSSet_temp_comfort2); // is * 2
-        EMS_Thermostat.hc[hc].nighttemp = _toByte(EMS_OFFSET_RCPLUSSet_temp_eco);      // is * 2
-        EMS_Sys_Status.emsRefreshed     = true;                                        // triggers a send the values back via MQTT
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RCPLUSSet_mode);
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].daytemp, EMS_OFFSET_RCPLUSSet_temp_comfort2); // is * 2
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].nighttemp, EMS_OFFSET_RCPLUSSet_temp_eco);    // is * 2
+
+        EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
     }
 }
 
@@ -1667,7 +1701,7 @@ void _process_RC20Set(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
 
     EMS_Thermostat.hc[hc].active = true;
-    EMS_Thermostat.hc[hc].mode   = _toByte(EMS_OFFSET_RC20Set_mode); // fixed for HC1
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RC20Set_mode); // note, fixed for HC1
 }
 
 /**
@@ -1678,7 +1712,7 @@ void _process_RC30Set(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
 
     EMS_Thermostat.hc[hc].active = true;
-    EMS_Thermostat.hc[hc].mode   = _toByte(EMS_OFFSET_RC30Set_mode); // fixed for HC1
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RC30Set_mode); // note, fixed for HC1
 }
 
 // return which heating circuit it is, 0-3 for HC1 to HC4
@@ -1721,7 +1755,7 @@ uint8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram) {
  * 10 0B 5B 00  00 13 15 26 00 28 00 02 00 05 05 2D 01 01 04 4B 05 4B 01 00 3C FF 11 05 05 03 02
  */
 void _process_RC35Set(_EMS_RxTelegram * EMS_RxTelegram) {
-    // check to see what type is it
+    // check to see we have a valid type
     // heating: 1 radiator, 2 convectors, 3 floors, 4 room supply
     if (EMS_RxTelegram->data[0] == 0x00) {
         return;
@@ -1729,11 +1763,11 @@ void _process_RC35Set(_EMS_RxTelegram * EMS_RxTelegram) {
 
     uint8_t hc_num = _getHeatingCircuit(EMS_RxTelegram); // which HC is it?
 
-    EMS_Thermostat.hc[hc_num].mode        = _toByte(EMS_OFFSET_RC35Set_mode);         // night, day, auto
-    EMS_Thermostat.hc[hc_num].daytemp     = _toByte(EMS_OFFSET_RC35Set_temp_day);     // is * 2
-    EMS_Thermostat.hc[hc_num].nighttemp   = _toByte(EMS_OFFSET_RC35Set_temp_night);   // is * 2
-    EMS_Thermostat.hc[hc_num].holidaytemp = _toByte(EMS_OFFSET_RC35Set_temp_holiday); // is * 2
-    EMS_Thermostat.hc[hc_num].heatingtype = _toByte(EMS_OFFSET_RC35Set_heatingtype);  // byte 0 bit floor heating = 3
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].mode, EMS_OFFSET_RC35Set_mode);                // night, day, auto
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].daytemp, EMS_OFFSET_RC35Set_temp_day);         // is * 2
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].nighttemp, EMS_OFFSET_RC35Set_temp_night);     // is * 2
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].holidaytemp, EMS_OFFSET_RC35Set_temp_holiday); // is * 2
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].heatingtype, EMS_OFFSET_RC35Set_heatingtype);  // byte 0 bit floor heating = 3
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1749,10 +1783,10 @@ void _process_RCOutdoorTempMessage(_EMS_RxTelegram * EMS_RxTelegram) {
  * SM10Monitor - type 0x97
  */
 void _process_SM10Monitor(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_SolarModule.collectorTemp  = _toShort(2);    // collector temp from SM10, is *10
-    EMS_SolarModule.bottomTemp     = _toShort(5);    // bottom temp from SM10, is *10
-    EMS_SolarModule.pumpModulation = _toByte(4);     // modulation solar pump
-    EMS_SolarModule.pump           = _bitRead(7, 1); // active if bit 1 is set
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.collectorTemp, 2);  // collector temp from SM10, is *10
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.bottomTemp, 5);     // bottom temp from SM10, is *10
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 4); // modulation solar pump
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 7, 1);        // active if bit 1 is set
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1769,11 +1803,8 @@ void _process_SM100Monitor(_EMS_RxTelegram * EMS_RxTelegram) {
         return;
     }
 
-    EMS_SolarModule.collectorTemp = _toShort(0); // collector temp from SM100, is *10
-
-    if (EMS_RxTelegram->data_length > 2) {
-        EMS_SolarModule.bottomTemp = _toShort(2); // bottom temp from SM100, is *10
-    }
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.collectorTemp, 0); // is *10
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.bottomTemp, 2);    // is *10
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1784,12 +1815,10 @@ void _process_SM100Monitor(_EMS_RxTelegram * EMS_RxTelegram) {
  *      30 00 FF 09 02 64 1E = 30%
  */
 void _process_SM100Status(_EMS_RxTelegram * EMS_RxTelegram) {
-    // check for complete telegram
     if (EMS_RxTelegram->offset == 0) {
-        EMS_SolarModule.pumpModulation = _toByte(9); // modulation solar pump
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 9); // check for complete telegram
     } else if (EMS_RxTelegram->offset == 0x09) {
-        // or short telegram with a single byte with offset 09
-        EMS_SolarModule.pumpModulation = _toByte(0); // modulation solar pump
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 0); // or short telegram with a single byte with offset 09
     }
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
@@ -1799,12 +1828,11 @@ void _process_SM100Status(_EMS_RxTelegram * EMS_RxTelegram) {
  * SM100Status2 - type 0x026A EMS+ for pump on/off at offset 0x0A
  */
 void _process_SM100Status2(_EMS_RxTelegram * EMS_RxTelegram) {
-    // check for complete telegram
     if (EMS_RxTelegram->offset == 0) {
-        EMS_SolarModule.pump = _bitRead(10, 2); // 03=off 04=on at offset 10 which is byte 10
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 10, 2); // 03=off 04=on
     } else if (EMS_RxTelegram->offset == 0x0A) {
         // or short telegram with a single byte with offset 0A
-        EMS_SolarModule.pump = _bitRead(0, 2); // 03=off 04=on
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 0, 2); // 03=off 04=on
     }
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
@@ -1815,9 +1843,9 @@ void _process_SM100Status2(_EMS_RxTelegram * EMS_RxTelegram) {
  * e.g. 30 00 FF 00 02 8E 00 00 00 00 00 00 06 C5 00 00 76 35
  */
 void _process_SM100Energy(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_SolarModule.EnergyLastHour = _toShort(2);  // last hour / 10 in Wh
-    EMS_SolarModule.EnergyToday    = _toShort(6);  // todays in Wh
-    EMS_SolarModule.EnergyTotal    = _toShort(10); // total / 10 in kWh
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.EnergyLastHour, 2); // last hour / 10 in Wh
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.EnergyToday, 6);    //  todays in Wh
+    _setValue(EMS_RxTelegram, &EMS_SolarModule.EnergyTotal, 10);   //  total / 10 in kWh
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1826,7 +1854,7 @@ void _process_SM100Energy(_EMS_RxTelegram * EMS_RxTelegram) {
  * Type 0xE3 - HeatPump Monitor 1
  */
 void _process_HPMonitor1(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_HeatPump.HPModulation = _toByte(13); // modulation %
+    _setValue(EMS_RxTelegram, &EMS_HeatPump.HPModulation, 13); // %
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
@@ -1835,27 +1863,27 @@ void _process_HPMonitor1(_EMS_RxTelegram * EMS_RxTelegram) {
  * Type 0xE5 - HeatPump Monitor 2
  */
 void _process_HPMonitor2(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_HeatPump.HPSpeed = _toByte(25); // speed %
+    _setValue(EMS_RxTelegram, &EMS_HeatPump.HPSpeed, 25); // %
 
     EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
  * Junkers ISM1 Solar Module - type 0x0003 EMS+ for energy readings
+ *  e.g. B0 00 FF 00 00 03 32 00 00 00 00 13 00 D6 00 00 00 FB D0 F0
  */
 void _process_ISM1StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     if (EMS_RxTelegram->offset == 0) {
-        // e.g. B0 00 FF 00 00 03 32 00 00 00 00 13 00 D6 00 00 00 FB D0 F0
-        EMS_SolarModule.collectorTemp  = _toShort(4);    // Collector Temperature
-        EMS_SolarModule.bottomTemp     = _toShort(6);    // Temperature Bottom of Solar Boiler
-        EMS_SolarModule.EnergyLastHour = _toShort(2);    // Solar Energy produced in last hour - is * 10 and handled in ems-esp.cpp
-        EMS_SolarModule.pump           = _bitRead(8, 0); // Solar pump on (1) or off (0)
-        EMS_SolarModule.pumpWorkMin    = _toLong(10);
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.collectorTemp, 4);  // Collector Temperature
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.bottomTemp, 6);     // Temperature Bottom of Solar Boiler
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.EnergyLastHour, 2); // Solar Energy produced in last hour - is * 10 and handled in ems-esp.cpp
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 8, 0);        // Solar pump on (1) or off (0)
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpWorkMin, 10);
     }
 
     if (EMS_RxTelegram->offset == 4) {
         // e.g. B0 00 FF 04 00 03 02 E5
-        EMS_SolarModule.collectorTemp = _toShort(0); // Collector Temperature
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.collectorTemp, 0); // Collector Temperature
     }
 }
 
@@ -1867,7 +1895,7 @@ void _process_ISM1Set(_EMS_RxTelegram * EMS_RxTelegram) {
     if (EMS_RxTelegram->offset == 6) {
         // e.g. 90 30 FF 06 00 01 50 (CRC=2C)
         // to implement: change max solar boiler temperature
-        EMS_SolarModule.setpoint_maxBottomTemp = _toByte(0);
+        EMS_SolarModule.setpoint_maxBottomTemp = EMS_RxTelegram->data[0];
     }
 }
 
@@ -1907,17 +1935,17 @@ void _process_RCTime(_EMS_RxTelegram * EMS_RxTelegram) {
     char time_sp[25];
     char buffer[4];
 
-    strlcpy(time_sp, _smallitoa(_toByte(2), buffer), sizeof(time_sp)); // hour
+    strlcpy(time_sp, _smallitoa(EMS_RxTelegram->data[2], buffer), sizeof(time_sp)); // hour
     strlcat(time_sp, ":", sizeof(time_sp));
-    strlcat(time_sp, _smallitoa(_toByte(4), buffer), sizeof(time_sp)); // minute
+    strlcat(time_sp, _smallitoa(EMS_RxTelegram->data[4], buffer), sizeof(time_sp)); // minute
     strlcat(time_sp, ":", sizeof(time_sp));
-    strlcat(time_sp, _smallitoa(_toByte(5), buffer), sizeof(time_sp)); // second
+    strlcat(time_sp, _smallitoa(EMS_RxTelegram->data[5], buffer), sizeof(time_sp)); // second
     strlcat(time_sp, " ", sizeof(time_sp));
-    strlcat(time_sp, _smallitoa(_toByte(3), buffer), sizeof(time_sp)); // day
+    strlcat(time_sp, _smallitoa(EMS_RxTelegram->data[3], buffer), sizeof(time_sp)); // day
     strlcat(time_sp, "/", sizeof(time_sp));
-    strlcat(time_sp, _smallitoa(_toByte(1), buffer), sizeof(time_sp)); // month
+    strlcat(time_sp, _smallitoa(EMS_RxTelegram->data[1], buffer), sizeof(time_sp)); // month
     strlcat(time_sp, "/", sizeof(time_sp));
-    strlcat(time_sp, itoa(_toByte(0) + 2000, buffer, 10), sizeof(time_sp)); // year
+    strlcat(time_sp, itoa(EMS_RxTelegram->data[0] + 2000, buffer, 10), sizeof(time_sp)); // year
 
     strlcpy(EMS_Thermostat.datetime, time_sp, sizeof(time_sp)); // store
 }
@@ -2055,12 +2083,12 @@ void _process_Version(_EMS_RxTelegram * EMS_RxTelegram) {
     // get version as XX.XX
     char version[10] = {0};
     char buf[6]      = {0};
-    strlcpy(version, _smallitoa(_toByte(offset + 1), buf), sizeof(version));
+    strlcpy(version, _smallitoa(EMS_RxTelegram->data[offset + 1], buf), sizeof(version));
     strlcat(version, ".", sizeof(version));
-    strlcat(version, _smallitoa(_toByte(offset + 2), buf), sizeof(version));
+    strlcat(version, _smallitoa(EMS_RxTelegram->data[offset + 2], buf), sizeof(version));
 
     // scan through known devices matching the productid
-    uint8_t product_id = _toByte(offset);
+    uint8_t product_id = EMS_RxTelegram->data[offset];
     uint8_t i          = 0;
     bool    typeFound  = false;
     while (i < _EMS_Devices_max) {

From b8a55a1f8cbf2abf4b2ee3ccce441c28d7a55eab Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Mon, 2 Dec 2019 23:20:00 +0100
Subject: [PATCH 108/120] increase ws buffer sizes -
 https://github.com/proddy/EMS-ESP/issues/250

---
 src/MyESP.cpp   | 33 +++++++++++++++++----------------
 src/MyESP.h     |  8 +++++---
 src/ems-esp.cpp | 30 +++++++++++++++---------------
 src/version.h   |  2 +-
 4 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index a01222dc6..c48ae5d62 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -1472,8 +1472,8 @@ void MyESP::_heartbeatCheck(bool force) {
         uint32_t free_memory   = ESP.getFreeHeap();
         uint8_t  mem_available = 100 * free_memory / total_memory; // as a %
 
-        StaticJsonDocument<200> doc;
-        JsonObject              rootHeartbeat = doc.to<JsonObject>();
+        StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+        JsonObject                                   rootHeartbeat = doc.to<JsonObject>();
 
         rootHeartbeat["version"]         = _app_version;
         rootHeartbeat["IP"]              = WiFi.localIP().toString();
@@ -2312,11 +2312,13 @@ void MyESP::_onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, A
 // handle ws from browser
 void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
     // We should always get a JSON object from browser, so parse it
-    StaticJsonDocument<500> doc;
-    char                    json[sz + 1];
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_MEDIUM> doc;
+    char                                          json[sz + 1];
     memcpy(json, (char *)(client->_tempObject), sz);
     json[sz] = '\0';
 
+    // Serial.printf("[%s]", json);
+
     JsonObject           root  = doc.to<JsonObject>();       // create empty object
     DeserializationError error = deserializeJson(doc, json); // Deserialize the JSON document
     if (error) {
@@ -2410,8 +2412,7 @@ bool MyESP::_fs_sendConfig() {
 
 // send custom status via ws
 void MyESP::_sendCustomStatus() {
-    // StaticJsonDocument<300> doc;
-    DynamicJsonDocument doc(MYESP_JSON_MAXSIZE);
+    DynamicJsonDocument doc(MYESP_JSON_MAXSIZE_LARGE);
 
     JsonObject root = doc.to<JsonObject>();
 
@@ -2427,7 +2428,7 @@ void MyESP::_sendCustomStatus() {
         (_web_callback_f)(root);
     }
 
-    char   buffer[MYESP_JSON_MAXSIZE];
+    char   buffer[MYESP_JSON_MAXSIZE_LARGE];
     size_t len = serializeJson(root, buffer);
 
 #ifdef MYESP_DEBUG
@@ -2536,9 +2537,9 @@ void MyESP::_printScanResult(int networksFound) {
         }
     }
 
-    StaticJsonDocument<400> doc;
-    JsonObject              root = doc.to<JsonObject>();
-    root["command"]              = "ssidlist";
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_MEDIUM> doc;
+    JsonObject                                    root = doc.to<JsonObject>();
+    root["command"]                                    = "ssidlist";
 
     JsonArray list = doc.createNestedArray("list");
     for (int i = 0; i <= 5 && i < networksFound; ++i) {
@@ -2548,7 +2549,7 @@ void MyESP::_printScanResult(int networksFound) {
         item["rssi"]    = WiFi.RSSI(indices[i]);
     }
 
-    char   buffer[400];
+    char   buffer[MYESP_JSON_MAXSIZE_MEDIUM];
     size_t len = serializeJson(root, buffer);
     _ws->textAll(buffer, len);
 }
@@ -2750,12 +2751,12 @@ void MyESP::_addMQTTLog(const char * topic, const char * payload, const MYESP_MQ
 
 // send UTC time via ws
 void MyESP::_sendTime() {
-    StaticJsonDocument<100> doc;
-    JsonObject              root = doc.to<JsonObject>();
-    root["command"]              = "gettime";
-    root["epoch"]                = now();
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+    JsonObject                                   root = doc.to<JsonObject>();
+    root["command"]                                   = "gettime";
+    root["epoch"]                                     = now();
 
-    char   buffer[100];
+    char   buffer[MYESP_JSON_MAXSIZE_SMALL];
     size_t len = serializeJson(root, buffer);
     _ws->textAll(buffer, len);
 }
diff --git a/src/MyESP.h b/src/MyESP.h
index 899a35a96..b79bd64c6 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -103,9 +103,11 @@ extern struct rst_info resetInfo;
 #define MQTT_DISCONNECT_EVENT 1
 #define MQTT_MESSAGE_EVENT 2
 
-#define MYESP_JSON_MAXSIZE 2000    // for large Dynamic json files
-#define MYESP_MQTTLOG_MAX 60       // max number of log entries for MQTT publishes and subscribes
-#define MYESP_JSON_LOG_MAXSIZE 300 // max size of an JSON log entry
+#define MYESP_JSON_MAXSIZE_LARGE 2000 // for large Dynamic json files
+#define MYESP_JSON_MAXSIZE_MEDIUM 800 // for medium Dynamic json files
+#define MYESP_JSON_MAXSIZE_SMALL 200  // for smaller Static json documents
+
+#define MYESP_MQTTLOG_MAX 60 // max number of log entries for MQTT publishes and subscribes
 
 #define MYESP_MQTT_PAYLOAD_ON '1'  // for MQTT switch on
 #define MYESP_MQTT_PAYLOAD_OFF '0' // for MQTT switch off
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 69cd55363..067986665 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -515,8 +515,8 @@ void publishSensorValues(bool force) {
         return; // no sensors attached
     }
 
-    StaticJsonDocument<200> doc;
-    JsonObject              sensors = doc.to<JsonObject>();
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+    JsonObject                                   sensors = doc.to<JsonObject>();
 
     bool hasdata  = false;
     char label[8] = {0};
@@ -539,7 +539,7 @@ void publishSensorValues(bool force) {
     CRC32    crc;
     uint32_t fchecksum;
 
-    char data[200] = {0};
+    char data[MYESP_JSON_MAXSIZE_SMALL] = {0};
     serializeJson(doc, data, sizeof(data));
 
     size_t jsonSize = measureJson(doc);
@@ -1038,10 +1038,10 @@ bool LoadSaveCallback(MYESP_FSACTION_t action, JsonObject settings) {
 
 // Publish shower data
 bool do_publishShowerData() {
-    StaticJsonDocument<200> doc;
-    JsonObject              rootShower = doc.to<JsonObject>();
-    rootShower[TOPIC_SHOWER_TIMER]     = EMSESP_Settings.shower_timer ? "1" : "0";
-    rootShower[TOPIC_SHOWER_ALERT]     = EMSESP_Settings.shower_alert ? "1" : "0";
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+    JsonObject                                   rootShower = doc.to<JsonObject>();
+    rootShower[TOPIC_SHOWER_TIMER]                          = EMSESP_Settings.shower_timer ? "1" : "0";
+    rootShower[TOPIC_SHOWER_ALERT]                          = EMSESP_Settings.shower_alert ? "1" : "0";
 
     // only publish shower duration if there is a value
     char s[50] = {0};
@@ -1486,8 +1486,8 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
     // check first for generic commands
     if (strcmp(topic, TOPIC_GENERIC_CMD) == 0) {
         // convert JSON and get the command
-        StaticJsonDocument<100> doc;
-        DeserializationError    error = deserializeJson(doc, message); // Deserialize the JSON document
+        StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+        DeserializationError                         error = deserializeJson(doc, message); // Deserialize the JSON document
         if (error) {
             myDebug_P(PSTR("[MQTT] Invalid command from topic %s, payload %s, error %s"), topic, message, error.c_str());
             return;
@@ -1505,8 +1505,8 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
 
     // check for shower commands
     if (strcmp(topic, TOPIC_SHOWER_DATA) == 0) {
-        StaticJsonDocument<100> doc;
-        DeserializationError    error = deserializeJson(doc, message); // Deserialize the JSON document
+        StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+        DeserializationError                         error = deserializeJson(doc, message); // Deserialize the JSON document
         if (error) {
             myDebug_P(PSTR("[MQTT] Invalid command from topic %s, payload %s, error %s"), topic, message, error.c_str());
             return;
@@ -1532,8 +1532,8 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
     // check for boiler commands
     if (strcmp(topic, TOPIC_BOILER_CMD) == 0) {
         // convert JSON and get the command
-        StaticJsonDocument<100> doc;
-        DeserializationError    error = deserializeJson(doc, message); // Deserialize the JSON document
+        StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+        DeserializationError                         error = deserializeJson(doc, message); // Deserialize the JSON document
         if (error) {
             myDebug_P(PSTR("[MQTT] Invalid command from topic %s, payload %s, error %s"), topic, message, error.c_str());
             return;
@@ -1619,8 +1619,8 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
     // check for generic thermostat commands
     if (strcmp(topic, TOPIC_THERMOSTAT_CMD) == 0) {
         // convert JSON and get the command
-        StaticJsonDocument<100> doc;
-        DeserializationError    error = deserializeJson(doc, message); // Deserialize the JSON document
+        StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+        DeserializationError                         error = deserializeJson(doc, message); // Deserialize the JSON document
         if (error) {
             myDebug_P(PSTR("[MQTT] Invalid command from topic %s, payload %s, error %s"), topic, message, error.c_str());
             return;
diff --git a/src/version.h b/src/version.h
index 3abff063c..332d9f39b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b21"
+#define APP_VERSION "1.9.4b22"

From c20c4998e98b37cf48bfebc135603269281cf3cf Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 3 Dec 2019 20:30:14 +0100
Subject: [PATCH 109/120] esnure heating and tap water mqtt messages are sent
 immediately

---
 src/ems-esp.cpp | 13 ++++---------
 src/ems.cpp     |  2 ++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 067986665..4b4ec77f4 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -706,12 +706,12 @@ void publishEMSValues(bool force) {
 
     // see if the heating or hot tap water has changed, if so send
     // last_boilerActive stores heating in bit 1 and tap water in bit 2
-    if ((last_boilerActive != ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive)) || force) {
+    if ((last_boilerActive != ((EMS_Boiler.tapwaterActive << 1) | EMS_Boiler.heatingActive)) || force) {
         myDebugLog("Publishing hot water and heating states via MQTT");
         myESP.mqttPublish(TOPIC_BOILER_TAPWATER_ACTIVE, EMS_Boiler.tapwaterActive == 1 ? "1" : "0");
         myESP.mqttPublish(TOPIC_BOILER_HEATING_ACTIVE, EMS_Boiler.heatingActive == 1 ? "1" : "0");
 
-        last_boilerActive = ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive); // remember last state
+        last_boilerActive = ((EMS_Boiler.tapwaterActive << 1) | EMS_Boiler.heatingActive); // remember last state
     }
 
     // handle the thermostat values
@@ -2030,13 +2030,8 @@ void loop() {
             do_regularUpdates();
             publishEMSValues(true);
             publishSensorValues(true);
-            _need_first_publish = false; // reset flag
-        }
-
-        // publish all the values to MQTT
-        // but only if the values have changed and publish_time is on automatic mode
-        // always publish when we get the first results, regardless of any publish_time setting
-        if (EMSESP_Settings.publish_time == 0) {
+            _need_first_publish = false; // reset flag, so only do this once
+        } else {
             publishEMSValues(false);
             publishSensorValues(false);
         }
diff --git a/src/ems.cpp b/src/ems.cpp
index 28d5138b1..4f608fb39 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1272,6 +1272,8 @@ void _checkActive() {
     if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET && EMS_Boiler.burnGas != EMS_VALUE_INT_NOTSET) {
         EMS_Boiler.heatingActive = ((EMS_Boiler.selFlowTemp >= EMS_BOILER_SELFLOWTEMP_HEATING) && (EMS_Boiler.burnGas == EMS_VALUE_INT_ON));
     }
+
+    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /**

From 47ab9627baedb7473a547f06687ea8e4fb13542f Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 4 Dec 2019 16:50:39 +0100
Subject: [PATCH 110/120] added uuid libs -
 https://github.com/proddy/EMS-ESP/issues/251

---
 platformio.ini | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index da681e846..b28863cb6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -45,13 +45,15 @@ lib_deps =
   https://github.com/PaulStoffregen/OneWire
   https://github.com/me-no-dev/ESPAsyncWebServer
   https://github.com/bakercp/CRC32
-  https://github.com/nomis/mcu-uuid-syslog
+  https://github.com/me-no-dev/ESPAsyncUDP
+  uuid-common@^1.1.0
+	uuid-log@^2.1.1
+	uuid-syslog@^2.0.4 ; https://github.com/nomis/mcu-uuid-syslog
   JustWifi@2.0.2 ; https://github.com/xoseperez/justwifi
   AsyncMqttClient@0.8.2 ; https://github.com/marvinroger/async-mqtt-client
   EEPROM_Rotate@0.9.2 ; https://github.com/xoseperez/eeprom_rotate
   ArduinoJson@6.13.0 ; https://github.com/bblanchon/ArduinoJson
-  ESPAsyncTCP@1.2.2 ; https://github.com/me-no-dev/ESPAsyncTCP 
-  https://github.com/me-no-dev/ESPAsyncUDP
+  ESPAsyncTCP@1.2.2 ; https://github.com/me-no-dev/ESPAsyncTCP
 upload_speed = 921600
 monitor_speed = 115200
 

From 1150c197e2f23c640210ffddb75288ad90f3966e Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 4 Dec 2019 23:30:35 +0100
Subject: [PATCH 111/120] add uuid-* libs -
 https://github.com/proddy/EMS-ESP/issues/251

---
 platformio.ini | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index da681e846..636663a2f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -45,13 +45,16 @@ lib_deps =
   https://github.com/PaulStoffregen/OneWire
   https://github.com/me-no-dev/ESPAsyncWebServer
   https://github.com/bakercp/CRC32
-  https://github.com/nomis/mcu-uuid-syslog
+  https://github.com/me-no-dev/ESPAsyncUDP
   JustWifi@2.0.2 ; https://github.com/xoseperez/justwifi
   AsyncMqttClient@0.8.2 ; https://github.com/marvinroger/async-mqtt-client
   EEPROM_Rotate@0.9.2 ; https://github.com/xoseperez/eeprom_rotate
   ArduinoJson@6.13.0 ; https://github.com/bblanchon/ArduinoJson
-  ESPAsyncTCP@1.2.2 ; https://github.com/me-no-dev/ESPAsyncTCP 
-  https://github.com/me-no-dev/ESPAsyncUDP
+  ESPAsyncTCP@1.2.2 ; https://github.com/me-no-dev/ESPAsyncTCP
+  uuid-common@^1.1.0
+  uuid-log@^2.1.1
+  uuid-syslog@^2.0.4 ; https://github.com/nomis/mcu-uuid-syslog
+
 upload_speed = 921600
 monitor_speed = 115200
 

From 2bfa899c0a2bb36ddd43bc2242a6f6899726e46b Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Thu, 5 Dec 2019 23:20:00 +0100
Subject: [PATCH 112/120] handle negative short values

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

diff --git a/src/ems_utils.cpp b/src/ems_utils.cpp
index 2912c06f3..41e7e894e 100644
--- a/src/ems_utils.cpp
+++ b/src/ems_utils.cpp
@@ -55,6 +55,8 @@ char * _short_to_char(char * s, int16_t value, uint8_t decimals) {
     if (value < 0) {
         strlcpy(s, "-", 10);
         value *= -1; // convert to positive
+    } else {
+        strlcpy(s, "", 10);
     }
 
     // do floating point

From 124ad14c8697cac040d4c38c0cc00201f3aa6633 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 6 Dec 2019 20:28:17 +0100
Subject: [PATCH 113/120] remove CRC32

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

diff --git a/platformio.ini b/platformio.ini
index b28863cb6..0dc5ab602 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -44,7 +44,6 @@ lib_deps =
   https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
   https://github.com/me-no-dev/ESPAsyncWebServer
-  https://github.com/bakercp/CRC32
   https://github.com/me-no-dev/ESPAsyncUDP
   uuid-common@^1.1.0
 	uuid-log@^2.1.1

From e9ba4991b39a386ea864ef34b648907efcb1c530 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 6 Dec 2019 20:28:51 +0100
Subject: [PATCH 114/120] refactor publish_time -
 https://github.com/proddy/EMS-ESP/issues/253

---
 CHANGELOG.md      |   3 +-
 src/ems-esp.cpp   | 387 +++++++------------
 src/ems.cpp       | 964 ++++++++++++++++++++--------------------------
 src/ems.h         |  39 +-
 src/ems_utils.cpp |   6 +-
 src/version.h     |   2 +-
 6 files changed, 593 insertions(+), 808 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47d17bb0d..630609ce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,10 +34,11 @@ There are breaking changes in this release. See `publish_time` below and make su
 - fixed version numbers of libraries in `platformio.ini`
 - Normalized Heating modes to `off`, `manual`, `auto`, `night` and `day` to keep generic and not Home Assistant specific (like `heat`)
 - Keeping Thermostat day/night modes separate from off/auto/manual, and setting this for the Junkers FR50
-- Removed `publish_always` and use `publish_time`. For automatic mode you will need to change `publish_time` to 0 which will send MQTT every time data has changed (every 10 seconds).
+- Removed `publish_always`
 - Changed NTP interval from 1 hour to 12 hours
 - Refactored EMS device library to make it support multi-EMS devices easier (e.g. multiple thermostats)
 - `autodetect deep` removed and replaced with `autodetect scan` for scanning known devices.
+- MQTT data will be sent when new data arrives. So `publish_time` is used to force a publish at a given frequency (2 mins is default), or 0 for off.
 
 ### Removed
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 69cd55363..f37473887 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -22,7 +22,6 @@ DS18 ds18;
 
 // public libraries
 #include <ArduinoJson.h> // https://github.com/bblanchon/ArduinoJson
-#include <CRC32.h>       // https://github.com/bakercp/CRC32
 
 // standard arduino libs
 #include <Ticker.h> // https://github.com/esp8266/Arduino/tree/master/libraries/Ticker
@@ -505,7 +504,7 @@ void showInfo() {
 }
 
 // send all dallas sensor values as a JSON package to MQTT
-void publishSensorValues(bool force) {
+void publishSensorValues() {
     // don't send if MQTT is connected
     if (!myESP.isMQTTConnected()) {
         return;
@@ -536,186 +535,145 @@ void publishSensorValues(bool force) {
         return; // nothing to send
     }
 
-    CRC32    crc;
-    uint32_t fchecksum;
-
     char data[200] = {0};
     serializeJson(doc, data, sizeof(data));
-
-    size_t jsonSize = measureJson(doc);
-    if (hasdata && (jsonSize > 2)) {
-        // calculate hash and send values if something has changed, to save unnecessary wifi traffic
-        for (uint8_t i = 0; i < (jsonSize - 1); i++) {
-            crc.update(data[i]);
-        }
-        fchecksum = crc.finalize();
-        static uint32_t previousSensorPublishCRC; // CRC check for new values
-        if ((previousSensorPublishCRC != fchecksum) || force) {
-            previousSensorPublishCRC = fchecksum;
-            myDebugLog("Publishing external sensor data via MQTT");
-            myESP.mqttPublish(TOPIC_EXTERNAL_SENSORS, data);
-        }
-    }
+    myDebugLog("Publishing external sensor data via MQTT");
+    myESP.mqttPublish(TOPIC_EXTERNAL_SENSORS, data);
 }
 
 // send values via MQTT
-// a json object is created for the boiler and one for the thermostat
-// CRC check is done to see if there are changes in the values since the last send to avoid too much wifi traffic
-// a check is done against the previous values and if there are changes only then they are published. Unless force=true
+// a json object is created for each device type
 void publishEMSValues(bool force) {
-    // don't send if MQTT is not connected
-    if (!myESP.isMQTTConnected()) {
+    // don't send if MQTT is not connected or EMS bus is not connected
+    if (!myESP.isMQTTConnected() || (!ems_getBusConnected())) {
         return;
     }
 
-    if (!ems_getBusConnected()) {
-        return; // EMS bus is not connected
-    }
-
-    // Always send values is there is a publish_time is set to 0
-    force = !EMSESP_Settings.publish_time;
-
     char                                      s[20] = {0}; // for formatting strings
     StaticJsonDocument<MQTT_MAX_PAYLOAD_SIZE> doc;
     char                                      data[MQTT_MAX_PAYLOAD_SIZE] = {0};
-    CRC32                                     crc;
-    uint32_t                                  fchecksum;
     uint8_t                                   jsonSize;
 
-    static uint8_t  last_boilerActive        = 0xFF; // for remembering last setting of the tap water or heating on/off
-    static uint32_t previousBoilerPublishCRC = 0;    // CRC check for boiler values
-    static uint32_t previousThermostatPublishCRC;    // CRC check for thermostat values
-    static uint32_t previousMixingPublishCRC;        // CRC check for mixing values
-    static uint32_t previousSMPublishCRC = 0;        // CRC check for Solar Module values (e.g. SM10)
+    static uint8_t last_boilerActive = 0xFF; // for remembering last setting of the tap water or heating on/off
 
-    JsonObject rootBoiler = doc.to<JsonObject>();
+    // do we have boiler changes?
+    if (ems_getBoilerEnabled() && (ems_Device_has_flags(EMS_DEVICE_UPDATE_FLAG_BOILER) || force)) {
+        JsonObject rootBoiler = doc.to<JsonObject>();
 
-    if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Hot) {
-        rootBoiler["wWComfort"] = "Hot";
-    } else if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Eco) {
-        rootBoiler["wWComfort"] = "Eco";
-    } else if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Intelligent) {
-        rootBoiler["wWComfort"] = "Intelligent";
-    }
-
-    if (EMS_Boiler.wWSelTemp != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWSelTemp"] = EMS_Boiler.wWSelTemp;
-    if (EMS_Boiler.wWDesiredTemp != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWDesiredTemp"] = EMS_Boiler.wWDesiredTemp;
-    if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET)
-        rootBoiler["selFlowTemp"] = EMS_Boiler.selFlowTemp;
-    if (EMS_Boiler.selBurnPow != EMS_VALUE_INT_NOTSET)
-        rootBoiler["selBurnPow"] = EMS_Boiler.selBurnPow;
-    if (EMS_Boiler.curBurnPow != EMS_VALUE_INT_NOTSET)
-        rootBoiler["curBurnPow"] = EMS_Boiler.curBurnPow;
-    if (EMS_Boiler.pumpMod != EMS_VALUE_INT_NOTSET)
-        rootBoiler["pumpMod"] = EMS_Boiler.pumpMod;
-    if (EMS_Boiler.wWCircPump != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWCircPump"] = EMS_Boiler.wWCircPump;
-
-    if (EMS_Boiler.extTemp != EMS_VALUE_SHORT_NOTSET)
-        rootBoiler["outdoorTemp"] = (float)EMS_Boiler.extTemp / 10;
-    if (EMS_Boiler.wWCurTmp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["wWCurTmp"] = (float)EMS_Boiler.wWCurTmp / 10;
-    if (EMS_Boiler.wWCurFlow != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWCurFlow"] = (float)EMS_Boiler.wWCurFlow / 10;
-    if (EMS_Boiler.curFlowTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["curFlowTemp"] = (float)EMS_Boiler.curFlowTemp / 10;
-    if (EMS_Boiler.retTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["retTemp"] = (float)EMS_Boiler.retTemp / 10;
-    if (EMS_Boiler.switchTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["switchTemp"] = (float)EMS_Boiler.switchTemp / 10;
-    if (EMS_Boiler.sysPress != EMS_VALUE_INT_NOTSET)
-        rootBoiler["sysPress"] = (float)EMS_Boiler.sysPress / 10;
-    if (EMS_Boiler.boilTemp != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["boilTemp"] = (float)EMS_Boiler.boilTemp / 10;
-
-    if (EMS_Boiler.wWActivated != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWActivated"] = _bool_to_char(s, EMS_Boiler.wWActivated);
-
-    if (EMS_Boiler.wWActivated != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWOnetime"] = _bool_to_char(s, EMS_Boiler.wWOneTime);
-
-    if (EMS_Boiler.burnGas != EMS_VALUE_INT_NOTSET)
-        rootBoiler["burnGas"] = _bool_to_char(s, EMS_Boiler.burnGas);
-
-    if (EMS_Boiler.flameCurr != EMS_VALUE_USHORT_NOTSET)
-        rootBoiler["flameCurr"] = (float)(int16_t)EMS_Boiler.flameCurr / 10;
-
-    if (EMS_Boiler.heatPmp != EMS_VALUE_INT_NOTSET)
-        rootBoiler["heatPmp"] = _bool_to_char(s, EMS_Boiler.heatPmp);
-
-    if (EMS_Boiler.fanWork != EMS_VALUE_INT_NOTSET)
-        rootBoiler["fanWork"] = _bool_to_char(s, EMS_Boiler.fanWork);
-
-    if (EMS_Boiler.ignWork != EMS_VALUE_INT_NOTSET)
-        rootBoiler["ignWork"] = _bool_to_char(s, EMS_Boiler.ignWork);
-
-    if (EMS_Boiler.wWCirc != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWCirc"] = _bool_to_char(s, EMS_Boiler.wWCirc);
-
-    if (EMS_Boiler.heating_temp != EMS_VALUE_INT_NOTSET)
-        rootBoiler["heating_temp"] = EMS_Boiler.heating_temp;
-    if (EMS_Boiler.pump_mod_max != EMS_VALUE_INT_NOTSET)
-        rootBoiler["pump_mod_max"] = EMS_Boiler.pump_mod_max;
-    if (EMS_Boiler.pump_mod_min != EMS_VALUE_INT_NOTSET)
-        rootBoiler["pump_mod_min"] = EMS_Boiler.pump_mod_min;
-
-    if (EMS_Boiler.wWHeat != EMS_VALUE_INT_NOTSET)
-        rootBoiler["wWHeat"] = _bool_to_char(s, EMS_Boiler.wWHeat);
-
-    // **** also add burnStarts, burnWorkMin, heatWorkMin
-    if (abs(EMS_Boiler.wWStarts) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["wWStarts"] = (float)EMS_Boiler.wWStarts;
-    if (abs(EMS_Boiler.wWWorkM) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["wWWorkM"] = (float)EMS_Boiler.wWWorkM;
-    if (abs(EMS_Boiler.UBAuptime) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["UBAuptime"] = (float)EMS_Boiler.UBAuptime;
-
-    // **** also add burnStarts, burnWorkMin, heatWorkMin
-    if (abs(EMS_Boiler.burnStarts) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["burnStarts"] = (float)EMS_Boiler.burnStarts;
-    if (abs(EMS_Boiler.burnWorkMin) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["burnWorkMin"] = (float)EMS_Boiler.burnWorkMin;
-    if (abs(EMS_Boiler.heatWorkMin) != EMS_VALUE_LONG_NOTSET)
-        rootBoiler["heatWorkMin"] = (float)EMS_Boiler.heatWorkMin;
-
-    if (EMS_Boiler.serviceCode != EMS_VALUE_USHORT_NOTSET) {
-        rootBoiler["ServiceCode"]       = EMS_Boiler.serviceCodeChar;
-        rootBoiler["ServiceCodeNumber"] = EMS_Boiler.serviceCode;
-    }
-
-    serializeJson(doc, data, sizeof(data));
-
-    // check for empty json
-    jsonSize = measureJson(doc);
-    if (jsonSize > 2) {
-        // calculate hash and send values if something has changed, to save unnecessary wifi traffic
-        for (uint8_t i = 0; i < (jsonSize - 1); i++) {
-            crc.update(data[i]);
+        if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Hot) {
+            rootBoiler["wWComfort"] = "Hot";
+        } else if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Eco) {
+            rootBoiler["wWComfort"] = "Eco";
+        } else if (EMS_Boiler.wWComfort == EMS_VALUE_UBAParameterWW_wwComfort_Intelligent) {
+            rootBoiler["wWComfort"] = "Intelligent";
         }
-        fchecksum = crc.finalize();
-        if ((previousBoilerPublishCRC != fchecksum) || force) {
-            previousBoilerPublishCRC = fchecksum;
-            myDebugLog("Publishing boiler data via MQTT");
 
-            // send values via MQTT
-            myESP.mqttPublish(TOPIC_BOILER_DATA, data);
+        if (EMS_Boiler.wWSelTemp != EMS_VALUE_INT_NOTSET)
+            rootBoiler["wWSelTemp"] = EMS_Boiler.wWSelTemp;
+        if (EMS_Boiler.wWDesiredTemp != EMS_VALUE_INT_NOTSET)
+            rootBoiler["wWDesiredTemp"] = EMS_Boiler.wWDesiredTemp;
+        if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET)
+            rootBoiler["selFlowTemp"] = EMS_Boiler.selFlowTemp;
+        if (EMS_Boiler.selBurnPow != EMS_VALUE_INT_NOTSET)
+            rootBoiler["selBurnPow"] = EMS_Boiler.selBurnPow;
+        if (EMS_Boiler.curBurnPow != EMS_VALUE_INT_NOTSET)
+            rootBoiler["curBurnPow"] = EMS_Boiler.curBurnPow;
+        if (EMS_Boiler.pumpMod != EMS_VALUE_INT_NOTSET)
+            rootBoiler["pumpMod"] = EMS_Boiler.pumpMod;
+        if (EMS_Boiler.wWCircPump != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["wWCircPump"] = EMS_Boiler.wWCircPump;
+
+        if (EMS_Boiler.extTemp != EMS_VALUE_SHORT_NOTSET)
+            rootBoiler["outdoorTemp"] = (float)EMS_Boiler.extTemp / 10;
+        if (EMS_Boiler.wWCurTmp != EMS_VALUE_USHORT_NOTSET)
+            rootBoiler["wWCurTmp"] = (float)EMS_Boiler.wWCurTmp / 10;
+        if (EMS_Boiler.wWCurFlow != EMS_VALUE_INT_NOTSET)
+            rootBoiler["wWCurFlow"] = (float)EMS_Boiler.wWCurFlow / 10;
+        if (EMS_Boiler.curFlowTemp != EMS_VALUE_USHORT_NOTSET)
+            rootBoiler["curFlowTemp"] = (float)EMS_Boiler.curFlowTemp / 10;
+        if (EMS_Boiler.retTemp != EMS_VALUE_USHORT_NOTSET)
+            rootBoiler["retTemp"] = (float)EMS_Boiler.retTemp / 10;
+        if (EMS_Boiler.switchTemp != EMS_VALUE_USHORT_NOTSET)
+            rootBoiler["switchTemp"] = (float)EMS_Boiler.switchTemp / 10;
+        if (EMS_Boiler.sysPress != EMS_VALUE_INT_NOTSET)
+            rootBoiler["sysPress"] = (float)EMS_Boiler.sysPress / 10;
+        if (EMS_Boiler.boilTemp != EMS_VALUE_USHORT_NOTSET)
+            rootBoiler["boilTemp"] = (float)EMS_Boiler.boilTemp / 10;
+
+        if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["wWActivated"] = _bool_to_char(s, EMS_Boiler.wWActivated);
+
+        if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["wWOnetime"] = _bool_to_char(s, EMS_Boiler.wWOneTime);
+
+        if (EMS_Boiler.burnGas != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["burnGas"] = _bool_to_char(s, EMS_Boiler.burnGas);
+
+        if (EMS_Boiler.flameCurr != EMS_VALUE_USHORT_NOTSET)
+            rootBoiler["flameCurr"] = (float)(int16_t)EMS_Boiler.flameCurr / 10;
+
+        if (EMS_Boiler.heatPmp != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["heatPmp"] = _bool_to_char(s, EMS_Boiler.heatPmp);
+
+        if (EMS_Boiler.fanWork != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["fanWork"] = _bool_to_char(s, EMS_Boiler.fanWork);
+
+        if (EMS_Boiler.ignWork != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["ignWork"] = _bool_to_char(s, EMS_Boiler.ignWork);
+
+        if (EMS_Boiler.wWCirc != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["wWCirc"] = _bool_to_char(s, EMS_Boiler.wWCirc);
+
+        if (EMS_Boiler.heating_temp != EMS_VALUE_INT_NOTSET)
+            rootBoiler["heating_temp"] = EMS_Boiler.heating_temp;
+        if (EMS_Boiler.pump_mod_max != EMS_VALUE_INT_NOTSET)
+            rootBoiler["pump_mod_max"] = EMS_Boiler.pump_mod_max;
+        if (EMS_Boiler.pump_mod_min != EMS_VALUE_INT_NOTSET)
+            rootBoiler["pump_mod_min"] = EMS_Boiler.pump_mod_min;
+
+        if (EMS_Boiler.wWHeat != EMS_VALUE_BOOL_NOTSET)
+            rootBoiler["wWHeat"] = _bool_to_char(s, EMS_Boiler.wWHeat);
+
+        /*
+        if (abs(EMS_Boiler.wWStarts) != EMS_VALUE_LONG_NOTSET)
+            rootBoiler["wWStarts"] = (float)EMS_Boiler.wWStarts;
+        if (abs(EMS_Boiler.wWWorkM) != EMS_VALUE_LONG_NOTSET)
+            rootBoiler["wWWorkM"] = (float)EMS_Boiler.wWWorkM;
+        if (abs(EMS_Boiler.UBAuptime) != EMS_VALUE_LONG_NOTSET)
+            rootBoiler["UBAuptime"] = (float)EMS_Boiler.UBAuptime;
+
+        if (abs(EMS_Boiler.burnStarts) != EMS_VALUE_LONG_NOTSET)
+            rootBoiler["burnStarts"] = (float)EMS_Boiler.burnStarts;
+        if (abs(EMS_Boiler.burnWorkMin) != EMS_VALUE_LONG_NOTSET)
+            rootBoiler["burnWorkMin"] = (float)EMS_Boiler.burnWorkMin;
+        if (abs(EMS_Boiler.heatWorkMin) != EMS_VALUE_LONG_NOTSET)
+            rootBoiler["heatWorkMin"] = (float)EMS_Boiler.heatWorkMin;
+            */
+
+        if (EMS_Boiler.serviceCode != EMS_VALUE_USHORT_NOTSET) {
+            rootBoiler["ServiceCode"]       = EMS_Boiler.serviceCodeChar;
+            rootBoiler["ServiceCodeNumber"] = EMS_Boiler.serviceCode;
         }
-    }
 
-    // see if the heating or hot tap water has changed, if so send
-    // last_boilerActive stores heating in bit 1 and tap water in bit 2
-    if ((last_boilerActive != ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive)) || force) {
-        myDebugLog("Publishing hot water and heating states via MQTT");
-        myESP.mqttPublish(TOPIC_BOILER_TAPWATER_ACTIVE, EMS_Boiler.tapwaterActive == 1 ? "1" : "0");
-        myESP.mqttPublish(TOPIC_BOILER_HEATING_ACTIVE, EMS_Boiler.heatingActive == 1 ? "1" : "0");
+        serializeJson(doc, data, sizeof(data));
+        myDebugLog("Publishing boiler data via MQTT");
+        myESP.mqttPublish(TOPIC_BOILER_DATA, data);
 
-        last_boilerActive = ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive); // remember last state
+        // see if the heating or hot tap water has changed, if so send
+        // last_boilerActive stores heating in bit 1 and tap water in bit 2
+        if ((last_boilerActive != ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive)) || force) {
+            myDebugLog("Publishing hot water and heating states via MQTT");
+            myESP.mqttPublish(TOPIC_BOILER_TAPWATER_ACTIVE, EMS_Boiler.tapwaterActive == 1 ? "1" : "0");
+            myESP.mqttPublish(TOPIC_BOILER_HEATING_ACTIVE, EMS_Boiler.heatingActive == 1 ? "1" : "0");
+
+            last_boilerActive = ((EMS_Boiler.tapwaterActive << 1) + EMS_Boiler.heatingActive); // remember last state
+        }
+
+        ems_Device_remove_flags(EMS_DEVICE_UPDATE_FLAG_BOILER); // unset flag
     }
 
     // handle the thermostat values
-    if (ems_getThermostatEnabled()) {
+    if (ems_getThermostatEnabled() && (ems_Device_has_flags(EMS_DEVICE_UPDATE_FLAG_THERMOSTAT) || force)) {
         doc.clear();
         JsonObject rootThermostat = doc.to<JsonObject>();
 
@@ -780,26 +738,13 @@ void publishEMSValues(bool force) {
 
         data[0] = '\0'; // reset data for next package
         serializeJson(doc, data, sizeof(data));
-
-        // check for empty json
-        jsonSize = measureJson(doc);
-        if (jsonSize > 2) {
-            // calculate new CRC
-            crc.reset();
-            for (uint8_t i = 0; i < (jsonSize - 1); i++) {
-                crc.update(data[i]);
-            }
-            fchecksum = crc.finalize();
-            if ((previousThermostatPublishCRC != fchecksum) || force) {
-                previousThermostatPublishCRC = fchecksum;
-                myDebugLog("Publishing thermostat data via MQTT");
-                myESP.mqttPublish(TOPIC_THERMOSTAT_DATA, data);
-            }
-        }
+        myDebugLog("Publishing thermostat data via MQTT");
+        myESP.mqttPublish(TOPIC_THERMOSTAT_DATA, data);
+        ems_Device_remove_flags(EMS_DEVICE_UPDATE_FLAG_THERMOSTAT); // unset flag
     }
 
     // handle the thermostat values
-    if (ems_getMixingDeviceEnabled()) {
+    if (ems_getMixingDeviceEnabled() && (ems_Device_has_flags(EMS_DEVICE_UPDATE_FLAG_MIXING) || force)) {
         doc.clear();
         JsonObject rootMixing = doc.to<JsonObject>();
 
@@ -825,26 +770,13 @@ void publishEMSValues(bool force) {
 
         data[0] = '\0'; // reset data for next package
         serializeJson(doc, data, sizeof(data));
-
-        // check for empty json
-        jsonSize = measureJson(doc);
-        if (jsonSize > 2) {
-            // calculate new CRC
-            crc.reset();
-            for (uint8_t i = 0; i < (jsonSize - 1); i++) {
-                crc.update(data[i]);
-            }
-            fchecksum = crc.finalize();
-            if ((previousMixingPublishCRC != fchecksum) || force) {
-                previousMixingPublishCRC = fchecksum;
-                myDebugLog("Publishing mixing device data via MQTT");
-                myESP.mqttPublish(TOPIC_MIXING_DATA, data);
-            }
-        }
+        myDebugLog("Publishing mixing device data via MQTT");
+        myESP.mqttPublish(TOPIC_MIXING_DATA, data);
+        ems_Device_remove_flags(EMS_DEVICE_UPDATE_FLAG_MIXING); // unset flag
     }
 
     // For SM10 and SM100 Solar Modules
-    if (ems_getSolarModuleEnabled()) {
+    if (ems_getSolarModuleEnabled() && (ems_Device_has_flags(EMS_DEVICE_UPDATE_FLAG_SOLAR) || force)) {
         // build new json object
         doc.clear();
         JsonObject rootSM = doc.to<JsonObject>();
@@ -858,7 +790,7 @@ void publishEMSValues(bool force) {
         if (EMS_SolarModule.pumpModulation != EMS_VALUE_INT_NOTSET)
             rootSM[SM_PUMPMODULATION] = EMS_SolarModule.pumpModulation;
 
-        if (EMS_SolarModule.pump != EMS_VALUE_INT_NOTSET) {
+        if (EMS_SolarModule.pump != EMS_VALUE_BOOL_NOTSET) {
             rootSM[SM_PUMP] = _bool_to_char(s, EMS_SolarModule.pump);
         }
 
@@ -877,28 +809,13 @@ void publishEMSValues(bool force) {
 
         data[0] = '\0'; // reset data for next package
         serializeJson(doc, data, sizeof(data));
-
-        // check for empty json
-        jsonSize = measureJson(doc);
-        if (jsonSize > 2) {
-            // calculate new CRC
-            crc.reset();
-            for (uint8_t i = 0; i < (jsonSize - 1); i++) {
-                crc.update(data[i]);
-            }
-            fchecksum = crc.finalize();
-            if ((previousSMPublishCRC != fchecksum) || force) {
-                previousSMPublishCRC = fchecksum;
-                myDebugLog("Publishing SM data via MQTT");
-
-                // send values via MQTT
-                myESP.mqttPublish(TOPIC_SM_DATA, data);
-            }
-        }
+        myDebugLog("Publishing SM data via MQTT");
+        myESP.mqttPublish(TOPIC_SM_DATA, data);
+        ems_Device_remove_flags(EMS_DEVICE_UPDATE_FLAG_SOLAR); // unset flag
     }
 
     // handle HeatPump
-    if (ems_getHeatPumpEnabled()) {
+    if (ems_getHeatPumpEnabled() && (ems_Device_has_flags(EMS_DEVICE_UPDATE_FLAG_HEATPUMP) || force)) {
         // build new json object
         doc.clear();
         JsonObject rootSM = doc.to<JsonObject>();
@@ -911,20 +828,13 @@ void publishEMSValues(bool force) {
 
         data[0] = '\0'; // reset data for next package
         serializeJson(doc, data, sizeof(data));
-
         myDebugLog("Publishing HeatPump data via MQTT");
-
-        // send values via MQTT
         myESP.mqttPublish(TOPIC_HP_DATA, data);
+        ems_Device_remove_flags(EMS_DEVICE_UPDATE_FLAG_HEATPUMP); // unset flag
     }
 }
 
-// publish external dallas sensor temperature values to MQTT
-void do_publishSensorValues() {
-    publishSensorValues(true); // force publish
-}
-
-// call PublishValues without forcing, so using CRC to see if we really need to publish
+// call PublishValues without forcing
 void do_publishValues() {
     publishEMSValues(true); // force publish
 }
@@ -1254,7 +1164,7 @@ void TelnetCommandCallback(uint8_t wc, const char * commandLine) {
 
     if (strcmp(first_cmd, "publish") == 0) {
         do_publishValues();
-        do_publishSensorValues();
+        publishSensorValues();
         do_publishShowerData();
         ok = true;
     }
@@ -1824,7 +1734,7 @@ void WebCallback(JsonObject root) {
         if (EMS_SolarModule.pumpModulation != EMS_VALUE_INT_NOTSET)
             sm["sm3"] = EMS_SolarModule.pumpModulation; // Pump modulation %
 
-        if (EMS_SolarModule.pump != EMS_VALUE_INT_NOTSET) {
+        if (EMS_SolarModule.pump != EMS_VALUE_BOOL_NOTSET) {
             char s[10];
             sm["sm4"] = _bool_to_char(s, EMS_SolarModule.pump); // Pump active on/off
         }
@@ -1994,8 +1904,8 @@ void setup() {
     // set timers for MQTT publish
     // only if publish_time is not 0 (automatic mode)
     if (EMSESP_Settings.publish_time) {
-        publishValuesTimer.attach(EMSESP_Settings.publish_time, do_publishValues);             // post MQTT EMS values
-        publishSensorValuesTimer.attach(EMSESP_Settings.publish_time, do_publishSensorValues); // post MQTT dallas sensor values
+        publishValuesTimer.attach(EMSESP_Settings.publish_time, do_publishValues);          // post MQTT EMS values
+        publishSensorValuesTimer.attach(EMSESP_Settings.publish_time, publishSensorValues); // post MQTT dallas sensor values
     }
 
     // set pin for LED
@@ -2017,31 +1927,20 @@ void setup() {
 void loop() {
     myESP.loop(); // handle telnet, mqtt, wifi etc
 
-    // check Dallas sensors, using same schedule as publish_time (default 2 mins)
+    // check Dallas sensors, using same schedule as publish_time (default 2 mins in DS18_READ_INTERVAL)
     // these values are published to MQTT separately via the timer publishSensorValuesTimer
     if (EMSESP_Settings.dallas_sensors) {
         ds18.loop();
     }
 
-    // check if we have data from the EMS bus
-    if (ems_getEmsRefreshed()) {
-        // if we have an EMS connect go and fetch some data and publish it (by force)
-        if (_need_first_publish) {
-            do_regularUpdates();
-            publishEMSValues(true);
-            publishSensorValues(true);
-            _need_first_publish = false; // reset flag
-        }
+    // publish EMS data to MQTT
+    // because of the force=false argument, it will see if there is anything received that must be published
+    publishEMSValues(false);
 
-        // publish all the values to MQTT
-        // but only if the values have changed and publish_time is on automatic mode
-        // always publish when we get the first results, regardless of any publish_time setting
-        if (EMSESP_Settings.publish_time == 0) {
-            publishEMSValues(false);
-            publishSensorValues(false);
-        }
-
-        ems_setEmsRefreshed(false); // reset flag
+    // if we have an EMS connect go and fetch some data and MQTT publish it
+    if (_need_first_publish) {
+        publishSensorValues();
+        _need_first_publish = false; // reset flag
     }
 
     // do shower logic, if enabled
diff --git a/src/ems.cpp b/src/ems.cpp
index 28d5138b1..e2b7699c5 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -12,175 +12,17 @@
 #include "ems_utils.h"
 #include "emsuart.h"
 #include <CircularBuffer.h> // https://github.com/rlogiacco/CircularBuffer
+#include <map>
 
 #ifdef TESTS
 #include "test_data.h"
 uint8_t _TEST_DATA_max = ArraySize(TEST_DATA);
 #endif
 
-_EMS_Sys_Status EMS_Sys_Status; // EMS Status
+_EMS_Sys_Status                                            EMS_Sys_Status; // EMS Status
+CircularBuffer<_EMS_TxTelegram, EMS_TX_TELEGRAM_QUEUE_MAX> EMS_TxQueue;    // FIFO queue for Tx send buffer
+std::list<_Detected_Device>                                Devices;        // for storing all detected EMS devices
 
-CircularBuffer<_EMS_TxTelegram, EMS_TX_TELEGRAM_QUEUE_MAX> EMS_TxQueue; // FIFO queue for Tx send buffer
-
-// for storing all detected EMS devices
-std::list<_Detected_Device> Devices;
-
-//
-// process callbacks per type
-//
-
-// generic
-void _process_Version(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBADevices(_EMS_RxTelegram * EMS_RxTelegram);
-
-// EMS master/Boiler devices
-void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBAMonitorSlow(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBAMonitorWWMessage(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBAParameterWW(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBATotalUptimeMessage(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBAParametersMessage(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_SetPoints(_EMS_RxTelegram * EMS_RxTelegram);
-
-// EMS+ specific
-void _process_UBAOutdoorTemp(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_UBAMonitorSlow2(_EMS_RxTelegram * EMS_RxTelegram);
-
-// SM10
-void _process_SM10Monitor(_EMS_RxTelegram * EMS_RxTelegram);
-
-// SM100
-void _process_SM100Monitor(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_SM100Status(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_SM100Status2(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_SM100Energy(_EMS_RxTelegram * EMS_RxTelegram);
-
-// ISM1
-void _process_ISM1StatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_ISM1Set(_EMS_RxTelegram * EMS_RxTelegram);
-
-// HeatPump HP
-void _process_HPMonitor1(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_HPMonitor2(_EMS_RxTelegram * EMS_RxTelegram);
-
-// Common for most thermostats
-void _process_RCTime(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_RCOutdoorTempMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-// RC10
-void _process_RC10Set(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_RC10StatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-// RC20
-void _process_RC20Set(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_RC20StatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-// RC30
-void _process_RC30Set(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_RC30StatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-// RC35
-void _process_RC35Set(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_RC35StatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-// Easy type devices like C100
-void _process_EasyStatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-// RC1010, RC300, RC310
-void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_RCPLUSSetMessage(_EMS_RxTelegram * EMS_RxTelegram);
-void _process_RCPLUSStatusMode(_EMS_RxTelegram * EMS_RxTelegram);
-
-// Junkers FR10, FR50, FW100
-void _process_JunkersStatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-// Mixers MM100
-void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram);
-
-/**
- * Recognized EMS types and the functions they call to process the telegrams
- */
-const _EMS_Type EMS_Types[] = {
-
-    // common
-    {EMS_TYPE_Version, "Version", _process_Version},
-    {EMS_TYPE_UBADevices, "UBADevices", _process_UBADevices},
-    {EMS_TYPE_RCTime, "RCTime", _process_RCTime},
-    {EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
-
-    // UBA/Boiler
-    {EMS_TYPE_UBAMonitorFast, "UBAMonitorFast", _process_UBAMonitorFast},
-    {EMS_TYPE_UBAMonitorSlow, "UBAMonitorSlow", _process_UBAMonitorSlow},
-    {EMS_TYPE_UBAMonitorWWMessage, "UBAMonitorWWMessage", _process_UBAMonitorWWMessage},
-    {EMS_TYPE_UBAParameterWW, "UBAParameterWW", _process_UBAParameterWW},
-    {EMS_TYPE_UBATotalUptimeMessage, "UBATotalUptimeMessage", _process_UBATotalUptimeMessage},
-    {EMS_TYPE_UBAMaintenanceSettingsMessage, "UBAMaintenanceSettingsMessage", nullptr},
-    {EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage},
-    {EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints},
-
-    // UBA/Boiler EMS+
-    {EMS_TYPE_UBAOutdoorTemp, "UBAOutdoorTemp", _process_UBAOutdoorTemp},
-    {EMS_TYPE_UBAMonitorFast2, "UBAMonitorFast2", _process_UBAMonitorFast2},
-    {EMS_TYPE_UBAMonitorSlow2, "UBAMonitorSlow2", _process_UBAMonitorSlow2},
-
-    // Solar Module devices
-    {EMS_TYPE_SM10Monitor, "SM10Monitor", _process_SM10Monitor},
-    {EMS_TYPE_SM100Monitor, "SM100Monitor", _process_SM100Monitor},
-    {EMS_TYPE_SM100Status, "SM100Status", _process_SM100Status},
-    {EMS_TYPE_SM100Status2, "SM100Status2", _process_SM100Status2},
-    {EMS_TYPE_SM100Energy, "SM100Energy", _process_SM100Energy},
-    {EMS_TYPE_ISM1StatusMessage, "ISM1StatusMessage", _process_ISM1StatusMessage},
-    {EMS_TYPE_ISM1Set, "ISM1Set", _process_ISM1Set},
-
-    // heatpumps
-    {EMS_TYPE_HPMonitor1, "HeatPumpMonitor1", _process_HPMonitor1},
-    {EMS_TYPE_HPMonitor2, "HeatPumpMonitor2", _process_HPMonitor2},
-
-    // RC10
-    {EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set},
-    {EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage},
-
-    // RC20 and RC20RF
-    {EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
-    {EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
-
-    // RC30
-    {EMS_TYPE_RC30Set, "RC30Set", _process_RC30Set},
-    {EMS_TYPE_RC30StatusMessage, "RC30StatusMessage", _process_RC30StatusMessage},
-
-    // RC35 and ES71
-    {EMS_TYPE_RC35Set_HC1, "RC35Set_HC1", _process_RC35Set},
-    {EMS_TYPE_RC35StatusMessage_HC1, "RC35StatusMessage_HC1", _process_RC35StatusMessage},
-    {EMS_TYPE_RC35Set_HC2, "RC35Set_HC2", _process_RC35Set},
-    {EMS_TYPE_RC35StatusMessage_HC2, "RC35StatusMessage_HC2", _process_RC35StatusMessage},
-    {EMS_TYPE_RC35Set_HC3, "RC35Set_HC2", _process_RC35Set},
-    {EMS_TYPE_RC35StatusMessage_HC3, "RC35StatusMessage_HC3", _process_RC35StatusMessage},
-    {EMS_TYPE_RC35Set_HC4, "RC35Set_HC4", _process_RC35Set},
-    {EMS_TYPE_RC35StatusMessage_HC4, "RC35StatusMessage_HC4", _process_RC35StatusMessage},
-
-    // Easy
-    {EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage},
-
-    // Nefit 1010, RC300, RC310 (EMS Plus)
-    {EMS_TYPE_RCPLUSStatusMessage_HC1, "RCPLUSStatusMessage_HC1", _process_RCPLUSStatusMessage},
-    {EMS_TYPE_RCPLUSStatusMessage_HC2, "RCPLUSStatusMessage_HC2", _process_RCPLUSStatusMessage},
-    {EMS_TYPE_RCPLUSStatusMessage_HC3, "RCPLUSStatusMessage_HC3", _process_RCPLUSStatusMessage},
-    {EMS_TYPE_RCPLUSStatusMessage_HC4, "RCPLUSStatusMessage_HC4", _process_RCPLUSStatusMessage},
-    {EMS_TYPE_RCPLUSSet, "RCPLUSSetMessage", _process_RCPLUSSetMessage},
-    {EMS_TYPE_RCPLUSStatusMode, "RCPLUSStatusMode", _process_RCPLUSStatusMode},
-
-    // Junkers FR10
-    {EMS_TYPE_JunkersStatusMessage, "JunkersStatusMessage", _process_JunkersStatusMessage},
-
-    // Mixing devices
-    {EMS_TYPE_MMPLUSStatusMessage_HC1, "MMPLUSStatusMessage_HC1", _process_MMPLUSStatusMessage},
-    {EMS_TYPE_MMPLUSStatusMessage_HC2, "MMPLUSStatusMessage_HC2", _process_MMPLUSStatusMessage}
-
-};
-
-// calculate sizes of arrays at compile time
-uint8_t _EMS_Types_max         = ArraySize(EMS_Types);
 uint8_t _EMS_Devices_max       = ArraySize(EMS_Devices);
 uint8_t _EMS_Devices_Types_max = ArraySize(EMS_Devices_Types);
 
@@ -210,26 +52,45 @@ const uint8_t  TX_WRITE_TIMEOUT_COUNT = 2;       // 3 retries before timeout
 const uint32_t EMS_BUS_TIMEOUT        = 15000;   // timeout in ms before recognizing the ems bus is offline (15 seconds)
 const uint32_t EMS_POLL_TIMEOUT       = 5000000; // timeout in microseconds before recognizing the ems bus is offline (5 seconds)
 
+/*
+ * Add one or more flags to the current flags.
+ */
+void ems_Device_add_flags(unsigned int flags) {
+    EMS_Sys_Status.emsRefreshedFlags |= flags;
+}
+/*
+ * Check if the current flags include all of the specified flags.
+ */
+bool ems_Device_has_flags(unsigned int flags) {
+    return (EMS_Sys_Status.emsRefreshedFlags & flags) == flags;
+}
+/*
+ * Remove one or more flags from the current flags.
+ */
+void ems_Device_remove_flags(unsigned int flags) {
+    EMS_Sys_Status.emsRefreshedFlags &= ~flags;
+}
+
 // init stats and counters and buffers
 void ems_init() {
     ems_clearDeviceList(); // init the device map
 
     // overall status
-    EMS_Sys_Status.emsRxPgks        = 0;
-    EMS_Sys_Status.emsTxPkgs        = 0;
-    EMS_Sys_Status.emxCrcErr        = 0;
-    EMS_Sys_Status.emsRxStatus      = EMS_RX_STATUS_IDLE;
-    EMS_Sys_Status.emsTxStatus      = EMS_TX_REV_DETECT;
-    EMS_Sys_Status.emsRefreshed     = false;
-    EMS_Sys_Status.emsPollEnabled   = false; // start up with Poll disabled
-    EMS_Sys_Status.emsBusConnected  = false;
-    EMS_Sys_Status.emsRxTimestamp   = 0;
-    EMS_Sys_Status.emsTxCapable     = false;
-    EMS_Sys_Status.emsTxDisabled    = false;
-    EMS_Sys_Status.emsPollFrequency = 0;
-    EMS_Sys_Status.txRetryCount     = 0;
-    EMS_Sys_Status.emsIDMask        = 0x00;
-    EMS_Sys_Status.emsPollAck[0]    = EMS_ID_ME;
+    EMS_Sys_Status.emsRxPgks         = 0;
+    EMS_Sys_Status.emsTxPkgs         = 0;
+    EMS_Sys_Status.emxCrcErr         = 0;
+    EMS_Sys_Status.emsRxStatus       = EMS_RX_STATUS_IDLE;
+    EMS_Sys_Status.emsTxStatus       = EMS_TX_REV_DETECT;
+    EMS_Sys_Status.emsRefreshedFlags = EMS_DEVICE_UPDATE_FLAG_NONE;
+    EMS_Sys_Status.emsPollEnabled    = false; // start up with Poll disabled
+    EMS_Sys_Status.emsBusConnected   = false;
+    EMS_Sys_Status.emsRxTimestamp    = 0;
+    EMS_Sys_Status.emsTxCapable      = false;
+    EMS_Sys_Status.emsTxDisabled     = false;
+    EMS_Sys_Status.emsPollFrequency  = 0;
+    EMS_Sys_Status.txRetryCount      = 0;
+    EMS_Sys_Status.emsIDMask         = 0x00;
+    EMS_Sys_Status.emsPollAck[0]     = EMS_ID_ME;
 
     // thermostat
     strlcpy(EMS_Thermostat.datetime, "?", sizeof(EMS_Thermostat.datetime));
@@ -263,24 +124,24 @@ void ems_init() {
     }
 
     // UBAParameterWW
-    EMS_Boiler.wWActivated   = EMS_VALUE_INT_NOTSET; // Warm Water activated
-    EMS_Boiler.wWSelTemp     = EMS_VALUE_INT_NOTSET; // Warm Water selected temperature
-    EMS_Boiler.wWCircPump    = EMS_VALUE_INT_NOTSET; // Warm Water circulation pump available
-    EMS_Boiler.wWDesiredTemp = EMS_VALUE_INT_NOTSET; // Warm Water desired temperature to prevent infection
-    EMS_Boiler.wWComfort     = EMS_VALUE_INT_NOTSET;
+    EMS_Boiler.wWActivated   = EMS_VALUE_BOOL_NOTSET; // Warm Water activated
+    EMS_Boiler.wWSelTemp     = EMS_VALUE_INT_NOTSET;  // Warm Water selected temperature
+    EMS_Boiler.wWCircPump    = EMS_VALUE_BOOL_NOTSET; // Warm Water circulation pump available
+    EMS_Boiler.wWDesiredTemp = EMS_VALUE_INT_NOTSET;  // Warm Water desired temperature to prevent infection
+    EMS_Boiler.wWComfort     = EMS_VALUE_INT_NOTSET;  // WW comfort mode
 
     // UBAMonitorFast
     EMS_Boiler.selFlowTemp = EMS_VALUE_INT_NOTSET;    // Selected flow temperature
     EMS_Boiler.curFlowTemp = EMS_VALUE_USHORT_NOTSET; // Current flow temperature
     EMS_Boiler.retTemp     = EMS_VALUE_USHORT_NOTSET; // Return temperature
-    EMS_Boiler.burnGas     = EMS_VALUE_INT_NOTSET;    // Gas on/off
-    EMS_Boiler.fanWork     = EMS_VALUE_INT_NOTSET;    // Fan on/off
-    EMS_Boiler.ignWork     = EMS_VALUE_INT_NOTSET;    // Ignition on/off
-    EMS_Boiler.heatPmp     = EMS_VALUE_INT_NOTSET;    // Boiler pump on/off
+    EMS_Boiler.burnGas     = EMS_VALUE_BOOL_NOTSET;   // Gas on/off
+    EMS_Boiler.fanWork     = EMS_VALUE_BOOL_NOTSET;   // Fan on/off
+    EMS_Boiler.ignWork     = EMS_VALUE_BOOL_NOTSET;   // Ignition on/off
+    EMS_Boiler.heatPmp     = EMS_VALUE_BOOL_NOTSET;   // Boiler pump on/off
     EMS_Boiler.wWHeat      = EMS_VALUE_INT_NOTSET;    // 3-way valve on WW
-    EMS_Boiler.wWCirc      = EMS_VALUE_INT_NOTSET;    // Circulation on/off
-    EMS_Boiler.selBurnPow  = EMS_VALUE_INT_NOTSET;    // Burner max power
-    EMS_Boiler.curBurnPow  = EMS_VALUE_INT_NOTSET;    // Burner current power
+    EMS_Boiler.wWCirc      = EMS_VALUE_BOOL_NOTSET;   // Circulation on/off
+    EMS_Boiler.selBurnPow  = EMS_VALUE_INT_NOTSET;    // Burner max power %
+    EMS_Boiler.curBurnPow  = EMS_VALUE_INT_NOTSET;    // Burner current power %
     EMS_Boiler.flameCurr   = EMS_VALUE_USHORT_NOTSET; // Flame current in micro amps
     EMS_Boiler.sysPress    = EMS_VALUE_INT_NOTSET;    // System pressure
     strlcpy(EMS_Boiler.serviceCodeChar, "??", sizeof(EMS_Boiler.serviceCodeChar));
@@ -289,7 +150,7 @@ void ems_init() {
     // UBAMonitorSlow
     EMS_Boiler.extTemp     = EMS_VALUE_SHORT_NOTSET;  // Outside temperature
     EMS_Boiler.boilTemp    = EMS_VALUE_USHORT_NOTSET; // Boiler temperature
-    EMS_Boiler.pumpMod     = EMS_VALUE_INT_NOTSET;    // Pump modulation
+    EMS_Boiler.pumpMod     = EMS_VALUE_INT_NOTSET;    // Pump modulation %
     EMS_Boiler.burnStarts  = EMS_VALUE_LONG_NOTSET;   // # burner restarts
     EMS_Boiler.burnWorkMin = EMS_VALUE_LONG_NOTSET;   // Total burner operating time
     EMS_Boiler.heatWorkMin = EMS_VALUE_LONG_NOTSET;   // Total heat operating time
@@ -299,21 +160,21 @@ void ems_init() {
     EMS_Boiler.wWStarts  = EMS_VALUE_LONG_NOTSET;   // Warm Water # starts
     EMS_Boiler.wWWorkM   = EMS_VALUE_LONG_NOTSET;   // Warm Water # minutes
     EMS_Boiler.wWOneTime = EMS_VALUE_INT_NOTSET;    // Warm Water one time function on/off
-    EMS_Boiler.wWCurFlow = EMS_VALUE_INT_NOTSET;
+    EMS_Boiler.wWCurFlow = EMS_VALUE_INT_NOTSET;    // WW current flow temp
 
     // UBATotalUptimeMessage
     EMS_Boiler.UBAuptime = EMS_VALUE_LONG_NOTSET; // Total UBA working hours
 
     // UBAParametersMessage
     EMS_Boiler.heating_temp = EMS_VALUE_INT_NOTSET; // Heating temperature setting on the boiler
-    EMS_Boiler.pump_mod_max = EMS_VALUE_INT_NOTSET; // Boiler circuit pump modulation max. power
-    EMS_Boiler.pump_mod_min = EMS_VALUE_INT_NOTSET; // Boiler circuit pump modulation min. power
+    EMS_Boiler.pump_mod_max = EMS_VALUE_INT_NOTSET; // Boiler circuit pump modulation max. power %
+    EMS_Boiler.pump_mod_min = EMS_VALUE_INT_NOTSET; // Boiler circuit pump modulation min. power %
 
     // Solar Module values
     EMS_SolarModule.collectorTemp          = EMS_VALUE_SHORT_NOTSET; // collector temp from SM10/SM100
     EMS_SolarModule.bottomTemp             = EMS_VALUE_SHORT_NOTSET; // bottom temp from SM10/SM100
     EMS_SolarModule.pumpModulation         = EMS_VALUE_INT_NOTSET;   // modulation solar pump SM10/SM100
-    EMS_SolarModule.pump                   = EMS_VALUE_INT_NOTSET;   // pump active
+    EMS_SolarModule.pump                   = EMS_VALUE_BOOL_NOTSET;  // pump active
     EMS_SolarModule.EnergyLastHour         = EMS_VALUE_USHORT_NOTSET;
     EMS_SolarModule.EnergyToday            = EMS_VALUE_USHORT_NOTSET;
     EMS_SolarModule.EnergyTotal            = EMS_VALUE_USHORT_NOTSET;
@@ -329,8 +190,8 @@ void ems_init() {
     EMS_HeatPump.product_id   = EMS_ID_NONE;
 
     // calculated values
-    EMS_Boiler.tapwaterActive = EMS_VALUE_INT_NOTSET; // Hot tap water is on/off
-    EMS_Boiler.heatingActive  = EMS_VALUE_INT_NOTSET; // Central heating is on/off
+    EMS_Boiler.tapwaterActive = EMS_VALUE_BOOL_NOTSET; // Hot tap water is on/off
+    EMS_Boiler.heatingActive  = EMS_VALUE_BOOL_NOTSET; // Central heating is on/off
 
     // set boiler type
     EMS_Boiler.product_id = EMS_ID_NONE;
@@ -354,14 +215,6 @@ bool ems_getPoll() {
     return EMS_Sys_Status.emsPollEnabled;
 }
 
-bool ems_getEmsRefreshed() {
-    return EMS_Sys_Status.emsRefreshed;
-}
-
-void ems_setEmsRefreshed(bool b) {
-    EMS_Sys_Status.emsRefreshed = b;
-}
-
 bool ems_getBoilerEnabled() {
     return (EMS_Boiler.device_id != EMS_ID_NONE);
 }
@@ -513,6 +366,15 @@ void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint8_t * param_op, uint8_t ind
     *param_op = (uint8_t)EMS_RxTelegram->data[index];
 }
 
+// convert signed short to single 8 byte, for setpoint thermostat temperatures
+void _setValue8(_EMS_RxTelegram * EMS_RxTelegram, int16_t * param_op, uint8_t index) {
+    if (index >= EMS_RxTelegram->data_length) {
+        return;
+    }
+
+    *param_op = EMS_RxTelegram->data[index];
+}
+
 // Long
 void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint32_t * param_op, uint8_t index) {
     if (index >= EMS_RxTelegram->data_length) {
@@ -531,25 +393,6 @@ void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint8_t * param_op, uint8_t ind
     *param_op = (uint8_t)(((EMS_RxTelegram->data[index]) >> (bit)) & 0x01);
 }
 
-/**
- * Find the pointer to the EMS_Types array for a given type ID
- * or -1 if not found
- */
-int8_t _ems_findType(uint16_t type) {
-    uint8_t i         = 0;
-    bool    typeFound = false;
-    // scan through known ID types
-    while (i < _EMS_Types_max) {
-        if (EMS_Types[i].type == type) {
-            typeFound = true; // we have a match
-            break;
-        }
-        i++;
-    }
-
-    return (typeFound ? i : -1);
-}
-
 void ems_setTxMode(uint8_t mode) {
     EMS_Sys_Status.emsTxMode = mode;
 }
@@ -788,7 +631,6 @@ void _createValidate() {
     new_EMS_TxTelegram.comparisonValue    = EMS_TxTelegram.comparisonValue;
     new_EMS_TxTelegram.comparisonPostRead = EMS_TxTelegram.comparisonPostRead;
     new_EMS_TxTelegram.comparisonOffset   = EMS_TxTelegram.comparisonOffset;
-    new_EMS_TxTelegram.forceRefresh       = EMS_TxTelegram.forceRefresh;
 
     // this is what is different
     new_EMS_TxTelegram.offset    = EMS_TxTelegram.comparisonOffset; // location of byte to fetch
@@ -1062,65 +904,6 @@ void _printMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     }
 }
 
-
-/**
- * print detailed telegram
- * and then call its callback if there is one defined
- */
-void _ems_processTelegram(_EMS_RxTelegram * EMS_RxTelegram) {
-    // print out the telegram for verbose mode
-    if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_THERMOSTAT) {
-        _printMessage(EMS_RxTelegram);
-    }
-
-    // ignore telegrams that don't have any data
-    if (EMS_RxTelegram->data_length == 0) {
-        return;
-    }
-
-    // header
-    uint8_t  dest = EMS_RxTelegram->dest;
-    uint16_t type = EMS_RxTelegram->type;
-
-    // see if we recognize the type first by scanning our known EMS types list
-    bool    typeFound = false;
-    uint8_t i         = 0;
-
-    while (i < _EMS_Types_max) {
-        if (EMS_Types[i].type == type) {
-            // is it a broadcast (dest=0x00) or something sent to us (dest=0x08)?
-            if ((dest == EMS_ID_NONE) || (dest == EMS_ID_ME)) {
-                typeFound = true;
-                break;
-            }
-        }
-        i++;
-    }
-
-    // if it's a common type (across ems devices) or something specifically for us process it.
-    // dest will be EMS_ID_NONE and offset 0x00 for a broadcast message
-    if (typeFound) {
-        if ((EMS_Types[i].processType_cb) != nullptr) {
-            // print non-verbose message
-            if ((EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_BASIC) || (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_VERBOSE)) {
-                myDebug_P(PSTR("<--- %s(0x%02X)"), EMS_Types[i].typeString, type);
-            }
-            // call callback function to process the telegram, only if there is data
-            if (EMS_RxTelegram->emsplus) {
-                // if EMS+ always proces it
-                (void)EMS_Types[i].processType_cb(EMS_RxTelegram);
-            } else {
-                // only if the offset is 0 as we want to handle full telegrams and not partial
-                if (EMS_RxTelegram->offset == EMS_ID_NONE) {
-                    (void)EMS_Types[i].processType_cb(EMS_RxTelegram);
-                }
-            }
-        }
-    }
-
-    EMS_Sys_Status.emsTxStatus = EMS_TX_STATUS_IDLE;
-}
-
 /**
  * Remove current Tx telegram from queue and release lock on Tx
  */
@@ -1131,133 +914,6 @@ void _removeTxQueue() {
     EMS_Sys_Status.emsTxStatus = EMS_TX_STATUS_IDLE;
 }
 
-/**
- * deciphers the telegram packet, which has already been checked for valid CRC and has a complete header
- * length is only data bytes, excluding the BRK
- * We only remove from the Tx queue if the read or write was successful
- */
-void _processType(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t * telegram = EMS_RxTelegram->telegram;
-
-    // if its an echo of ourselves from the master UBA, ignore. This should never happen mind you
-    if (EMS_RxTelegram->src == EMS_ID_ME) {
-        if (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_JABBER)
-            _debugPrintTelegram("echo: ", EMS_RxTelegram, COLOR_WHITE);
-        return;
-    }
-
-    // if its a broadcast and we didn't just send anything, process it and exit
-    if (EMS_Sys_Status.emsTxStatus == EMS_TX_STATUS_IDLE) {
-        _ems_processTelegram(EMS_RxTelegram);
-        return;
-    }
-
-    // release the lock on the TxQueue
-    EMS_Sys_Status.emsTxStatus = EMS_TX_STATUS_IDLE;
-
-    // at this point we can assume TxStatus was EMS_TX_STATUS_WAIT as we just sent a read or validate telegram
-    // for READ or VALIDATE the dest (telegram[1]) is always us, so check for this
-    // and if not we probably didn't get any response so remove the last Tx from the queue and process the telegram anyway
-    if ((telegram[1] & 0x7F) != EMS_ID_ME) {
-        _removeTxQueue();
-        _ems_processTelegram(EMS_RxTelegram);
-        return;
-    }
-
-    // first double check we actually have something in the Tx queue that we're waiting upon
-    if (EMS_TxQueue.isEmpty()) {
-        _ems_processTelegram(EMS_RxTelegram);
-        return;
-    }
-
-    // get the Tx telegram we just sent
-    _EMS_TxTelegram EMS_TxTelegram = EMS_TxQueue.first();
-
-    // check action
-    // if READ, match the current inbound telegram to what we just sent
-    // if WRITE, should not happen
-    // if VALIDATE, check the contents
-    if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_READ) {
-        // remove MSB from src/dest
-        if (((EMS_RxTelegram->src & 0x7F) == (EMS_TxTelegram.dest & 0x7F)) && (EMS_RxTelegram->type == EMS_TxTelegram.type)) {
-            // all checks out, read was successful, remove tx from queue and continue to process telegram
-            _removeTxQueue();
-            EMS_Sys_Status.emsRxPgks++;                       // increment Rx happy counter
-            EMS_Sys_Status.emsTxCapable = true;               // we're able to transmit a telegram on the Tx
-            ems_setEmsRefreshed(EMS_TxTelegram.forceRefresh); // does mqtt need refreshing?
-        } else {
-            // read not OK, we didn't get back a telegram we expected.
-            // first see if we got a response back from the sender saying its an unknown command
-            if (EMS_RxTelegram->data_length == 0) {
-                _removeTxQueue();
-            } else {
-                // leave on queue and try again, but continue to process what we received as it may be important
-                EMS_Sys_Status.txRetryCount++;
-                // if retried too many times, give up and remove it
-                if (EMS_Sys_Status.txRetryCount >= TX_WRITE_TIMEOUT_COUNT) {
-                    if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-                        myDebug_P(PSTR("-> Read failed. Giving up and removing write from queue"));
-                    }
-                    _removeTxQueue();
-                } else {
-                    if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-                        myDebug_P(PSTR("-> Read failed. Retrying (%d/%d)..."), EMS_Sys_Status.txRetryCount, TX_WRITE_TIMEOUT_COUNT);
-                    }
-                }
-            }
-        }
-        _ems_processTelegram(EMS_RxTelegram); // process it always
-    }
-
-    if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_WRITE) {
-        // should not get here, since this is handled earlier receiving a 01 or 04
-        myDebug_P(PSTR("-> Write error - panic! should never get here"));
-    }
-
-    if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_VALIDATE) {
-        // this is a read telegram which we use to validate the last write
-
-        // data block starts at position 5 for EMS1.0 and 6 for EMS2.0.
-        // See https://github.com/proddy/EMS-ESP/wiki/RC3xx-Thermostats
-        uint8_t dataReceived = (EMS_RxTelegram->emsplus) ? telegram[6] : telegram[4];
-
-        if (EMS_TxTelegram.comparisonValue == dataReceived) {
-            // validate was successful, the write changed the value
-            _removeTxQueue(); // now we can remove the Tx validate command the queue
-            if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-                myDebug_P(PSTR("-> Validate confirmed, last Write to 0x%02X was successful"), EMS_TxTelegram.dest);
-            }
-            // follow up with the post read command
-            ems_doReadCommand(EMS_TxTelegram.comparisonPostRead, EMS_TxTelegram.dest, true);
-        } else {
-            // write failed
-            if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-                myDebug_P(PSTR("-> Write failed. Compared set value 0x%02X with received value of 0x%02X"), EMS_TxTelegram.comparisonValue, dataReceived);
-            }
-            if (++EMS_Sys_Status.txRetryCount > TX_WRITE_TIMEOUT_COUNT) {
-                if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-                    myDebug_P(PSTR("-> Write failed. Giving up, removing from queue"));
-                }
-                _removeTxQueue();
-            } else {
-                // retry, turn the validate back into a write and try again
-                if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-                    myDebug_P(PSTR("-> Write didn't work, retrying (%d/%d)..."), EMS_Sys_Status.txRetryCount, TX_WRITE_TIMEOUT_COUNT);
-                }
-                EMS_TxTelegram.action    = EMS_TX_TELEGRAM_WRITE;
-                EMS_TxTelegram.dataValue = EMS_TxTelegram.comparisonValue;  // restore old value
-                EMS_TxTelegram.offset    = EMS_TxTelegram.comparisonOffset; // restore old value
-                EMS_TxTelegram.type      = EMS_TxTelegram.type_validate;    // restore old value, we swapped them to save the original type
-
-                EMS_TxQueue.shift();                 // remove validate from queue
-                EMS_TxQueue.unshift(EMS_TxTelegram); // add back to queue making it next in line
-            }
-        }
-    }
-
-    ems_tx_pollAck(); // send Acknowledgement back to free the EMS bus since we have the telegram
-}
-
 /**
  * Check if hot tap water or heating is active
  * using a quick hack for checking the heating. Selected Flow Temp >= 70
@@ -1265,12 +921,12 @@ void _processType(_EMS_RxTelegram * EMS_RxTelegram) {
 void _checkActive() {
     // hot tap water, using flow to check instead of the burner power
     if (EMS_Boiler.wWCurFlow != EMS_VALUE_INT_NOTSET && EMS_Boiler.burnGas != EMS_VALUE_INT_NOTSET) {
-        EMS_Boiler.tapwaterActive = ((EMS_Boiler.wWCurFlow != 0) && (EMS_Boiler.burnGas == EMS_VALUE_INT_ON));
+        EMS_Boiler.tapwaterActive = ((EMS_Boiler.wWCurFlow != 0) && (EMS_Boiler.burnGas == EMS_VALUE_BOOL_ON));
     }
 
     // heating
     if (EMS_Boiler.selFlowTemp != EMS_VALUE_INT_NOTSET && EMS_Boiler.burnGas != EMS_VALUE_INT_NOTSET) {
-        EMS_Boiler.heatingActive = ((EMS_Boiler.selFlowTemp >= EMS_BOILER_SELFLOWTEMP_HEATING) && (EMS_Boiler.burnGas == EMS_VALUE_INT_ON));
+        EMS_Boiler.heatingActive = ((EMS_Boiler.selFlowTemp >= EMS_BOILER_SELFLOWTEMP_HEATING) && (EMS_Boiler.burnGas == EMS_VALUE_BOOL_ON));
     }
 }
 
@@ -1279,14 +935,11 @@ void _checkActive() {
  * received only after requested (not broadcasted)
  */
 void _process_UBAParameterWW(_EMS_RxTelegram * EMS_RxTelegram) {
-    EMS_Boiler.wWActivated = (EMS_RxTelegram->data[1] == 0xFF); // 0xFF means on
-    EMS_Boiler.wWCircPump  = (EMS_RxTelegram->data[6] == 0xFF); // 0xFF means on
-
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWActivated, 1); // 0xFF means on
+    _setValue(EMS_RxTelegram, &EMS_Boiler.wWCircPump, 6);  // 0xFF means on
     _setValue(EMS_RxTelegram, &EMS_Boiler.wWSelTemp, 2);
     _setValue(EMS_RxTelegram, &EMS_Boiler.wWDesiredTemp, 8);
     _setValue(EMS_RxTelegram, &EMS_Boiler.wWComfort, EMS_OFFSET_UBAParameterWW_wwComfort);
-
-    EMS_Sys_Status.emsRefreshed = true; // when we receieve this, lets force an MQTT publish
 }
 
 /**
@@ -1295,7 +948,6 @@ void _process_UBAParameterWW(_EMS_RxTelegram * EMS_RxTelegram) {
  */
 void _process_UBATotalUptimeMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Boiler.UBAuptime, 0);
-    EMS_Sys_Status.emsRefreshed = true; // when we receieve this, lets force an MQTT publish
 }
 
 /**
@@ -1367,9 +1019,11 @@ void _process_UBAMonitorFast(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Boiler.sysPress, 17); // is *10
 
     // read the service code / installation status as appears on the display
-    EMS_Boiler.serviceCodeChar[0] = char(EMS_RxTelegram->data[18]); // ascii character 1
-    EMS_Boiler.serviceCodeChar[1] = char(EMS_RxTelegram->data[19]); // ascii character 2
-    EMS_Boiler.serviceCodeChar[2] = '\0';                           // null terminate string
+    if (EMS_RxTelegram->data_length > 18) {
+        EMS_Boiler.serviceCodeChar[0] = char(EMS_RxTelegram->data[18]); // ascii character 1
+        EMS_Boiler.serviceCodeChar[1] = char(EMS_RxTelegram->data[19]); // ascii character 2
+        EMS_Boiler.serviceCodeChar[2] = '\0';                           // null terminate string
+    }
 
     // at this point do a quick check to see if the hot water or heating is active
     _checkActive();
@@ -1388,9 +1042,11 @@ void _process_UBAMonitorFast2(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Boiler.flameCurr, 19);
 
     // read the service code / installation status as appears on the display
-    EMS_Boiler.serviceCodeChar[0] = char(EMS_RxTelegram->data[4]); // ascii character 1
-    EMS_Boiler.serviceCodeChar[1] = char(EMS_RxTelegram->data[5]); // ascii character 2
-    EMS_Boiler.serviceCodeChar[2] = '\0';
+    if (EMS_RxTelegram->data_length > 4) {
+        EMS_Boiler.serviceCodeChar[0] = char(EMS_RxTelegram->data[4]); // ascii character 1
+        EMS_Boiler.serviceCodeChar[1] = char(EMS_RxTelegram->data[5]); // ascii character 2
+        EMS_Boiler.serviceCodeChar[2] = '\0';
+    }
 
     // still to figure out:
     //  EMS_Boiler.serviceCode
@@ -1446,14 +1102,11 @@ void _process_UBAOutdoorTemp(_EMS_RxTelegram * EMS_RxTelegram) {
  * e.g. 17 0B 91 00 80 1E 00 CB 27 00 00 00 00 05 01 00 CB 00 (CRC=47), #data=14
  */
 void _process_RC10StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
-
+    uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
     EMS_Thermostat.hc[hc].active = true;
 
-    EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC10StatusMessage_setpoint]; // store as a byte, is * 2
-    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC10StatusMessage_curr);    // is * 10
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
+    _setValue8(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_RC10StatusMessage_setpoint); // is * 2, force as single byte
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC10StatusMessage_curr);          // is * 10
 }
 
 /**
@@ -1462,14 +1115,11 @@ void _process_RC10StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
  * received every 60 seconds
  */
 void _process_RC20StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
-
+    uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
     EMS_Thermostat.hc[hc].active = true;
 
-    EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC20StatusMessage_setpoint]; // store as a byte, is * 2
-    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC20StatusMessage_curr);    // is * 10
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
+    _setValue8(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_RC20StatusMessage_setpoint); // is * 2, force as single byte
+    _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC20StatusMessage_curr);          // is * 10
 }
 
 /**
@@ -1477,14 +1127,11 @@ void _process_RC20StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
  * For reading the temp values only * received every 60 seconds 
 */
 void _process_RC30StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
-
+    uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
     EMS_Thermostat.hc[hc].active = true;
 
-    EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC30StatusMessage_setpoint]; // store as a byte, is * 2
+    _setValue8(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_RC30StatusMessage_setpoint); // is * 2, force as single byte
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RC30StatusMessage_curr);
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /**
@@ -1528,19 +1175,15 @@ void _process_RC35StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 
     // ignore if the value is 0 (see https://github.com/proddy/EMS-ESP/commit/ccc30738c00f12ae6c89177113bd15af9826b836)
     if (EMS_RxTelegram->data[EMS_OFFSET_RC35StatusMessage_setpoint] != 0x00) {
-        EMS_Thermostat.hc[hc_num].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RC35StatusMessage_setpoint]; // is * 2
+        _setValue8(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].setpoint_roomTemp, EMS_OFFSET_RC35StatusMessage_setpoint); // is * 2, force to single byte
     }
 
     // ignore if the value is unset. Hopefully it will be picked up via a later message
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].curr_roomTemp, EMS_OFFSET_RC35StatusMessage_curr); // is * 10
-
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].day_mode, EMS_OFFSET_RC35StatusMessage_mode, 1);
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].summer_mode, EMS_OFFSET_RC35StatusMessage_mode, 0);
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].holiday_mode, EMS_OFFSET_RC35StatusMessage_mode1, 5);
-
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].circuitcalctemp, EMS_OFFSET_RC35Set_circuitcalctemp);
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /**
@@ -1548,14 +1191,11 @@ void _process_RC35StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
  * The Easy has a digital precision of its floats to 2 decimal places, so values must be divided by 100
  */
 void _process_EasyStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
-
+    uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
     EMS_Thermostat.hc[hc].active = true;
 
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_EasyStatusMessage_curr);         // is * 100
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_EasyStatusMessage_setpoint); // is * 100
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
@@ -1565,12 +1205,9 @@ void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     }
     EMS_Mixing.hc[hc].active = true;
 
-    if (EMS_RxTelegram->data_length == 1) {
-    } else if (EMS_RxTelegram->data_length > 8) {
-        _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowTemp, EMS_OFFSET_MMPLUSStatusMessage_flow_temp);
-        _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].pumpMod, EMS_OFFSET_MMPLUSStatusMessage_pump_mod);
-        _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].valveStatus, EMS_OFFSET_MMPLUSStatusMessage_valve_status);
-    }
+    _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowTemp, EMS_OFFSET_MMPLUSStatusMessage_flow_temp);
+    _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].pumpMod, EMS_OFFSET_MMPLUSStatusMessage_pump_mod);
+    _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].valveStatus, EMS_OFFSET_MMPLUSStatusMessage_valve_status);
 }
 
 /**
@@ -1610,14 +1247,11 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
         // the whole telegram
         // e.g. Thermostat -> all, telegram: 10 00 FF 00 01 A5 00 D7 21 00 00 00 00 30 01 84 01 01 03 01 84 01 F1 00 00 11 01 00 08 63 00
         //                                   10 00 FF 00 01 A5 80 00 01 30 28 00 30 28 01 54 03 03 01 01 54 02 A8 00 00 11 01 03 FF FF 00
-
-        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_curr);    // value is * 10
-        EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[EMS_OFFSET_RCPLUSStatusMessage_setpoint]; // convert to single byte, value is * 2
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_curr);         // value is * 10
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_setpoint); // convert to single byte, value is * 2
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].day_mode, EMS_OFFSET_RCPLUSStatusMessage_mode, 1);
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RCPLUSStatusMessage_mode, 0); // bit 1, mode (auto=1 or manual=0)
     }
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /**
@@ -1641,8 +1275,6 @@ void _process_JunkersStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_JunkersStatusMessage_setpoint); // value is * 10
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].day_mode, EMS_OFFSET_JunkersStatusMessage_daymode);           // 3 = day, 2 = night
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_JunkersStatusMessage_mode);                  // 1 = manual, 2 = auto
-
-        EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
     }
 }
 
@@ -1663,15 +1295,11 @@ void _process_RCPLUSSetMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     if ((EMS_RxTelegram->data_length == 1) && (EMS_RxTelegram->data[0] != 0xFF)) {
         // check for setpoint temps, e.g. Thermostat -> all, type 0x01B9, telegram: 10 00 FF 08 01 B9 26
         if ((EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_temp_setpoint) || (EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_manual_setpoint)) {
-            EMS_Thermostat.hc[hc].setpoint_roomTemp = EMS_RxTelegram->data[0]; // single byte conversion, value is * 2
-            EMS_Sys_Status.emsRefreshed             = true;                    // triggers a send the values back via MQTT
-
-            // check for mode, eg.  10 00 FF 08 01 B9 FF
+            _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, 0); // single byte conversion, value is * 2
         } else if (EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_mode) {
-            EMS_Thermostat.hc[hc].mode  = (EMS_RxTelegram->data[0] == 0xFF); // Auto = xFF, Manual = x00   (auto=1 or manual=0)
-            EMS_Sys_Status.emsRefreshed = true;                              // triggers a send the values back via MQTT
+            // check for mode, eg.  10 00 FF 08 01 B9 FF
+            EMS_Thermostat.hc[hc].mode = (EMS_RxTelegram->data[0] == 0xFF); // Auto = xFF, Manual = x00   (auto=1 or manual=0)
         }
-
         return; // quit
     }
 
@@ -1680,8 +1308,6 @@ void _process_RCPLUSSetMessage(_EMS_RxTelegram * EMS_RxTelegram) {
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RCPLUSSet_mode);
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].daytemp, EMS_OFFSET_RCPLUSSet_temp_comfort2); // is * 2
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].nighttemp, EMS_OFFSET_RCPLUSSet_temp_eco);    // is * 2
-
-        EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
     }
 }
 
@@ -1698,8 +1324,7 @@ void _process_RC10Set(_EMS_RxTelegram * EMS_RxTelegram) {
  * received only after requested
  */
 void _process_RC20Set(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
-
+    uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
     EMS_Thermostat.hc[hc].active = true;
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RC20Set_mode); // note, fixed for HC1
 }
@@ -1709,8 +1334,7 @@ void _process_RC20Set(_EMS_RxTelegram * EMS_RxTelegram) {
  * received only after requested
  */
 void _process_RC30Set(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
-
+    uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
     EMS_Thermostat.hc[hc].active = true;
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RC30Set_mode); // note, fixed for HC1
 }
@@ -1740,7 +1364,6 @@ uint8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram) {
     }
 
     hc_num--;
-
     EMS_Thermostat.hc[hc_num].active = true;
 
     return (hc_num);
@@ -1768,8 +1391,6 @@ void _process_RC35Set(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].nighttemp, EMS_OFFSET_RC35Set_temp_night);     // is * 2
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].holidaytemp, EMS_OFFSET_RC35Set_temp_holiday); // is * 2
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc_num].heatingtype, EMS_OFFSET_RC35Set_heatingtype);  // byte 0 bit floor heating = 3
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /**
@@ -1787,8 +1408,6 @@ void _process_SM10Monitor(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_SolarModule.bottomTemp, 5);     // bottom temp from SM10, is *10
     _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 4); // modulation solar pump
     _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 7, 1);        // active if bit 1 is set
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
@@ -1805,8 +1424,6 @@ void _process_SM100Monitor(_EMS_RxTelegram * EMS_RxTelegram) {
 
     _setValue(EMS_RxTelegram, &EMS_SolarModule.collectorTemp, 0); // is *10
     _setValue(EMS_RxTelegram, &EMS_SolarModule.bottomTemp, 2);    // is *10
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
@@ -1820,8 +1437,6 @@ void _process_SM100Status(_EMS_RxTelegram * EMS_RxTelegram) {
     } else if (EMS_RxTelegram->offset == 0x09) {
         _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 0); // or short telegram with a single byte with offset 09
     }
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
@@ -1834,8 +1449,6 @@ void _process_SM100Status2(_EMS_RxTelegram * EMS_RxTelegram) {
         // or short telegram with a single byte with offset 0A
         _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 0, 2); // 03=off 04=on
     }
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
@@ -1846,8 +1459,6 @@ void _process_SM100Energy(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_SolarModule.EnergyLastHour, 2); // last hour / 10 in Wh
     _setValue(EMS_RxTelegram, &EMS_SolarModule.EnergyToday, 6);    //  todays in Wh
     _setValue(EMS_RxTelegram, &EMS_SolarModule.EnergyTotal, 10);   //  total / 10 in kWh
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
@@ -1855,8 +1466,6 @@ void _process_SM100Energy(_EMS_RxTelegram * EMS_RxTelegram) {
  */
 void _process_HPMonitor1(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_HeatPump.HPModulation, 13); // %
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
@@ -1864,8 +1473,6 @@ void _process_HPMonitor1(_EMS_RxTelegram * EMS_RxTelegram) {
  */
 void _process_HPMonitor2(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_HeatPump.HPSpeed, 25); // %
-
-    EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
 }
 
 /*
@@ -2488,53 +2095,6 @@ void ems_printDevices() {
     myDebug_P(PSTR("")); // newline
 }
 
-/**
- * Send a command to UART Tx to Read from another device
- * Read commands when sent must respond by the destination (target) immediately (or within 10ms)
- */
-void ems_doReadCommand(uint16_t type, uint8_t dest, bool forceRefresh) {
-    // if not a valid type of boiler is not accessible then quits
-    if ((type == EMS_ID_NONE) || (dest == EMS_ID_NONE)) {
-        return;
-    }
-
-    // if we're preventing all outbound traffic, quit
-    if (EMS_Sys_Status.emsTxDisabled) {
-        if (ems_getLogging() != EMS_SYS_LOGGING_NONE) {
-            myDebug_P(PSTR("in Listen Mode. All Tx is disabled."));
-        }
-        return;
-    }
-
-    _EMS_TxTelegram EMS_TxTelegram = EMS_TX_TELEGRAM_NEW; // create new Tx
-    EMS_TxTelegram.timestamp       = millis();            // set timestamp
-    EMS_Sys_Status.txRetryCount    = 0;                   // reset retry counter
-
-    // see if its a known type
-    int8_t i = _ems_findType(type);
-
-    if ((ems_getLogging() == EMS_SYS_LOGGING_BASIC) || (ems_getLogging() == EMS_SYS_LOGGING_VERBOSE)) {
-        if (i == -1) {
-            myDebug_P(PSTR("Requesting type (0x%02X) from dest 0x%02X"), type, dest);
-        } else {
-            myDebug_P(PSTR("Requesting type %s(0x%02X) from dest 0x%02X"), EMS_Types[i].typeString, type, dest);
-        }
-    }
-    EMS_TxTelegram.action             = EMS_TX_TELEGRAM_READ; // read command
-    EMS_TxTelegram.dest               = dest;                 // 8th bit will be set to indicate a read
-    EMS_TxTelegram.offset             = 0;                    // 0 for all data
-    EMS_TxTelegram.type               = type;
-    EMS_TxTelegram.length             = EMS_MIN_TELEGRAM_LENGTH; // EMS 1.0: 6 bytes long (including CRC at end), EMS+ will add 2 bytes. includes CRC
-    EMS_TxTelegram.dataValue          = EMS_MAX_TELEGRAM_LENGTH; // for a read this is the # bytes we want back
-    EMS_TxTelegram.type_validate      = EMS_ID_NONE;
-    EMS_TxTelegram.comparisonValue    = 0;
-    EMS_TxTelegram.comparisonOffset   = 0;
-    EMS_TxTelegram.comparisonPostRead = EMS_ID_NONE;
-    EMS_TxTelegram.forceRefresh       = forceRefresh; // send to MQTT after a successful read
-
-    EMS_TxQueue.push(EMS_TxTelegram);
-}
-
 /**
  * Send a raw telegram to the bus
  * telegram is a string of hex values
@@ -2709,7 +2269,6 @@ void ems_setThermostatTemp(float temperature, uint8_t hc_num, uint8_t temptype)
     EMS_TxTelegram.comparisonOffset = EMS_TxTelegram.offset;
     EMS_TxTelegram.comparisonValue  = EMS_TxTelegram.dataValue;
 
-    EMS_TxTelegram.forceRefresh = false; // send to MQTT is done automatically in EMS_TYPE_RC*StatusMessage
     EMS_TxQueue.push(EMS_TxTelegram);
 }
 
@@ -2820,7 +2379,6 @@ void ems_setThermostatMode(uint8_t mode, uint8_t hc_num) {
 
     EMS_TxTelegram.comparisonOffset = EMS_TxTelegram.offset;
     EMS_TxTelegram.comparisonValue  = EMS_TxTelegram.dataValue;
-    EMS_TxTelegram.forceRefresh     = false; // send to MQTT is done automatically in 0xA8 process
 
     EMS_TxQueue.push(EMS_TxTelegram);
 }
@@ -2851,7 +2409,6 @@ void ems_setWarmWaterTemp(uint8_t temperature) {
     EMS_TxTelegram.comparisonOffset   = EMS_OFFSET_UBAParameterWW_wwtemp;
     EMS_TxTelegram.comparisonValue    = temperature;
     EMS_TxTelegram.comparisonPostRead = EMS_TYPE_UBAParameterWW;
-    EMS_TxTelegram.forceRefresh       = false; // no need to send since this is done by 0x33 process
 
     EMS_TxQueue.push(EMS_TxTelegram);
 }
@@ -2877,7 +2434,6 @@ void ems_setFlowTemp(uint8_t temperature) {
     EMS_TxTelegram.comparisonOffset   = EMS_OFFSET_UBASetPoints_flowtemp;
     EMS_TxTelegram.comparisonValue    = temperature;
     EMS_TxTelegram.comparisonPostRead = EMS_TYPE_UBASetPoints;
-    EMS_TxTelegram.forceRefresh       = false;
 
     EMS_TxQueue.push(EMS_TxTelegram);
 }
@@ -2962,7 +2518,6 @@ void ems_setWarmTapWaterActivated(bool activated) {
     EMS_TxTelegram.comparisonOffset   = 0;                   // 1st byte
     EMS_TxTelegram.comparisonValue    = (activated ? 0 : 1); // value is 1 if in Test mode (not activated)
     EMS_TxTelegram.comparisonPostRead = EMS_TxTelegram.type;
-    EMS_TxTelegram.forceRefresh       = true; // send new value to MQTT after successful write
 
     // create header
     EMS_TxTelegram.data[0] = EMS_ID_ME;             // src
@@ -3062,3 +2617,322 @@ void ems_testTelegram(uint8_t test_num) {
     myDebug_P(PSTR("Firmware not compiled with test data. Use -DTESTS"));
 #endif
 }
+
+/**
+ * Recognized EMS types and the functions they call to process the telegrams
+ */
+const _EMS_Type EMS_Types[] = {
+
+    // common
+    {EMS_DEVICE_UPDATE_FLAG_NONE, EMS_TYPE_Version, "Version", _process_Version},
+    {EMS_DEVICE_UPDATE_FLAG_NONE, EMS_TYPE_UBADevices, "UBADevices", _process_UBADevices},
+    {EMS_DEVICE_UPDATE_FLAG_NONE, EMS_TYPE_RCTime, "RCTime", _process_RCTime},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage},
+
+    // UBA/Boiler
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAMonitorFast, "UBAMonitorFast", _process_UBAMonitorFast},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAMonitorSlow, "UBAMonitorSlow", _process_UBAMonitorSlow},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAMonitorWWMessage, "UBAMonitorWWMessage", _process_UBAMonitorWWMessage},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAParameterWW, "UBAParameterWW", _process_UBAParameterWW},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBATotalUptimeMessage, "UBATotalUptimeMessage", _process_UBATotalUptimeMessage},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints},
+
+    // UBA/Boiler EMS+
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAOutdoorTemp, "UBAOutdoorTemp", _process_UBAOutdoorTemp},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAMonitorFast2, "UBAMonitorFast2", _process_UBAMonitorFast2},
+    {EMS_DEVICE_UPDATE_FLAG_BOILER, EMS_TYPE_UBAMonitorSlow2, "UBAMonitorSlow2", _process_UBAMonitorSlow2},
+
+    // Solar Module devices
+    {EMS_DEVICE_UPDATE_FLAG_SOLAR, EMS_TYPE_SM10Monitor, "SM10Monitor", _process_SM10Monitor},
+    {EMS_DEVICE_UPDATE_FLAG_SOLAR, EMS_TYPE_SM100Monitor, "SM100Monitor", _process_SM100Monitor},
+    {EMS_DEVICE_UPDATE_FLAG_SOLAR, EMS_TYPE_SM100Status, "SM100Status", _process_SM100Status},
+    {EMS_DEVICE_UPDATE_FLAG_SOLAR, EMS_TYPE_SM100Status2, "SM100Status2", _process_SM100Status2},
+    {EMS_DEVICE_UPDATE_FLAG_SOLAR, EMS_TYPE_SM100Energy, "SM100Energy", _process_SM100Energy},
+    {EMS_DEVICE_UPDATE_FLAG_SOLAR, EMS_TYPE_ISM1StatusMessage, "ISM1StatusMessage", _process_ISM1StatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_SOLAR, EMS_TYPE_ISM1Set, "ISM1Set", _process_ISM1Set},
+
+    // heatpumps
+    {EMS_DEVICE_UPDATE_FLAG_HEATPUMP, EMS_TYPE_HPMonitor1, "HeatPumpMonitor1", _process_HPMonitor1},
+    {EMS_DEVICE_UPDATE_FLAG_HEATPUMP, EMS_TYPE_HPMonitor2, "HeatPumpMonitor2", _process_HPMonitor2},
+
+    // RC10
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage},
+
+    // RC20 and RC20RF
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage},
+
+    // RC30
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC30Set, "RC30Set", _process_RC30Set},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC30StatusMessage, "RC30StatusMessage", _process_RC30StatusMessage},
+
+    // RC35 and ES71
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35Set_HC1, "RC35Set_HC1", _process_RC35Set},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35StatusMessage_HC1, "RC35StatusMessage_HC1", _process_RC35StatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35Set_HC2, "RC35Set_HC2", _process_RC35Set},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35StatusMessage_HC2, "RC35StatusMessage_HC2", _process_RC35StatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35Set_HC3, "RC35Set_HC2", _process_RC35Set},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35StatusMessage_HC3, "RC35StatusMessage_HC3", _process_RC35StatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35Set_HC4, "RC35Set_HC4", _process_RC35Set},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RC35StatusMessage_HC4, "RC35StatusMessage_HC4", _process_RC35StatusMessage},
+
+    // Easy
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage},
+
+    // Nefit 1010, RC300, RC310 (EMS Plus)
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RCPLUSStatusMessage_HC1, "RCPLUSStatusMessage_HC1", _process_RCPLUSStatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RCPLUSStatusMessage_HC2, "RCPLUSStatusMessage_HC2", _process_RCPLUSStatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RCPLUSStatusMessage_HC3, "RCPLUSStatusMessage_HC3", _process_RCPLUSStatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RCPLUSStatusMessage_HC4, "RCPLUSStatusMessage_HC4", _process_RCPLUSStatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RCPLUSSet, "RCPLUSSetMessage", _process_RCPLUSSetMessage},
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_RCPLUSStatusMode, "RCPLUSStatusMode", _process_RCPLUSStatusMode},
+
+    // Junkers FR10
+    {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_JunkersStatusMessage, "JunkersStatusMessage", _process_JunkersStatusMessage},
+
+    // Mixing devices
+    {EMS_DEVICE_UPDATE_FLAG_MIXING, EMS_TYPE_MMPLUSStatusMessage_HC1, "MMPLUSStatusMessage_HC1", _process_MMPLUSStatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_MIXING, EMS_TYPE_MMPLUSStatusMessage_HC2, "MMPLUSStatusMessage_HC2", _process_MMPLUSStatusMessage}
+
+};
+
+// calculate sizes of arrays at compile time
+uint8_t _EMS_Types_max = ArraySize(EMS_Types);
+
+/**
+ * Find the pointer to the EMS_Types array for a given type ID
+ * or -1 if not found
+ */
+int8_t _ems_findType(uint16_t type) {
+    uint8_t i         = 0;
+    bool    typeFound = false;
+    // scan through known ID types
+    while (i < _EMS_Types_max) {
+        if (EMS_Types[i].type == type) {
+            typeFound = true; // we have a match
+            break;
+        }
+        i++;
+    }
+
+    return (typeFound ? i : -1);
+}
+
+/**
+ * print detailed telegram
+ * and then call its callback if there is one defined
+ */
+void _ems_processTelegram(_EMS_RxTelegram * EMS_RxTelegram) {
+    // print out the telegram for verbose mode
+    if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_THERMOSTAT) {
+        _printMessage(EMS_RxTelegram);
+    }
+
+    // ignore telegrams that don't have any data
+    if (EMS_RxTelegram->data_length == 0) {
+        return;
+    }
+
+    // we're only interested in broadcast messages (dest is 0x00) or ones for us (dest is 0x0B)
+    uint8_t dest = EMS_RxTelegram->dest;
+    if ((dest != EMS_ID_NONE) && (dest != EMS_ID_ME)) {
+        return;
+    }
+
+    // see if we recognize the type first by scanning our known EMS types list
+    uint16_t type = EMS_RxTelegram->type;
+    int8_t   i    = _ems_findType(type);
+    if (i == -1) {
+        return; // not found
+    }
+
+    // if it's a common type (across ems devices) or something specifically for us process it.
+    // dest will be EMS_ID_NONE and offset 0x00 for a broadcast message
+    if ((EMS_Types[i].processType_cb) != nullptr) {
+        // print non-verbose message
+        if (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_BASIC) {
+            myDebug_P(PSTR("<--- %s(0x%02X)"), EMS_Types[i].typeString, type);
+        }
+        // call callback function to process the telegram
+        (void)EMS_Types[i].processType_cb(EMS_RxTelegram);
+
+        // see if we need to flag something has changed
+        ems_Device_add_flags(EMS_Types[i].device_flag);
+    }
+
+    EMS_Sys_Status.emsTxStatus = EMS_TX_STATUS_IDLE;
+}
+
+/**
+ * deciphers the telegram packet, which has already been checked for valid CRC and has a complete header
+ * length is only data bytes, excluding the BRK
+ * We only remove from the Tx queue if the read or write was successful
+ */
+void _processType(_EMS_RxTelegram * EMS_RxTelegram) {
+    uint8_t * telegram = EMS_RxTelegram->telegram;
+
+    // if its an echo of ourselves from the master UBA, ignore. This should never happen mind you
+    if (EMS_RxTelegram->src == EMS_ID_ME) {
+        if (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_JABBER)
+            _debugPrintTelegram("echo: ", EMS_RxTelegram, COLOR_WHITE);
+        return;
+    }
+
+    // if its a broadcast and we didn't just send anything, process it and exit
+    if (EMS_Sys_Status.emsTxStatus == EMS_TX_STATUS_IDLE) {
+        _ems_processTelegram(EMS_RxTelegram);
+        return;
+    }
+
+    // release the lock on the TxQueue
+    EMS_Sys_Status.emsTxStatus = EMS_TX_STATUS_IDLE;
+
+    // at this point we can assume TxStatus was EMS_TX_STATUS_WAIT as we just sent a read or validate telegram
+    // for READ or VALIDATE the dest (telegram[1]) is always us, so check for this
+    // and if not we probably didn't get any response so remove the last Tx from the queue and process the telegram anyway
+    if ((telegram[1] & 0x7F) != EMS_ID_ME) {
+        _removeTxQueue();
+        _ems_processTelegram(EMS_RxTelegram);
+        return;
+    }
+
+    // first double check we actually have something in the Tx queue that we're waiting upon
+    if (EMS_TxQueue.isEmpty()) {
+        _ems_processTelegram(EMS_RxTelegram);
+        return;
+    }
+
+    // get the Tx telegram we just sent
+    _EMS_TxTelegram EMS_TxTelegram = EMS_TxQueue.first();
+
+    // check action
+    // if READ, match the current inbound telegram to what we just sent
+    // if WRITE, should not happen
+    // if VALIDATE, check the contents
+    if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_READ) {
+        // remove MSB from src/dest
+        if (((EMS_RxTelegram->src & 0x7F) == (EMS_TxTelegram.dest & 0x7F)) && (EMS_RxTelegram->type == EMS_TxTelegram.type)) {
+            // all checks out, read was successful, remove tx from queue and continue to process telegram
+            _removeTxQueue();
+            EMS_Sys_Status.emsRxPgks++;         // increment Rx happy counter
+            EMS_Sys_Status.emsTxCapable = true; // we're able to transmit a telegram on the Tx
+        } else {
+            // read not OK, we didn't get back a telegram we expected.
+            // first see if we got a response back from the sender saying its an unknown command
+            if (EMS_RxTelegram->data_length == 0) {
+                _removeTxQueue();
+            } else {
+                // leave on queue and try again, but continue to process what we received as it may be important
+                EMS_Sys_Status.txRetryCount++;
+                // if retried too many times, give up and remove it
+                if (EMS_Sys_Status.txRetryCount >= TX_WRITE_TIMEOUT_COUNT) {
+                    if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
+                        myDebug_P(PSTR("-> Read failed. Giving up and removing write from queue"));
+                    }
+                    _removeTxQueue();
+                } else {
+                    if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
+                        myDebug_P(PSTR("-> Read failed. Retrying (%d/%d)..."), EMS_Sys_Status.txRetryCount, TX_WRITE_TIMEOUT_COUNT);
+                    }
+                }
+            }
+        }
+        _ems_processTelegram(EMS_RxTelegram); // process it always
+    }
+
+    if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_WRITE) {
+        // should not get here, since this is handled earlier receiving a 01 or 04
+        myDebug_P(PSTR("-> Write error - panic! should never get here"));
+    }
+
+    if (EMS_TxTelegram.action == EMS_TX_TELEGRAM_VALIDATE) {
+        // this is a read telegram which we use to validate the last write
+
+        // data block starts at position 5 for EMS1.0 and 6 for EMS2.0.
+        // See https://github.com/proddy/EMS-ESP/wiki/RC3xx-Thermostats
+        uint8_t dataReceived = (EMS_RxTelegram->emsplus) ? telegram[6] : telegram[4];
+
+        if (EMS_TxTelegram.comparisonValue == dataReceived) {
+            // validate was successful, the write changed the value
+            _removeTxQueue(); // now we can remove the Tx validate command the queue
+            if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
+                myDebug_P(PSTR("-> Validate confirmed, last Write to 0x%02X was successful"), EMS_TxTelegram.dest);
+            }
+            // follow up with the post read command
+            ems_doReadCommand(EMS_TxTelegram.comparisonPostRead, EMS_TxTelegram.dest);
+        } else {
+            // write failed
+            if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
+                myDebug_P(PSTR("-> Write failed. Compared set value 0x%02X with received value of 0x%02X"), EMS_TxTelegram.comparisonValue, dataReceived);
+            }
+            if (++EMS_Sys_Status.txRetryCount > TX_WRITE_TIMEOUT_COUNT) {
+                if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
+                    myDebug_P(PSTR("-> Write failed. Giving up, removing from queue"));
+                }
+                _removeTxQueue();
+            } else {
+                // retry, turn the validate back into a write and try again
+                if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
+                    myDebug_P(PSTR("-> Write didn't work, retrying (%d/%d)..."), EMS_Sys_Status.txRetryCount, TX_WRITE_TIMEOUT_COUNT);
+                }
+                EMS_TxTelegram.action    = EMS_TX_TELEGRAM_WRITE;
+                EMS_TxTelegram.dataValue = EMS_TxTelegram.comparisonValue;  // restore old value
+                EMS_TxTelegram.offset    = EMS_TxTelegram.comparisonOffset; // restore old value
+                EMS_TxTelegram.type      = EMS_TxTelegram.type_validate;    // restore old value, we swapped them to save the original type
+
+                EMS_TxQueue.shift();                 // remove validate from queue
+                EMS_TxQueue.unshift(EMS_TxTelegram); // add back to queue making it next in line
+            }
+        }
+    }
+
+    ems_tx_pollAck(); // send Acknowledgement back to free the EMS bus since we have the telegram
+}
+
+/**
+ * Send a command to UART Tx to Read from another device
+ * Read commands when sent must respond by the destination (target) immediately (or within 10ms)
+ */
+void ems_doReadCommand(uint16_t type, uint8_t dest) {
+    // if not a valid type of boiler is not accessible then quits
+    if ((type == EMS_ID_NONE) || (dest == EMS_ID_NONE)) {
+        return;
+    }
+
+    // if we're preventing all outbound traffic, quit
+    if (EMS_Sys_Status.emsTxDisabled) {
+        if (ems_getLogging() != EMS_SYS_LOGGING_NONE) {
+            myDebug_P(PSTR("in Listen Mode. All Tx is disabled."));
+        }
+        return;
+    }
+
+    _EMS_TxTelegram EMS_TxTelegram = EMS_TX_TELEGRAM_NEW; // create new Tx
+    EMS_TxTelegram.timestamp       = millis();            // set timestamp
+    EMS_Sys_Status.txRetryCount    = 0;                   // reset retry counter
+
+    // see if its a known type
+    int8_t i = _ems_findType(type);
+
+    if ((ems_getLogging() == EMS_SYS_LOGGING_BASIC) || (ems_getLogging() == EMS_SYS_LOGGING_VERBOSE)) {
+        if (i == -1) {
+            myDebug_P(PSTR("Requesting type (0x%02X) from dest 0x%02X"), type, dest);
+        } else {
+            myDebug_P(PSTR("Requesting type %s(0x%02X) from dest 0x%02X"), EMS_Types[i].typeString, type, dest);
+        }
+    }
+    EMS_TxTelegram.action             = EMS_TX_TELEGRAM_READ; // read command
+    EMS_TxTelegram.dest               = dest;                 // 8th bit will be set to indicate a read
+    EMS_TxTelegram.offset             = 0;                    // 0 for all data
+    EMS_TxTelegram.type               = type;
+    EMS_TxTelegram.length             = EMS_MIN_TELEGRAM_LENGTH; // EMS 1.0: 6 bytes long (including CRC at end), EMS+ will add 2 bytes. includes CRC
+    EMS_TxTelegram.dataValue          = EMS_MAX_TELEGRAM_LENGTH; // for a read this is the # bytes we want back
+    EMS_TxTelegram.type_validate      = EMS_ID_NONE;
+    EMS_TxTelegram.comparisonValue    = 0;
+    EMS_TxTelegram.comparisonOffset   = 0;
+    EMS_TxTelegram.comparisonPostRead = EMS_ID_NONE;
+
+    EMS_TxQueue.push(EMS_TxTelegram);
+}
diff --git a/src/ems.h b/src/ems.h
index 9a6218405..03f619291 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -23,12 +23,14 @@
 #define EMS_MAX_TELEGRAM_LENGTH 32 // max length of a telegram, including CRC, for Rx and Tx.
 
 // default values for null values
-#define EMS_VALUE_INT_ON 1             // boolean true
-#define EMS_VALUE_INT_OFF 0            // boolean false
+#define EMS_VALUE_BOOL_ON 0x01         // boolean true
+#define EMS_VALUE_BOOL_ON2 0xFF        // boolean true, EMS sometimes uses 0xFF for TRUE
+#define EMS_VALUE_BOOL_OFF 0x00        // boolean false
 #define EMS_VALUE_INT_NOTSET 0xFF      // for 8-bit unsigned ints/bytes
 #define EMS_VALUE_SHORT_NOTSET -32768  // for 2-byte signed shorts
 #define EMS_VALUE_USHORT_NOTSET 0x8000 // for 2-byte unsigned shorts
 #define EMS_VALUE_LONG_NOTSET 0xFFFFFF // for 3-byte longs
+#define EMS_VALUE_BOOL_NOTSET 0xFE     // random number that's not 0, 1 or FF
 
 // thermostat specific
 #define EMS_THERMOSTAT_MAXHC 4     // max number of heating circuits
@@ -37,7 +39,6 @@
 #define EMS_THERMOSTAT_WRITE_NO false
 
 // Device Flags
-
 #define EMS_DEVICE_FLAG_NONE 0   // no flags set
 #define EMS_DEVICE_FLAG_SM10 10  // solar module1
 #define EMS_DEVICE_FLAG_SM100 11 // solar module2
@@ -125,7 +126,7 @@ typedef struct {
     bool             emsPollEnabled;                         // flag enable the response to poll messages
     _EMS_SYS_LOGGING emsLogging;                             // logging
     uint16_t         emsLogging_typeID;                      // the typeID to watch
-    bool             emsRefreshed;                           // fresh data, needs to be pushed out to MQTT
+    uint8_t          emsRefreshedFlags;                      // fresh data, needs to be pushed out to MQTT
     bool             emsBusConnected;                        // is there an active bus
     uint32_t         emsRxTimestamp;                         // timestamp of last EMS message received
     uint32_t         emsPollFrequency;                       // time between EMS polls
@@ -150,7 +151,6 @@ typedef struct {
     uint8_t                 comparisonValue;    // value to compare against during a validate command
     uint8_t                 comparisonOffset;   // offset of where the byte is we want to compare too during validation
     uint16_t                comparisonPostRead; // after a successful write, do a read from this type ID
-    bool                    forceRefresh;       // should we send to MQTT after a successful Tx?
     unsigned long           timestamp;          // when created
     uint8_t                 data[EMS_MAX_TELEGRAM_LENGTH];
 } _EMS_TxTelegram;
@@ -182,13 +182,22 @@ const _EMS_TxTelegram EMS_TX_TELEGRAM_NEW = {
     0,                    // comparisonValue
     0,                    // comparisonOffset
     EMS_ID_NONE,          // comparisonPostRead
-    false,                // forceRefresh
     0,                    // timestamp
     {0x00}                // data
 };
 
-typedef enum {
-    EMS_DEVICE_TYPE_NONE,
+// flags for triggering changes when EMS data is received
+typedef enum : uint8_t {
+    EMS_DEVICE_UPDATE_FLAG_NONE       = 0,
+    EMS_DEVICE_UPDATE_FLAG_BOILER     = (1 << 0),
+    EMS_DEVICE_UPDATE_FLAG_THERMOSTAT = (1 << 1),
+    EMS_DEVICE_UPDATE_FLAG_MIXING     = (1 << 2),
+    EMS_DEVICE_UPDATE_FLAG_SOLAR      = (1 << 3),
+    EMS_DEVICE_UPDATE_FLAG_HEATPUMP   = (1 << 4)
+} _EMS_DEVICE_UPDATE_FLAG;
+
+typedef enum : uint8_t {
+    EMS_DEVICE_TYPE_NONE = 0,
     EMS_DEVICE_TYPE_SERVICEKEY,
     EMS_DEVICE_TYPE_BOILER,
     EMS_DEVICE_TYPE_THERMOSTAT,
@@ -378,16 +387,17 @@ typedef void (*EMS_processType_cb)(_EMS_RxTelegram * EMS_RxTelegram);
 
 // Definition for each EMS type, including the relative callback function
 typedef struct {
-    uint16_t           type;
-    const char         typeString[30];
-    EMS_processType_cb processType_cb;
+    _EMS_DEVICE_UPDATE_FLAG device_flag;
+    uint16_t                type;
+    const char              typeString[30];
+    EMS_processType_cb      processType_cb;
 } _EMS_Type;
 
 // function definitions
 void             ems_dumpBuffer(const char * prefix, uint8_t * telegram, uint8_t length);
 void             ems_parseTelegram(uint8_t * telegram, uint8_t len);
 void             ems_init();
-void             ems_doReadCommand(uint16_t type, uint8_t dest, bool forceRefresh = false);
+void             ems_doReadCommand(uint16_t type, uint8_t dest);
 void             ems_sendRawTelegram(char * telegram);
 void             ems_scanDevices();
 void             ems_printDevices();
@@ -406,7 +416,6 @@ void             ems_setWarmWaterOnetime(bool activated);
 void             ems_setWarmTapWaterActivated(bool activated);
 void             ems_setPoll(bool b);
 void             ems_setLogging(_EMS_SYS_LOGGING loglevel, uint16_t type_id = 0);
-void             ems_setEmsRefreshed(bool b);
 void             ems_setWarmWaterModeComfort(uint8_t comfort);
 void             ems_setModels();
 void             ems_setTxDisabled(bool b);
@@ -425,13 +434,15 @@ bool             ems_getSolarModuleEnabled();
 bool             ems_getHeatPumpEnabled();
 bool             ems_getBusConnected();
 _EMS_SYS_LOGGING ems_getLogging();
-bool             ems_getEmsRefreshed();
 uint8_t          ems_getThermostatModel();
 uint8_t          ems_getSolarModuleModel();
 void             ems_discoverModels();
 bool             ems_getTxCapable();
 uint32_t         ems_getPollFrequency();
 bool             ems_getTxDisabled();
+void             ems_Device_add_flags(unsigned int flags);
+bool             ems_Device_has_flags(unsigned int flags);
+void             ems_Device_remove_flags(unsigned int flags);
 
 // private functions
 uint8_t _crcCalculator(uint8_t * data, uint8_t len);
diff --git a/src/ems_utils.cpp b/src/ems_utils.cpp
index 41e7e894e..4d61cdfef 100644
--- a/src/ems_utils.cpp
+++ b/src/ems_utils.cpp
@@ -25,11 +25,11 @@ char * _float_to_char(char * a, float f, uint8_t precision) {
 
 // convert bool to text. bools are stored as bytes
 char * _bool_to_char(char * s, uint8_t value) {
-    if (value == EMS_VALUE_INT_ON) {
+    if ((value == EMS_VALUE_BOOL_ON) || (value == EMS_VALUE_BOOL_ON2)) {
         strlcpy(s, "on", sizeof(s));
-    } else if (value == EMS_VALUE_INT_OFF) {
+    } else if (value == EMS_VALUE_BOOL_OFF) {
         strlcpy(s, "off", sizeof(s));
-    } else {
+    } else { // EMS_VALUE_BOOL_NOTSET
         strlcpy(s, "?", sizeof(s));
     }
     return s;
diff --git a/src/version.h b/src/version.h
index 3abff063c..332d9f39b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b21"
+#define APP_VERSION "1.9.4b22"

From 9b31e3f60a374c2e9d84d174dbdfe3572e791053 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 8 Dec 2019 09:08:27 +0100
Subject: [PATCH 115/120] formatting

---
 src/ems_devices.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/ems_devices.h b/src/ems_devices.h
index 1a0533204..3d09e6ec0 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -205,7 +205,6 @@ static const _EMS_Device EMS_Devices[] = {
     //
     // UBA Masters - typically with device_id of 0x08
     //
-
     {72, EMS_DEVICE_TYPE_BOILER, "MC10 Module", EMS_DEVICE_FLAG_NONE},
     {123, EMS_DEVICE_TYPE_BOILER, "Buderus GBx72/Nefit Trendline/Junkers Cerapur/Worcester Greenstar Si/27i", EMS_DEVICE_FLAG_NONE},
     {133, EMS_DEVICE_TYPE_BOILER, "Buderus GB125/Logamatic MC110", EMS_DEVICE_FLAG_NONE},
@@ -222,7 +221,6 @@ static const _EMS_Device EMS_Devices[] = {
     //
     // Solar Modules - type 0x30
     //
-
     {73, EMS_DEVICE_TYPE_SOLAR, "SM10 Solar Module", EMS_DEVICE_FLAG_SM10},
     {163, EMS_DEVICE_TYPE_SOLAR, "SM100 Solar Module", EMS_DEVICE_FLAG_SM100},
     {101, EMS_DEVICE_TYPE_SOLAR, "Junkers ISM1 Solar Module", EMS_DEVICE_FLAG_SM100},
@@ -231,7 +229,6 @@ static const _EMS_Device EMS_Devices[] = {
     //
     // Mixing Devices - type 0x20 or 0x21
     //
-
     {160, EMS_DEVICE_TYPE_MIXING, "MM100 Mixing Module", EMS_DEVICE_FLAG_NONE},
     {161, EMS_DEVICE_TYPE_MIXING, "MM200 Mixing Module", EMS_DEVICE_FLAG_NONE},
     {69, EMS_DEVICE_TYPE_MIXING, "MM10 Mixer Module", EMS_DEVICE_FLAG_NONE},
@@ -243,14 +240,12 @@ static const _EMS_Device EMS_Devices[] = {
     //
     // HeatPump - type 0x38
     //
-
     {252, EMS_DEVICE_TYPE_HEATPUMP, "HeatPump Module", EMS_DEVICE_FLAG_NONE},
     {200, EMS_DEVICE_TYPE_HEATPUMP, "HeatPump Module", EMS_DEVICE_FLAG_NONE},
 
     //
     // Other devices, like 0x11 for Switching, 0x09 for controllers, 0x02 for Connect, 0x48 for Gateway
     //
-
     {71, EMS_DEVICE_TYPE_SWITCH, "WM10 Switch Module", EMS_DEVICE_FLAG_NONE},                        // 0x11
     {68, EMS_DEVICE_TYPE_CONTROLLER, "BC10/RFM20 Receiver", EMS_DEVICE_FLAG_NONE},                   // 0x09
     {218, EMS_DEVICE_TYPE_CONTROLLER, "Junkers M200/Buderus RFM200 Receiver", EMS_DEVICE_FLAG_NONE}, // 0x50

From 6fb99132ff75216f5e5f864517490bedeaa63f51 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 8 Dec 2019 09:08:52 +0100
Subject: [PATCH 116/120] fix fetching setpoint temps from RC300 (using single
 bytes)

---
 src/ems.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/ems.cpp b/src/ems.cpp
index e2b7699c5..fe9416bab 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -366,7 +366,7 @@ void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint8_t * param_op, uint8_t ind
     *param_op = (uint8_t)EMS_RxTelegram->data[index];
 }
 
-// convert signed short to single 8 byte, for setpoint thermostat temperatures
+// convert signed short to single 8 byte, for setpoint thermostat temperatures that don't store their temps in 2 bytes
 void _setValue8(_EMS_RxTelegram * EMS_RxTelegram, int16_t * param_op, uint8_t index) {
     if (index >= EMS_RxTelegram->data_length) {
         return;
@@ -634,7 +634,7 @@ void _createValidate() {
 
     // this is what is different
     new_EMS_TxTelegram.offset    = EMS_TxTelegram.comparisonOffset; // location of byte to fetch
-    new_EMS_TxTelegram.dataValue = 1;                               // fetch single byte
+    new_EMS_TxTelegram.dataValue = 1;                               // fetch one byte
     new_EMS_TxTelegram.length    = EMS_MIN_TELEGRAM_LENGTH;         // is always 6 bytes long (including CRC at end)
     new_EMS_TxTelegram.timestamp = millis();
 
@@ -720,7 +720,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
     }
 
     /*
-     * check if we just received a single byte
+     * check if we just received one byte
      * it could well be a Poll request from the boiler for us, which will have a value of 0x8B (0x0B | 0x80)
      * or either a return code like 0x01 or 0x04 from the last Write command
      */
@@ -745,7 +745,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
                 }
             }
         } else if (EMS_Sys_Status.emsTxStatus == EMS_TX_STATUS_WAIT) {
-            // this may be a single byte 01 (success) or 04 (error) from a recent write command?
+            // this may be a byte 01 (success) or 04 (error) from a recent write command?
             if (value == EMS_TX_SUCCESS) {
                 EMS_Sys_Status.emsTxPkgs++;
                 // got a success 01. Send a validate to check the value of the last write
@@ -1222,7 +1222,7 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     }
     EMS_Thermostat.hc[hc].active = true;
 
-    // handle single data values. data will always be a single byte a position data[0]
+    // handle single data values. data will always be at position data[0]
     if (EMS_RxTelegram->data_length == 1) {
         switch (EMS_RxTelegram->offset) {
         case EMS_OFFSET_RCPLUSStatusMessage_curr:                               // setpoint target temp
@@ -1247,8 +1247,8 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
         // the whole telegram
         // e.g. Thermostat -> all, telegram: 10 00 FF 00 01 A5 00 D7 21 00 00 00 00 30 01 84 01 01 03 01 84 01 F1 00 00 11 01 00 08 63 00
         //                                   10 00 FF 00 01 A5 80 00 01 30 28 00 30 28 01 54 03 03 01 01 54 02 A8 00 00 11 01 03 FF FF 00
-        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_curr);         // value is * 10
-        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_setpoint); // convert to single byte, value is * 2
+        _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].curr_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_curr);          // value is * 10
+        _setValue8(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_setpoint); // convert to single byte, value is * 2
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].day_mode, EMS_OFFSET_RCPLUSStatusMessage_mode, 1);
         _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RCPLUSStatusMessage_mode, 0); // bit 1, mode (auto=1 or manual=0)
     }
@@ -1290,12 +1290,12 @@ void _process_RCPLUSSetMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc                   = EMS_THERMOSTAT_DEFAULTHC - 1; // use HC1
     EMS_Thermostat.hc[hc].active = true;
 
-    // check for single values
+    // check for one data value
     // but ignore values of 0xFF, e.g.  10 00 FF 08 01 B9 FF
     if ((EMS_RxTelegram->data_length == 1) && (EMS_RxTelegram->data[0] != 0xFF)) {
         // check for setpoint temps, e.g. Thermostat -> all, type 0x01B9, telegram: 10 00 FF 08 01 B9 26
         if ((EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_temp_setpoint) || (EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_manual_setpoint)) {
-            _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, 0); // single byte conversion, value is * 2
+            _setValue8(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, 0); // single byte conversion, value is * 2
         } else if (EMS_RxTelegram->offset == EMS_OFFSET_RCPLUSSet_mode) {
             // check for mode, eg.  10 00 FF 08 01 B9 FF
             EMS_Thermostat.hc[hc].mode = (EMS_RxTelegram->data[0] == 0xFF); // Auto = xFF, Manual = x00   (auto=1 or manual=0)
@@ -1435,7 +1435,7 @@ void _process_SM100Status(_EMS_RxTelegram * EMS_RxTelegram) {
     if (EMS_RxTelegram->offset == 0) {
         _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 9); // check for complete telegram
     } else if (EMS_RxTelegram->offset == 0x09) {
-        _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 0); // or short telegram with a single byte with offset 09
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pumpModulation, 0); // data at offset 09
     }
 }
 
@@ -1446,8 +1446,7 @@ void _process_SM100Status2(_EMS_RxTelegram * EMS_RxTelegram) {
     if (EMS_RxTelegram->offset == 0) {
         _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 10, 2); // 03=off 04=on
     } else if (EMS_RxTelegram->offset == 0x0A) {
-        // or short telegram with a single byte with offset 0A
-        _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 0, 2); // 03=off 04=on
+        _setValue(EMS_RxTelegram, &EMS_SolarModule.pump, 0, 2); // 03=off 04=on at offset 0A
     }
 }
 
@@ -2403,7 +2402,7 @@ void ems_setWarmWaterTemp(uint8_t temperature) {
     EMS_TxTelegram.type      = EMS_TYPE_UBAParameterWW;
     EMS_TxTelegram.offset    = EMS_OFFSET_UBAParameterWW_wwtemp;
     EMS_TxTelegram.length    = EMS_MIN_TELEGRAM_LENGTH;
-    EMS_TxTelegram.dataValue = temperature; // value to compare against. must be a single int
+    EMS_TxTelegram.dataValue = temperature; // int value to compare against
 
     EMS_TxTelegram.type_validate      = EMS_TYPE_UBAParameterWW; // validate
     EMS_TxTelegram.comparisonOffset   = EMS_OFFSET_UBAParameterWW_wwtemp;
@@ -2428,7 +2427,7 @@ void ems_setFlowTemp(uint8_t temperature) {
     EMS_TxTelegram.type      = EMS_TYPE_UBASetPoints;
     EMS_TxTelegram.offset    = EMS_OFFSET_UBASetPoints_flowtemp;
     EMS_TxTelegram.length    = EMS_MIN_TELEGRAM_LENGTH;
-    EMS_TxTelegram.dataValue = temperature; // value to compare against. must be a single int
+    EMS_TxTelegram.dataValue = temperature; // int value to compare against
 
     EMS_TxTelegram.type_validate      = EMS_TYPE_UBASetPoints; // validate
     EMS_TxTelegram.comparisonOffset   = EMS_OFFSET_UBASetPoints_flowtemp;

From e211eb3bd54fd7ab1e88a5c48eed7d901d3c890b Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 8 Dec 2019 09:09:13 +0100
Subject: [PATCH 117/120] bump b23

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

diff --git a/src/version.h b/src/version.h
index 332d9f39b..ac66d1780 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b22"
+#define APP_VERSION "1.9.4b23"

From b82b0b237328cd1dce48ca8144e6f444e24fe95d Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sun, 8 Dec 2019 09:21:35 +0100
Subject: [PATCH 118/120] remove shower from info

---
 src/ems-esp.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index f37473887..68b16d6a0 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -493,13 +493,6 @@ void showInfo() {
         }
     }
 
-    // show the Shower Info
-    if (EMSESP_Settings.shower_timer) {
-        myDebug_P(PSTR("")); // newline
-        myDebug_P(PSTR("%sShower stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
-        myDebug_P(PSTR("  Shower is %s"), (EMSESP_Shower.showerOn ? "running" : "off"));
-    }
-
     myDebug_P(PSTR("")); // newline
 }
 

From 70db69403fe81fcfd5b1aeb80145ae1f75992981 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Tue, 10 Dec 2019 08:21:00 +0100
Subject: [PATCH 119/120] added back boiler starts and workmin to MQTT

---
 src/ems-esp.cpp | 2 --
 src/version.h   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 68b16d6a0..d9b29c308 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -627,7 +627,6 @@ void publishEMSValues(bool force) {
         if (EMS_Boiler.wWHeat != EMS_VALUE_BOOL_NOTSET)
             rootBoiler["wWHeat"] = _bool_to_char(s, EMS_Boiler.wWHeat);
 
-        /*
         if (abs(EMS_Boiler.wWStarts) != EMS_VALUE_LONG_NOTSET)
             rootBoiler["wWStarts"] = (float)EMS_Boiler.wWStarts;
         if (abs(EMS_Boiler.wWWorkM) != EMS_VALUE_LONG_NOTSET)
@@ -641,7 +640,6 @@ void publishEMSValues(bool force) {
             rootBoiler["burnWorkMin"] = (float)EMS_Boiler.burnWorkMin;
         if (abs(EMS_Boiler.heatWorkMin) != EMS_VALUE_LONG_NOTSET)
             rootBoiler["heatWorkMin"] = (float)EMS_Boiler.heatWorkMin;
-            */
 
         if (EMS_Boiler.serviceCode != EMS_VALUE_USHORT_NOTSET) {
             rootBoiler["ServiceCode"]       = EMS_Boiler.serviceCodeChar;
diff --git a/src/version.h b/src/version.h
index ac66d1780..47b694c88 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b23"
+#define APP_VERSION "1.9.4b24"

From a5fedbf1ba923e4ed71d0a3152c8ddb73dece930 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Wed, 11 Dec 2019 10:14:23 +0100
Subject: [PATCH 120/120] redo websocket mem fix - #250 and #258

---
 platformio.ini |  3 ++-
 src/MyESP.cpp  | 31 +++++++++++++++----------------
 src/MyESP.h    |  8 +++++---
 src/version.h  |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 0dc5ab602..747006030 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -37,7 +37,8 @@ build_flags = ${common.general_flags} ${common.build_flags_4m1m}
 
 [env]
 framework = arduino
-platform = espressif8266@2.2.2 ; arduino core 2.5.2
+;platform = espressif8266@2.2.2 ; arduino core 2.5.2
+platform = espressif8266
 ;platform = https://github.com/platformio/platform-espressif8266#develop
 ;platform = https://github.com/platformio/platform-espressif8266#feature/stage
 lib_deps =
diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index a01222dc6..eba5cde68 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -1472,8 +1472,8 @@ void MyESP::_heartbeatCheck(bool force) {
         uint32_t free_memory   = ESP.getFreeHeap();
         uint8_t  mem_available = 100 * free_memory / total_memory; // as a %
 
-        StaticJsonDocument<200> doc;
-        JsonObject              rootHeartbeat = doc.to<JsonObject>();
+        StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+        JsonObject                                   rootHeartbeat = doc.to<JsonObject>();
 
         rootHeartbeat["version"]         = _app_version;
         rootHeartbeat["IP"]              = WiFi.localIP().toString();
@@ -2312,8 +2312,8 @@ void MyESP::_onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, A
 // handle ws from browser
 void MyESP::_procMsg(AsyncWebSocketClient * client, size_t sz) {
     // We should always get a JSON object from browser, so parse it
-    StaticJsonDocument<500> doc;
-    char                    json[sz + 1];
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_MEDIUM> doc;
+    char                                          json[sz + 1];
     memcpy(json, (char *)(client->_tempObject), sz);
     json[sz] = '\0';
 
@@ -2410,8 +2410,7 @@ bool MyESP::_fs_sendConfig() {
 
 // send custom status via ws
 void MyESP::_sendCustomStatus() {
-    // StaticJsonDocument<300> doc;
-    DynamicJsonDocument doc(MYESP_JSON_MAXSIZE);
+    DynamicJsonDocument doc(MYESP_JSON_MAXSIZE_LARGE);
 
     JsonObject root = doc.to<JsonObject>();
 
@@ -2427,7 +2426,7 @@ void MyESP::_sendCustomStatus() {
         (_web_callback_f)(root);
     }
 
-    char   buffer[MYESP_JSON_MAXSIZE];
+    char   buffer[MYESP_JSON_MAXSIZE_LARGE];
     size_t len = serializeJson(root, buffer);
 
 #ifdef MYESP_DEBUG
@@ -2536,9 +2535,9 @@ void MyESP::_printScanResult(int networksFound) {
         }
     }
 
-    StaticJsonDocument<400> doc;
-    JsonObject              root = doc.to<JsonObject>();
-    root["command"]              = "ssidlist";
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_MEDIUM> doc;
+    JsonObject                                    root = doc.to<JsonObject>();
+    root["command"]                                    = "ssidlist";
 
     JsonArray list = doc.createNestedArray("list");
     for (int i = 0; i <= 5 && i < networksFound; ++i) {
@@ -2548,7 +2547,7 @@ void MyESP::_printScanResult(int networksFound) {
         item["rssi"]    = WiFi.RSSI(indices[i]);
     }
 
-    char   buffer[400];
+    char   buffer[MYESP_JSON_MAXSIZE_MEDIUM];
     size_t len = serializeJson(root, buffer);
     _ws->textAll(buffer, len);
 }
@@ -2750,12 +2749,12 @@ void MyESP::_addMQTTLog(const char * topic, const char * payload, const MYESP_MQ
 
 // send UTC time via ws
 void MyESP::_sendTime() {
-    StaticJsonDocument<100> doc;
-    JsonObject              root = doc.to<JsonObject>();
-    root["command"]              = "gettime";
-    root["epoch"]                = now();
+    StaticJsonDocument<MYESP_JSON_MAXSIZE_SMALL> doc;
+    JsonObject                                   root = doc.to<JsonObject>();
+    root["command"]                                   = "gettime";
+    root["epoch"]                                     = now();
 
-    char   buffer[100];
+    char   buffer[MYESP_JSON_MAXSIZE_SMALL];
     size_t len = serializeJson(root, buffer);
     _ws->textAll(buffer, len);
 }
diff --git a/src/MyESP.h b/src/MyESP.h
index 899a35a96..b79bd64c6 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -103,9 +103,11 @@ extern struct rst_info resetInfo;
 #define MQTT_DISCONNECT_EVENT 1
 #define MQTT_MESSAGE_EVENT 2
 
-#define MYESP_JSON_MAXSIZE 2000    // for large Dynamic json files
-#define MYESP_MQTTLOG_MAX 60       // max number of log entries for MQTT publishes and subscribes
-#define MYESP_JSON_LOG_MAXSIZE 300 // max size of an JSON log entry
+#define MYESP_JSON_MAXSIZE_LARGE 2000 // for large Dynamic json files
+#define MYESP_JSON_MAXSIZE_MEDIUM 800 // for medium Dynamic json files
+#define MYESP_JSON_MAXSIZE_SMALL 200  // for smaller Static json documents
+
+#define MYESP_MQTTLOG_MAX 60 // max number of log entries for MQTT publishes and subscribes
 
 #define MYESP_MQTT_PAYLOAD_ON '1'  // for MQTT switch on
 #define MYESP_MQTT_PAYLOAD_OFF '0' // for MQTT switch off
diff --git a/src/version.h b/src/version.h
index 47b694c88..1e9e1751b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b24"
+#define APP_VERSION "1.9.4b25"