From 3d66c5897a1d88c520c87d30ded80dda178cd260 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 6 Jul 2019 16:13:56 +0200
Subject: [PATCH] https://github.com/proddy/EMS-ESP/issues/146

---
 lib/MyESP/MyESP.cpp | 4 +---
 src/ems-esp.cpp     | 4 ++--
 src/version.h       | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/MyESP/MyESP.cpp b/lib/MyESP/MyESP.cpp
index 5e69316f5..f36384a7d 100644
--- a/lib/MyESP/MyESP.cpp
+++ b/lib/MyESP/MyESP.cpp
@@ -503,7 +503,6 @@ void MyESP::_ota_setup() {
         _deferredReset(500, CUSTOM_RESET_OTA);
     });
 
-    /* 
     ArduinoOTA.onProgress([this](unsigned int progress, unsigned int total) {
         static unsigned int _progOld;
         unsigned int        _prog = (progress / (total / 100));
@@ -512,8 +511,7 @@ void MyESP::_ota_setup() {
             _progOld = _prog;
         }
     });
-    */
-
+  
     ArduinoOTA.onError([this](ota_error_t error) {
         if (error == OTA_AUTH_ERROR)
             myDebug_P(PSTR("[OTA] Auth Failed"));
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index c839ae14f..18b3c9bd2 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -178,7 +178,7 @@ char * _bool_to_char(char * s, uint8_t value) {
 // negative values are assumed stored as 1-compliment (https://medium.com/@LeeJulija/how-integers-are-stored-in-memory-using-twos-complement-5ba04d61a56c)
 char * _short_to_char(char * s, int16_t value, uint8_t decimals = 1) {
     // remove errors or invalid values
-    if (value == EMS_VALUE_SHORT_NOTSET) {
+    if ((value == EMS_VALUE_SHORT_NOTSET) || (value == 0x8000)) {
         strlcpy(s, "?", 10);
         return (s);
     }
@@ -216,7 +216,7 @@ char * _short_to_char(char * s, int16_t value, uint8_t decimals = 1) {
 // decimals: 0 = no division, 1=divide value by 10, 2=divide by 2, 10=divide value by 100
 char * _ushort_to_char(char * s, uint16_t value, uint8_t decimals = 1) {
     // remove errors or invalid values
-    if (value == EMS_VALUE_USHORT_NOTSET) {
+    if ((value == EMS_VALUE_USHORT_NOTSET) || (value == 0x8000)) {
         strlcpy(s, "?", 10);
         return (s);
     }
diff --git a/src/version.h b/src/version.h
index 5e6f58bb3..6eb8a81cf 100644
--- a/src/version.h
+++ b/src/version.h
@@ -6,5 +6,5 @@
 #pragma once
 
 #define APP_NAME "EMS-ESP"
-#define APP_VERSION "1.8.1b12"
+#define APP_VERSION "1.8.1b13"
 #define APP_HOSTNAME "ems-esp"