From c3eb55342520a92561765f9d52fc6383f7c7d4a7 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Wed, 14 Dec 2022 15:53:40 +0100
Subject: [PATCH] UOMs

---
 interface/src/project/types.ts | 6 ++++--
 src/devices/boiler.cpp         | 4 ++--
 src/emsdevicevalue.cpp         | 7 +++----
 src/emsdevicevalue.h           | 3 ++-
 src/locale_common.h            | 1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
index c4a83c384..8f897b307 100644
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -179,7 +179,8 @@ export enum DeviceValueUOM {
   MV,
   SQM,
   M3,
-  L
+  L,
+  K_MIN
 }
 
 export const DeviceValueUOM_s = [
@@ -203,7 +204,8 @@ export const DeviceValueUOM_s = [
   'mV',
   'm²',
   'm³',
-  'l'
+  'l',
+  'K*min'
 ];
 
 export enum AnalogType {
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 51a506a56..c36059e37 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -572,13 +572,13 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
                               &addHeaterDelay_,
                               DeviceValueType::USHORT,
                               FL_(addHeaterDelay),
-                              DeviceValueUOM::NONE,
+                              DeviceValueUOM::K_MIN,
                               MAKE_CF_CB(set_additionalHeaterDelay));
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
                               &minTempSilent_,
                               DeviceValueType::INT,
                               FL_(minTempSilent),
-                              DeviceValueUOM::NONE,
+                              DeviceValueUOM::DEGREES,
                               MAKE_CF_CB(set_minTempSilent));
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
                               &tempParMode_,
diff --git a/src/emsdevicevalue.cpp b/src/emsdevicevalue.cpp
index 20e4d463a..dde0ecbbf 100644
--- a/src/emsdevicevalue.cpp
+++ b/src/emsdevicevalue.cpp
@@ -105,10 +105,9 @@ DeviceValue::DeviceValue(uint8_t               device_type,
 // must be an int of 4 bytes, 32bit aligned
 const char * DeviceValue::DeviceValueUOM_s[] = {
 
-    F_(uom_blank),   F_(uom_degrees), F_(uom_degrees),    F_(uom_percent), F_(uom_lmin), F_(uom_kwh), F_(uom_wh),
-    FL_(hours)[0],   FL_(minutes)[0], F_(uom_ua),         F_(uom_bar),     F_(uom_kw),   F_(uom_w),   F_(uom_kb),
-    FL_(seconds)[0], F_(uom_dbm),     F_(uom_fahrenheit), F_(uom_mv),      F_(uom_sqm),  F_(uom_m3),
-    F_(uom_blank) // connectivity
+    F_(uom_blank),      F_(uom_degrees), F_(uom_degrees), F_(uom_percent), F_(uom_lmin), F_(uom_kwh),  F_(uom_wh),      FL_(hours)[0],
+    FL_(minutes)[0],    F_(uom_ua),      F_(uom_bar),     F_(uom_kw),      F_(uom_w),    F_(uom_kb),   FL_(seconds)[0], F_(uom_dbm),
+    F_(uom_fahrenheit), F_(uom_mv),      F_(uom_sqm),     F_(uom_m3),      F_(uom_l),    F_(uom_kmin), F_(uom_blank) // connectivity
 
 };
 
diff --git a/src/emsdevicevalue.h b/src/emsdevicevalue.h
index 638f7b714..294f5241a 100644
--- a/src/emsdevicevalue.h
+++ b/src/emsdevicevalue.h
@@ -68,7 +68,8 @@ class DeviceValue {
         SQM,         // 18 square meter
         M3,          // 19 cubic meter
         L,           // 20
-        CONNECTIVITY // 21 - used in HA
+        K_MIN,       // 21 - Kelvin * minutes
+        CONNECTIVITY // 22 - used in HA
     };
 
     // TAG mapping - maps to DeviceValueTAG_s in emsdevice.cpp
diff --git a/src/locale_common.h b/src/locale_common.h
index fdc4b59fa..0047d920a 100644
--- a/src/locale_common.h
+++ b/src/locale_common.h
@@ -215,6 +215,7 @@ MAKE_PSTR(uom_mv, "mV")
 MAKE_PSTR(uom_sqm, "m²")
 MAKE_PSTR(uom_m3, "m³")
 MAKE_PSTR(uom_l, "l")
+MAKE_PSTR(uom_kmin, "K*min")
 
 // MQTT topics and prefixes
 MAKE_PSTR(heating_active, "heating_active")