diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index 6ab77d975..6d75ae00e 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -180,8 +180,7 @@ export enum DeviceValueUOM { SQM, M3, L, - KxMIN, - KpMIN + KMIN } export const DeviceValueUOM_s = [ @@ -206,8 +205,7 @@ export const DeviceValueUOM_s = [ 'm²', 'm³', 'l', - 'K*min', - 'K/min' + 'K*min' ]; export enum AnalogType { diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 89cee7755..510d56988 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -579,14 +579,14 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const DeviceValueType::USHORT, DeviceValueNumOp::DV_NUMOP_MUL10, FL_(auxHeaterDelay), - DeviceValueUOM::KxMIN, + DeviceValueUOM::KMIN, MAKE_CF_CB(set_additionalHeaterDelay)); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &auxHeaterHyst_, DeviceValueType::USHORT, DeviceValueNumOp::DV_NUMOP_MUL5, FL_(auxHeaterHyst), - DeviceValueUOM::KpMIN, + DeviceValueUOM::KMIN, MAKE_CF_CB(set_additionalHeaterHyst)); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &minTempSilent_, diff --git a/src/emsdevicevalue.cpp b/src/emsdevicevalue.cpp index 43ba1014c..dde0ecbbf 100644 --- a/src/emsdevicevalue.cpp +++ b/src/emsdevicevalue.cpp @@ -105,9 +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_l), F_(uom_kxmin), F_(uom_kpmin), 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 4b03f879e..9c0a28730 100644 --- a/src/emsdevicevalue.h +++ b/src/emsdevicevalue.h @@ -68,8 +68,7 @@ class DeviceValue { SQM, // 18 square meter M3, // 19 cubic meter L, // 20 - KxMIN, // 21 - Kelvin * minutes - KpMIN, // 22 - Kelvin / minutes + KMIN, // 21 - Kelvin * minutes CONNECTIVITY // 22 - used in HA }; diff --git a/src/locale_common.h b/src/locale_common.h index 7b7f2e900..0047d920a 100644 --- a/src/locale_common.h +++ b/src/locale_common.h @@ -215,8 +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_kxmin, "K*min") -MAKE_PSTR(uom_kpmin, "K/min") +MAKE_PSTR(uom_kmin, "K*min") // MQTT topics and prefixes MAKE_PSTR(heating_active, "heating_active") diff --git a/src/locale_translations.h b/src/locale_translations.h index 499da8e3c..fca4abe45 100644 --- a/src/locale_translations.h +++ b/src/locale_translations.h @@ -368,10 +368,11 @@ MAKE_PSTR_LIST(maxHeatComp, "maxheatcomp", "heat limit compressor", "Heizgrenze MAKE_PSTR_LIST(maxHeatHeat, "maxheatheat", "heat limit heating", "Heizgrenze Heizen", "heat limit heating", "heat limit heating", "limit ciepła dla ogrzewania", "maks varmegrense oppvarming", "limite chaleur chauffage") MAKE_PSTR_LIST(maxHeatDhw, "maxheatdhw", "heat limit dhw", "Heizgrenze Warmwasser", "heat limit dhw", "heat limit dhw", "limit ciepła dla c.w.u.", "varmegrense varmtvann", "limite chaleur ecs") +// translations are in order en, de, nl, se, pl, no, fr, .... some missing MAKE_PSTR_LIST(auxHeater, "auxheater", "enable auxilliary heater", "Erlaube Zusatzheizer") MAKE_PSTR_LIST(auxHeaterOnly, "auxheateronly", "auxilliary heater only", "nur Zusatzheizer") -MAKE_PSTR_LIST(auxHeaterDelay, "auxheaterdelay", "auxilliary heater on delay", "Zusatzheizer Einschaltverzögerung") -MAKE_PSTR_LIST(auxHeaterHyst, "auxheaterhyst", "auxilliary heater on/off hyst", "Zusatzheizer Schalthysterese") +MAKE_PSTR_LIST(auxHeaterDelay, "auxheaterdelay", "auxilliary heater on delay", "Zusatzheizer verzögert ein", "Bijverw. vertraagd aan", "Tillskottfördröjning på", "Opóźn. włączenie dogrz.", "Tilleggsvarmer forsinket på", "Chauff app tempo marche") +MAKE_PSTR_LIST(auxHeaterHyst, "auxheaterhyst", "auxilliary heater on/off hyst", "Zusatzheizer Schalthysterese", "Aan/uit-hysteresis in verw. bedrijf instellen", "På/av-hystereses Husv.", "Histerez wł/wył Ogrzew.", "På/av-hysterese Oppvar.", "Hystérésis Marche en mode chauffage") MAKE_PSTR_LIST(minTempSilent, "mintempsilent", "min. outside temp. for silent mode", "Minimale Aussentemperatur Silentmodus") MAKE_PSTR_LIST(tempParMode, "tempparmode", "outside temp. parallel mode", "Aussentemperatur Parallelmodus") MAKE_PSTR_LIST(auxHeatMixValve, "auxheatmix", "aux. heater mixing valve", "Mischer Zusatzheizer")