andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 08:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

UOMs

Browse Source
This commit is contained in:
MichaelDvP
2022-12-14 15:53:40 +01:00
parent 4cdd5e9f20
commit c3eb553425
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/src/project/types.ts
View File

@@ -179,7 +179,8 @@ export enum DeviceValueUOM {
MV, MV,
SQM, SQM,
M3, M3,
L L,
K_MIN
} }
export const DeviceValueUOM_s = [ export const DeviceValueUOM_s = [
@@ -203,7 +204,8 @@ export const DeviceValueUOM_s = [
'mV', 'mV',
'm²', 'm²',
'm³', 'm³',
'l' 'l',
'K*min'
]; ];
export enum AnalogType { export enum AnalogType {

4
src/devices/boiler.cpp
View File

@@ -572,13 +572,13 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
&addHeaterDelay_, &addHeaterDelay_,
DeviceValueType::USHORT, DeviceValueType::USHORT,
FL_(addHeaterDelay), FL_(addHeaterDelay),
DeviceValueUOM::NONE, DeviceValueUOM::K_MIN,
MAKE_CF_CB(set_additionalHeaterDelay)); MAKE_CF_CB(set_additionalHeaterDelay));
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&minTempSilent_, &minTempSilent_,
DeviceValueType::INT, DeviceValueType::INT,
FL_(minTempSilent), FL_(minTempSilent),
DeviceValueUOM::NONE, DeviceValueUOM::DEGREES,
MAKE_CF_CB(set_minTempSilent)); MAKE_CF_CB(set_minTempSilent));
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&tempParMode_, &tempParMode_,

7
src/emsdevicevalue.cpp
View File

@@ -105,10 +105,9 @@ DeviceValue::DeviceValue(uint8_t device_type,
// must be an int of 4 bytes, 32bit aligned // must be an int of 4 bytes, 32bit aligned
const char * DeviceValue::DeviceValueUOM_s[] = { 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), 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_(hours)[0], FL_(minutes)[0], F_(uom_ua), F_(uom_bar), F_(uom_kw), F_(uom_w), F_(uom_kb), FL_(minutes)[0], F_(uom_ua), F_(uom_bar), F_(uom_kw), F_(uom_w), F_(uom_kb), FL_(seconds)[0], F_(uom_dbm),
FL_(seconds)[0], F_(uom_dbm), F_(uom_fahrenheit), F_(uom_mv), F_(uom_sqm), F_(uom_m3), F_(uom_fahrenheit), F_(uom_mv), F_(uom_sqm), F_(uom_m3), F_(uom_l), F_(uom_kmin), F_(uom_blank) // connectivity
F_(uom_blank) // connectivity
}; };

3
src/emsdevicevalue.h
View File

@@ -68,7 +68,8 @@ class DeviceValue {
SQM, // 18 square meter SQM, // 18 square meter
M3, // 19 cubic meter M3, // 19 cubic meter
L, // 20 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 // TAG mapping - maps to DeviceValueTAG_s in emsdevice.cpp

1
src/locale_common.h
View File

@@ -215,6 +215,7 @@ MAKE_PSTR(uom_mv, "mV")
MAKE_PSTR(uom_sqm, "m²") MAKE_PSTR(uom_sqm, "m²")
MAKE_PSTR(uom_m3, "m³") MAKE_PSTR(uom_m3, "m³")
MAKE_PSTR(uom_l, "l") MAKE_PSTR(uom_l, "l")
MAKE_PSTR(uom_kmin, "K*min")
// MQTT topics and prefixes // MQTT topics and prefixes
MAKE_PSTR(heating_active, "heating_active") MAKE_PSTR(heating_active, "heating_active")