From d62d33bc4d051624f7113adf6cc8da35ec6cfb37 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 18 Oct 2019 18:06:17 +0200
Subject: [PATCH] Fix display hPa and mmHg

Fix display hPa and mmHg (#2642)
---
 sonoff/xdrv_13_display.ino | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/sonoff/xdrv_13_display.ino b/sonoff/xdrv_13_display.ino
index 3a144b6c9..9aa17139f 100755
--- a/sonoff/xdrv_13_display.ino
+++ b/sonoff/xdrv_13_display.ino
@@ -111,6 +111,7 @@ uint8_t dsp_on;
 char **disp_log_buffer;
 char **disp_screen_buffer;
 char disp_temp[2];    // C or F
+char disp_pres[5];   // hPa or mmHg
 
 uint8_t disp_log_buffer_cols = 0;
 uint8_t disp_log_buffer_idx = 0;
@@ -995,6 +996,7 @@ void DisplayLogBufferInit(void)
     disp_refresh = Settings.display_refresh;
 
     snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%c"), TempUnit());
+    snprintf_P(disp_pres, sizeof(disp_pres), PressureUnit().c_str());
 
     DisplayReAllocLogBuffer();
 
@@ -1079,7 +1081,7 @@ void DisplayJsonValue(const char* topic, const char* device, const char* mkey, c
     snprintf_P(svalue, sizeof(svalue), PSTR("%s%%"), value);
   }
   else if ((quantity_code >= JSON_PRESSURE) && (quantity_code <= JSON_PRESSUREATSEALEVEL)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_PRESSURE), value);
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s"), value, disp_pres);
   }
   else if (JSON_ILLUMINANCE == quantity_code) {
     snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_LUX), value);
@@ -1130,7 +1132,6 @@ void DisplayAnalyzeJson(char *topic, char *json)
 // tele/wemos5/SENSOR {"Time":"2017-09-20T11:53:53","SHT1X":{"Temperature":20.1,"Humidity":58.9},"HTU21":{"Temperature":20.7,"Humidity":58.5},"BMP280":{"Temperature":21.6,"Pressure":1020.3},"TempUnit":"C"}
 // tele/th1/SENSOR    {"Time":"2017-09-20T11:54:48","DS18B20":{"Temperature":49.7},"TempUnit":"C"}
 
-  const char *tempunit;
 
 //  char jsonStr[MESSZ];
 //  strlcpy(jsonStr, json, sizeof(jsonStr));  // Save original before destruction by JsonObject
@@ -1140,10 +1141,14 @@ void DisplayAnalyzeJson(char *topic, char *json)
   JsonObject &root = jsonBuf.parseObject(jsonStr);
   if (root.success()) {
 
-    tempunit = root[D_JSON_TEMPERATURE_UNIT];
-    if (tempunit) {
-      snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%s"), tempunit);
-//      AddLog_P2(LOG_LEVEL_DEBUG, disp_temp);
+    const char *unit;
+    unit = root[D_JSON_TEMPERATURE_UNIT];
+    if (unit) {
+      snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%s"), unit);  // C or F
+    }
+    unit = root[D_JSON_PRESSURE_UNIT];
+    if (unit) {
+      snprintf_P(disp_pres, sizeof(disp_pres), PSTR("%s"), unit);  // hPa or mmHg
     }
 
     for (JsonObject::iterator it = root.begin(); it != root.end(); ++it) {