diff --git a/interface/src/framework/system/SystemStatusForm.tsx b/interface/src/framework/system/SystemStatusForm.tsx index 4952072f8..9bdd4a4c0 100644 --- a/interface/src/framework/system/SystemStatusForm.tsx +++ b/interface/src/framework/system/SystemStatusForm.tsx @@ -124,18 +124,18 @@ const SystemStatusForm: FC = () => { const renderVersionDialog = () => { return ( setShowingVersion(false)}> - {LL.VERSION_CHECK()} + {LL.VERSION_CHECK(1)} {latestVersion && ( - {LL.THE_LATEST()} official {LL.VERSION_IS()} {latestVersion.version} ( + {LL.THE_LATEST()} {LL.OFFICIAL()} {LL.VERSION_IS()} {latestVersion.version} ( - {'release notes'} + {LL.RELEASE_NOTES()} ) ( - {'download'} + {LL.DOWNLOAD()} ) @@ -143,14 +143,14 @@ const SystemStatusForm: FC = () => { {latestDevVersion && ( - {LL.THE_LATEST()} development {LL.VERSION_IS()} {latestDevVersion.version} + {LL.THE_LATEST()} {LL.DEVELOPMENT()} {LL.VERSION_IS()} {latestDevVersion.version}  ( - {'release notes'} + {LL.RELEASE_NOTES()} ) ( - {'download'} + {LL.DOWNLOAD()} ) @@ -232,7 +232,7 @@ const SystemStatusForm: FC = () => { {latestVersion && ( )} diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index 76247ae22..c826eb89a 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -175,7 +175,10 @@ const de: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Sind Sie sicher alle Einstellungen auf Werkseinstellung zu setzen?', VERSION_CHECK: 'Versionsprüfung', THE_LATEST: 'Die neueste', + OFFICIAL: 'official', + DEVELOPMENT: 'development', VERSION_IS: 'Version ist', + RELEASE_NOTES: 'Versionshinweise', PLATFORM: 'Platform (Platform / SDK)', UPTIME: 'System Betriebszeit', CPU_FREQ: 'CPU Frequenz', diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts index ee08e4363..32577a3d1 100644 --- a/interface/src/i18n/en/index.ts +++ b/interface/src/i18n/en/index.ts @@ -176,7 +176,10 @@ const en: BaseTranslation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Are you sure you want to reset the device to its factory defaults?', VERSION_CHECK: 'Version Check', THE_LATEST: 'The latest', + OFFICIAL: 'official', + DEVELOPMENT: 'development', VERSION_IS: 'version is', + RELEASE_NOTES: 'release notes', PLATFORM: 'Device (Platform / SDK)', UPTIME: 'System Uptime', CPU_FREQ: 'CPU Frequency', diff --git a/interface/src/i18n/i18n-types.ts b/interface/src/i18n/i18n-types.ts index 3100b6a1a..bc2fe384c 100644 --- a/interface/src/i18n/i18n-types.ts +++ b/interface/src/i18n/i18n-types.ts @@ -701,10 +701,22 @@ type RootTranslation = { * T​h​e​ ​l​a​t​e​s​t */ THE_LATEST: string + /** + * o​f​f​i​c​i​a​l + */ + OFFICIAL: string + /** + * d​e​v​e​l​o​p​m​e​n​t + */ + DEVELOPMENT: string /** * v​e​r​s​i​o​n​ ​i​s */ VERSION_IS: string + /** + * r​e​l​e​a​s​e​ ​n​o​t​e​s + */ + RELEASE_NOTES: string /** * D​e​v​i​c​e​ ​(​P​l​a​t​f​o​r​m​ ​/​ ​S​D​K​) */ @@ -1717,15 +1729,27 @@ export type TranslationFunctions = { /** * Version Check */ - VERSION_CHECK: () => LocalizedString + VERSION_CHECK: (arg0: string | number | boolean) => LocalizedString /** * The latest */ THE_LATEST: () => LocalizedString + /** + * official + */ + OFFICIAL: () => LocalizedString + /** + * development + */ + DEVELOPMENT: () => LocalizedString /** * version is */ VERSION_IS: () => LocalizedString + /** + * release notes + */ + RELEASE_NOTES: () => LocalizedString /** * Device (Platform / SDK) */ diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts index 53e8af17e..9edd8574d 100644 --- a/interface/src/i18n/nl/index.ts +++ b/interface/src/i18n/nl/index.ts @@ -174,7 +174,10 @@ const nl: BaseTranslation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Weet je zeker dat je een reset naar fabrieksinstellingen uit wilt voeren?', VERSION_CHECK: 'Versie Check', THE_LATEST: 'De laatste', + OFFICIAL: 'official', + DEVELOPMENT: 'development', VERSION_IS: 'versie is', + RELEASE_NOTES: 'release notes', PLATFORM: 'Apparaat (Platform / SDK)', UPTIME: 'Systeem Uptime', CPU_FREQ: 'CPU Frequency', diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts index 212274730..6d9be321a 100644 --- a/interface/src/i18n/no/index.ts +++ b/interface/src/i18n/no/index.ts @@ -175,7 +175,10 @@ const no: BaseTranslation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Er du sikker på at du vil resette enheten til fabrikkinstillinger?', VERSION_CHECK: 'Versjonsjekk', THE_LATEST: 'Den nyeste', + OFFICIAL: 'official', + DEVELOPMENT: 'development', VERSION_IS: 'versjonen er', + RELEASE_NOTES: 'release notes', PLATFORM: 'Enhet (Platform / SDK)', UPTIME: 'System Oppetid', CPU_FREQ: 'CPU Frekvens', diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts index 65789dbb2..656ad63a6 100644 --- a/interface/src/i18n/pl/index.ts +++ b/interface/src/i18n/pl/index.ts @@ -13,15 +13,15 @@ const pl: BaseTranslation = { SETTINGS: 'Ustawienia', SAVED: 'zapisano', HELP: 'Pomoc', - LOGGED_IN: 'Zalogowany jako', + LOGGED_IN: 'Zalogowany jako {name}', PLEASE_SIGNIN: 'Zaloguj się aby kontynuować.', UPLOAD_SUCCESSFUL: 'Wysyłanie zakończone.', DOWNLOAD_SUCCESSFUL: 'Pobieranie zakończone.', INVALID_LOGIN: 'Niepoprawny login', NETWORK: 'Sieć', SECURITY: 'Bezpieczeństwo', - ONOFF_CAP: 'WŁ/WYŁ', - ONOFF: 'wł/wył', + ONOFF_CAP: 'wł./wył.', + ONOFF: 'włączono/wyłączono', TYPE: 'Typ', DESCRIPTION: 'Opis', ENTITIES: 'Encje', @@ -58,7 +58,7 @@ const pl: BaseTranslation = { WARN_GPIO: 'Uwaga! Bądź ostrożny przypisując GPIO do czujnika!', EDIT: 'Edycja', TEMP_SENSOR: 'czujnika temperatury', - TEMP_SENSORS: 'Czujniki temperatury', + TEMP_SENSORS: 'Czujniki temperatury 1-Wire®', WRITE_COMMAND: 'Wyślij komendę {cmd}', EMS_BUS_WARNING: 'Brak połączenia z magistralą EMS. Jeśli ten błąd występuje dłużej niż kilka sekund, sprawdź ustawienia oraz profil płytki interfejsu.', @@ -99,7 +99,7 @@ const pl: BaseTranslation = { BOARD_PROFILE_TEXT: 'Wybierz z listy wstępną konfigurację płytki interfejsu lub stwórz własną konfigurację.', BOARD_PROFILE: 'Profil płytki', BUTTON: 'Przycisk', - TEMPERATURE: 'Temperatura', + TEMPERATURE: '1-Wire®', DISABLED: 'wyłączony', GENERAL_OPTIONS: 'Opcje podstawowe', LANGUAGE_ENTITIES: 'Język encji', @@ -118,8 +118,8 @@ const pl: BaseTranslation = { BOOLEAN_FORMAT_DASHBOARD: 'Format wartości binarnych dla pulpitu', BOOLEAN_FORMAT_API: 'Format wartości binarnych dla API/MQTT', ENUM_FORMAT: 'Format wartości numerowanych dla API/MQTT', - INDEX: 'indeks', - ENABLE_PARASITE: 'Aktywuj zasilanie pasożytnicze dla czujników temperatury 1-Wire®', + INDEX: 'Indeks', + ENABLE_PARASITE: 'Aktywuj zasilanie pasożytnicze', LOGGING: 'Logowanie', LOG_HEX: 'Loguj telegramy EMS w systemie szesnastkowym (hex)', ENABLE_SYSLOG: 'Aktywuj syslog', @@ -173,9 +173,12 @@ const pl: BaseTranslation = { FACTORY_RESET: 'Ustawienia fabryczne', SYSTEM_FACTORY_TEXT: 'Interfejs EMS-ESP został przywrócony do ustawień fabrycznych i zostanie teraz ponownie uruchomiony.', SYSTEM_FACTORY_TEXT_DIALOG: 'Czy jesteś pewien, że chcesz przywrócić ustawienia fabryczne interfejsu EMS-ESP? ', - VERSION_CHECK: 'Aktualizacja firmware\'u', - THE_LATEST: 'Ostatnia wersja', - VERSION_IS: 'to', + VERSION_CHECK: '{{Sprawdź wersję (main translation idx=0)|Sprawdzanie wersji (alt translation idx=1)|not used (translation idx=other)}}', + THE_LATEST: 'Najnowsza', + OFFICIAL: 'oficjalna', + DEVELOPMENT: 'testowa', + VERSION_IS: 'wersja to', + RELEASE_NOTES: 'lista zmian', PLATFORM: 'Urządzenie (platforma / SDK)', UPTIME: 'Czas działania systemu', CPU_FREQ: 'Taktowanie CPU', diff --git a/interface/src/i18n/se/index.ts b/interface/src/i18n/se/index.ts index 26f16d752..0d519fd1a 100644 --- a/interface/src/i18n/se/index.ts +++ b/interface/src/i18n/se/index.ts @@ -174,6 +174,10 @@ const se: BaseTranslation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Är du säker att du vill fabriksåterställa enheten?', VERSION_CHECK: 'Kontrollera version', THE_LATEST: 'Den senaste', + OFFICIAL: 'official', + DEVELOPMENT: 'development', + /**VERSION_IS: 'version is',*/ + RELEASE_NOTES: 'release notes', PLATFORM: 'Enhet (Plattform / SDK)', UPTIME: 'Systemets Uptid', CPU_FREQ: 'CPU-frekvens', diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 4461c852f..c20c40a6e 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -726,7 +726,7 @@ void Boiler::check_active(const bool force) { val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF; if (heatingActive_ != val || force) { heatingActive_ = val; - char s[7]; + char s[12]; Mqtt::publish(F_(heating_active), Helpers::render_boolean(s, b)); } @@ -750,7 +750,7 @@ void Boiler::check_active(const bool force) { val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF; if (tapwaterActive_ != val || force) { tapwaterActive_ = val; - char s[7]; + char s[12]; Mqtt::publish(F_(tapwater_active), Helpers::render_boolean(s, b)); EMSESP::tap_water_active(b); // let EMS-ESP know, used in the Shower class } diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index fd6b32e39..c0cd2c67e 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -769,7 +769,7 @@ void EMSdevice::generate_values_web(JsonObject & output) { // handle Booleans (true, false), use strings, no native true/false) if (dv.type == DeviceValueType::BOOL) { auto value_b = (bool)*(uint8_t *)(dv.value_p); - char s[7]; + char s[12]; obj["v"] = Helpers::render_boolean(s, value_b, true); } @@ -837,7 +837,7 @@ void EMSdevice::generate_values_web(JsonObject & output) { } } else if (dv.type == DeviceValueType::BOOL) { JsonArray l = obj.createNestedArray("l"); - char result[10]; + char result[12]; l.add(Helpers::render_boolean(result, false, true)); l.add(Helpers::render_boolean(result, true, true)); } @@ -882,7 +882,7 @@ void EMSdevice::generate_values_web_customization(JsonArray & output) { // handle Booleans (true, false), use strings, no native true/false) if (dv.type == DeviceValueType::BOOL) { auto value_b = (bool)*(uint8_t *)(dv.value_p); - char s[7]; + char s[12]; obj["v"] = Helpers::render_boolean(s, value_b, true); } @@ -1152,7 +1152,7 @@ bool EMSdevice::get_value_info(JsonObject & output, const char * cmd, const int8 } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) { json[value] = value_b ? 1 : 0; } else { - char s[7]; + char s[12]; json[value] = Helpers::render_boolean(s, value_b); } } @@ -1306,17 +1306,17 @@ bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, c // see how to render the value depending on the setting auto value_b = (bool)*(uint8_t *)(dv.value_p); if (Mqtt::ha_enabled() && (output_target == OUTPUT_TARGET::MQTT)) { - char s[7]; + char s[12]; json[name] = Helpers::render_boolean(s, value_b); // for HA always render as string } else if (output_target == OUTPUT_TARGET::CONSOLE) { - char s[7]; + char s[12]; json[name] = Helpers::render_boolean(s, value_b, true); // console use web settings } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) { json[name] = value_b; } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) { json[name] = value_b ? 1 : 0; } else { - char s[7]; + char s[12]; json[name] = Helpers::render_boolean(s, value_b); } } diff --git a/src/helpers.cpp b/src/helpers.cpp index ce2ea6eb3..72b66a418 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -179,9 +179,9 @@ char * Helpers::render_boolean(char * result, const bool value, const bool dashb uint8_t bool_format_ = dashboard ? EMSESP::system_.bool_dashboard() : EMSESP::system_.bool_format(); if (bool_format_ == BOOL_FORMAT_ONOFF_STR) { - strlcpy(result, value ? translated_word(FL_(on)) : translated_word(FL_(off)), 5); + strlcpy(result, value ? translated_word(FL_(on)) : translated_word(FL_(off)), 12); } else if (bool_format_ == BOOL_FORMAT_ONOFF_STR_CAP) { - strlcpy(result, value ? translated_word(FL_(ON)) : translated_word(FL_(OFF)), 5); + strlcpy(result, value ? translated_word(FL_(ON)) : translated_word(FL_(OFF)), 12); } else if ((bool_format_ == BOOL_FORMAT_10) || (bool_format_ == BOOL_FORMAT_10_STR)) { strlcpy(result, value ? "1" : "0", 2); } else { diff --git a/src/locale_translations.h b/src/locale_translations.h index 4c10dc98b..ea28059cb 100644 --- a/src/locale_translations.h +++ b/src/locale_translations.h @@ -53,17 +53,17 @@ MAKE_PSTR_LIST(test_cmd, "run a test") // mqtt tags must not have spaces MAKE_PSTR_LIST(tag_none, "") MAKE_PSTR_LIST(tag_heartbeat, "") -MAKE_PSTR_LIST(tag_boiler_data_ww, "dhw", "WW") +MAKE_PSTR_LIST(tag_boiler_data_ww, "dhw", "WW", "dhw", "dhw", "CWU") MAKE_PSTR_LIST(tag_device_data, "") -MAKE_PSTR_LIST(tag_device_data_ww, "dhw", "WW") -MAKE_PSTR_LIST(tag_hc1, "hc1", "HK1") -MAKE_PSTR_LIST(tag_hc2, "hc2", "HK2") -MAKE_PSTR_LIST(tag_hc3, "hc3", "HK3") -MAKE_PSTR_LIST(tag_hc4, "hc4", "HK4") -MAKE_PSTR_LIST(tag_hc5, "hc5", "HK5") -MAKE_PSTR_LIST(tag_hc6, "hc6", "HK6") -MAKE_PSTR_LIST(tag_hc7, "hc7", "HK7") -MAKE_PSTR_LIST(tag_hc8, "hc8", "HK8") +MAKE_PSTR_LIST(tag_device_data_ww, "dhw", "WW", "dhw", "dhw", "CWU") +MAKE_PSTR_LIST(tag_hc1, "hc1", "HK1", "hc1", "hc1", "OG1") +MAKE_PSTR_LIST(tag_hc2, "hc2", "HK2", "hc2", "hc2", "OG2") +MAKE_PSTR_LIST(tag_hc3, "hc3", "HK3", "hc3", "hc3", "OG3") +MAKE_PSTR_LIST(tag_hc4, "hc4", "HK4", "hc4", "hc4", "OG4") +MAKE_PSTR_LIST(tag_hc5, "hc5", "HK5", "hc5", "hc5", "OG5") +MAKE_PSTR_LIST(tag_hc6, "hc6", "HK6", "hc6", "hc6", "OG6") +MAKE_PSTR_LIST(tag_hc7, "hc7", "HK7", "hc7", "hc7", "OG7") +MAKE_PSTR_LIST(tag_hc8, "hc8", "HK8", "hc8", "hc8", "OG8") MAKE_PSTR_LIST(tag_wwc1, "wwc1", "WWK1") MAKE_PSTR_LIST(tag_wwc2, "wwc2", "WWK2") MAKE_PSTR_LIST(tag_wwc3, "wwc3", "WWK3") @@ -93,10 +93,10 @@ MAKE_PSTR_LIST(tag_hs15, "hs15") MAKE_PSTR_LIST(tag_hs16, "hs16") // General -MAKE_PSTR_LIST(on, "on", "an", "aan", "på", "wł.") -MAKE_PSTR_LIST(off, "off", "aus", "uit", "av", "wyl.") -MAKE_PSTR_LIST(ON, "ON", "AN", "AAN", "PÅ", "WL.") -MAKE_PSTR_LIST(OFF, "OFF", "AUS", "UIT", "AV", "WYL.") +MAKE_PSTR_LIST(on, "on", "an", "aan", "på", "włączono") +MAKE_PSTR_LIST(off, "off", "aus", "uit", "av", "wyłączono") +MAKE_PSTR_LIST(ON, "ON", "AN", "AAN", "PÅ", "wł.") +MAKE_PSTR_LIST(OFF, "OFF", "AUS", "UIT", "AV", "wył.") // Unit Of Measurement mapping - maps to DeviceValueUOM_s in emsdevice.cpp // uom - also used with HA see https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L384 @@ -180,7 +180,7 @@ MAKE_PSTR_LIST(perm, "perm. reduced", "perm. reduziert") // thermostat MAKE_PSTR_LIST(seltemp, "selTemp", "Solltemperatur", "Doeltemperatuur", "Börtemperatur", "temperatura zadana") -MAKE_PSTR_LIST(roomtemp, "roomTemp", "Raumtemperatur", "Kamertemperatuur", "Rumstemperatur", "temperatura w pomieszczeniu") +MAKE_PSTR_LIST(roomtemp, "roomTemp", "Raumtemperatur", "Kamertemperatuur", "Rumstemperatur", "temperatura pomieszczenia") MAKE_PSTR_LIST(own_prog, "own prog", "Eigenprog.", "Eigen prog.", "Egen prog.", "program własny") MAKE_PSTR_LIST(std_prog, "std prog", "Standardprog.", "Standaard prog.", "Standardprog.", "program standardowy") MAKE_PSTR_LIST(light, "light", "Leicht", "Licht", "Lätt", "lekki") @@ -192,7 +192,7 @@ MAKE_PSTR_LIST(hold, "hold", "Halten", "Pauzeren", "Paus", "pauza") MAKE_PSTR_LIST(cool, "cool", "Kühlen", "Koelen", "Kyla", "zimno") MAKE_PSTR_LIST(end, "end", "Ende", "Einde", "Slut", "koniec") MAKE_PSTR_LIST(german, "german", "Deutsch", "Duits", "Tyska", "niemiecki") -MAKE_PSTR_LIST(dutch, "dutch", "Niederländisch", "Nederlands", "Nederländska", "holenderski") +MAKE_PSTR_LIST(dutch, "dutch", "Niederländisch", "Nederlands", "Nederländska", "niderlandzki") MAKE_PSTR_LIST(french, "french", "Französisch", "Frans", "Franska", "francuski") MAKE_PSTR_LIST(italian, "italian", "Italienisch", "Italiaans", "Italienska", "włoski") MAKE_PSTR_LIST(high, "high", "hoch", "hoog", "Hög", "wysoki") @@ -251,9 +251,9 @@ MAKE_PSTR_LIST(oilPreHeat, "oilpreheat", "oil preheating", "Ölvorwärmung", "Ol MAKE_PSTR_LIST(heatingActive, "heatingactive", "heating active", "Heizen aktiv", "Verwarming actief", "Uppvärmning aktiv", "ogrzewanie aktywne") MAKE_PSTR_LIST(tapwaterActive, "tapwateractive", "tapwater active", "Warmwasser aktiv", "Warm water actief", "Varmvatten aktiv", "przygotowywanie c.w.u. aktywne") MAKE_PSTR_LIST(selFlowTemp, "selflowtemp", "selected flow temperature", "Sollwert Vorlauftemperatur", "Ingestelde aanvoertemperatuur", "Börvärde Flödestemperatur", "zadana temperatura zasilania") -MAKE_PSTR_LIST(selBurnPow, "selburnpow", "burner selected max power", "Sollwert Brennerleistung", "Ingestelde maximale brandervermogen", "Brännare vald maxeffekt", "wybrana moc palnika") +MAKE_PSTR_LIST(selBurnPow, "selburnpow", "burner selected max power", "Sollwert Brennerleistung", "Ingestelde maximale brandervermogen", "Brännare vald maxeffekt", "zadana moc palnika") MAKE_PSTR_LIST(heatingPumpMod, "heatingpumpmod", "heating pump modulation", "Heizungspumpe 1 Modulation", "Modulatie verwarmingspomp", "Modulering Värmepump", "wysterowanie pompy c.o.") -MAKE_PSTR_LIST(heatingPump2Mod, "heatingpump2mod", "heating pump 2 modulation", "Heizungspumpe 2 Modulation", "Modulatie verwarmingspomp 2", "Modulering Värmepump 2", "wysterowanie pompy 2") +MAKE_PSTR_LIST(heatingPump2Mod, "heatingpump2mod", "heating pump 2 modulation", "Heizungspumpe 2 Modulation", "Modulatie verwarmingspomp 2", "Modulering Värmepump 2", "wysterowanie pompy c.o. 2") MAKE_PSTR_LIST(outdoorTemp, "outdoortemp", "outside temperature", "Aussentemperatur", "Buitentemperatuur", "Utomhustemperatur", "temperatura zewnętrzna") MAKE_PSTR_LIST(curFlowTemp, "curflowtemp", "current flow temperature", "aktuelle Vorlauftemperatur", "Huidige aanvoertemperatuur", "Aktuell flödestemperatur", "temperatura zasilania") MAKE_PSTR_LIST(retTemp, "rettemp", "return temperature", "Rücklauftemperatur", "Retourtemperatuur", "Returtemperatur", "temperatura powrotu") @@ -315,7 +315,7 @@ MAKE_PSTR_LIST(nrgSuppTotal, "nrgsupptotal", "total energy supplied", "gesamte E MAKE_PSTR_LIST(nrgSuppHeating, "nrgsuppheating", "total energy supplied heating", "gesamte Energieabgabe heizen", "Opgewekte energie verwarmingsbedrijf", "Tillförd energi Uppvärmning", "całkowita energia oddana na ogrzewanie") MAKE_PSTR_LIST(nrgSuppWw, "nrgsuppww", "total energy warm supplied dhw", "gesamte Energieabgabe", "Opgewekte energie warmwaterbedrijf", "Tillförd energi Varmvatten", "całkowita energia oddana na grzanie c.w.u.") MAKE_PSTR_LIST(nrgSuppCooling, "nrgsuppcooling", "total energy supplied cooling", "gesamte Energieabgabe kühlen", "Opgewekte energie koelbedrijf", "Tillförd energi Kyla", "całkowita energia oddana na chłodzenie") -MAKE_PSTR_LIST(nrgSuppPool, "nrgsupppool", "total energy supplied pool", "gesamte Energieabgabe Pool", "Opgewekte energie zwembadbedrijf", "TIllförd energi Pool", "całkowita energia oddana na pogrzewanie basenu") +MAKE_PSTR_LIST(nrgSuppPool, "nrgsupppool", "total energy supplied pool", "gesamte Energieabgabe Pool", "Opgewekte energie zwembadbedrijf", "TIllförd energi Pool", "całkowita energia oddana na podgrzewanie basenu") MAKE_PSTR_LIST(auxElecHeatNrgConsTotal, "auxelecheatnrgconstotal", "total auxiliary electrical heater energy consumption", "Energieverbrauch el. Zusatzheizung", "Totaal energieverbruik electrisch verwarmingselement", "Energiförbrukning Elpatron", "całkowita energia pobrana przez grzałki") MAKE_PSTR_LIST(auxElecHeatNrgConsHeating, "auxelecheatnrgconsheating", "auxiliary electrical heater energy consumption heating", "Energieverbrauch el. Zusatzheizung Heizen", "Energieverbruik electrisch verwarmingselement voor verwarmingsbedrijf", "Energiförbrukning Elpatron Uppvärmning", "całkowita energia pobrana przez grzałki na ogrzewanie") MAKE_PSTR_LIST(auxElecHeatNrgConsWW, "auxelecheatnrgconsww", "auxiliary electrical heater energy consumption dhw", "Energieverbrauch el. Zusatzheizung", "Energieverbruik electrisch verwarmingselement voor warmwaterbedrijf", "Energiförbrukning Elpatron Varmvatten", "całkowita energia pobrana przez grzałki na grzanie c.w.u.") @@ -325,21 +325,21 @@ MAKE_PSTR_LIST(hpCompOn, "hpcompon", "hp compressor", "WP Kompressor", "WP compr MAKE_PSTR_LIST(hpHeatingOn, "hpheatingon", "hp heating", "WP Heizen", "WP verwarmingsbedrijf", "VP Uppvärmning", "pompa ciepła, ogrzewanie") MAKE_PSTR_LIST(hpCoolingOn, "hpcoolingon", "hp cooling", "WP Kühlen", "WP koelbedrijf", "VP Kyla", "pompa ciepła, chłodzenie") MAKE_PSTR_LIST(hpWwOn, "hpwwon", "hp dhw", "WP Warmwasser", "WP warmwaterbedrijf", "VP Varmvatten", "pompa ciepła, grzanie c.w.u.") -MAKE_PSTR_LIST(hpPoolOn, "hppoolon", "hp pool", "WP Pool", "WP zwembadbedrijf", "VP Pool", "pompa ciepła, pogrzewanie basenu") +MAKE_PSTR_LIST(hpPoolOn, "hppoolon", "hp pool", "WP Pool", "WP zwembadbedrijf", "VP Pool", "pompa ciepła, podgrzewanie basenu") MAKE_PSTR_LIST(hpBrinePumpSpd, "hpbrinepumpspd", "brine pump speed", "Solepumpen-Geschw.", "Snelheid pekelpomp", "Hastighet Brine-pump", "wysterowanie pompy glikolu") MAKE_PSTR_LIST(hpCompSpd, "hpcompspd", "compressor speed", "Kompressor-Geschw.", "Snelheid compressor", "Kompressorhastighet", "prędkość obrotowa sprężarki") MAKE_PSTR_LIST(hpCircSpd, "hpcircspd", "circulation pump speed", "Zirkulationspumpen-Geschw.", "Snelheid circulatiepomp", "Hastighet Cirkulationspump", "wysterowanie pompy obiegu grzewczego") -MAKE_PSTR_LIST(hpBrineIn, "hpbrinein", "brine in/evaporator", "Sole in/Verdampfer", "pekel in/verdamper", "Brine in (förangare)", "temperatura na wlocie obiegu glikolu (TB0)") -MAKE_PSTR_LIST(hpBrineOut, "hpbrineout", "brine out/condenser", "Sole aus/Kondensator", "pekel uit/condensor", "Brine ut (kondensor)", "temperatura na wylocie obiegu glikolu (TB1)") -MAKE_PSTR_LIST(hpSuctionGas, "hpsuctiongas", "suction gas", "Gasansaugung", "Gasaanzuiging", "Gasintag", "temperatura rury ssącej (TR5)") +MAKE_PSTR_LIST(hpBrineIn, "hpbrinein", "brine in/evaporator", "Sole in/Verdampfer", "pekel in/verdamper", "Brine in (förangare)", "temperatura glikolu na wejściu kolektora (TB0)") +MAKE_PSTR_LIST(hpBrineOut, "hpbrineout", "brine out/condenser", "Sole aus/Kondensator", "pekel uit/condensor", "Brine ut (kondensor)", "temperatura glikolu na wyjściu kolektora (TB1)") +MAKE_PSTR_LIST(hpSuctionGas, "hpsuctiongas", "suction gas", "Gasansaugung", "Gasaanzuiging", "Gasintag", "temperatura gazu zasysanego (TR5)") MAKE_PSTR_LIST(hpHotGas, "hphotgas", "hot gas/compressed", "Heißgas/verdichtet", "heet gas/samengeperst", "Hetgas/komprimerad", "temperatura gorącego gazu (TR6)") MAKE_PSTR_LIST(hpSwitchValve, "hpswitchvalve", "switch valve", "Schaltventil", "schakelklep", "Växelventil", "zawór przełączający") MAKE_PSTR_LIST(hpActivity, "hpactivity", "compressor activity", "Kompressoraktivität", "Compressoractiviteit", "Kompressoraktivitet", "pompa ciepła, aktywność sprężarki") MAKE_PSTR_LIST(hpPower, "hppower", "compressor power output", "Kompressorleistung", "Compressorvermogen", "Kompressoreffekt", "moc wyjściowa sprężarki") -MAKE_PSTR_LIST(hpTc0, "hptc0", "heat carrier return (TC0)", "Kältemittel Rücklauf (TC0)", "Koudemiddel retour (TC0O", "Värmebärare Retur (TC0)", "temperatura nośnika ciepła na powrocie (TC0)") +MAKE_PSTR_LIST(hpTc0, "hptc0", "heat carrier return (TC0)", "Kältemittel Rücklauf (TC0)", "Koudemiddel retour (TC0)", "Värmebärare Retur (TC0)", "temperatura nośnika ciepła na powrocie (TC0)") MAKE_PSTR_LIST(hpTc1, "hptc1", "heat carrier forward (TC1)", "Kältemittel Vorlauf (TC1)", "Koudemiddel aanvoer (TC1)", "Värmebärare Framledning (TC1)", "temperatura nośnika ciepła pierwotna (TC1)") -MAKE_PSTR_LIST(hpTc3, "hptc3", "condenser temperature (TC3)", "Verflüssigertemperatur (TC3)", "Condensortemperatuur (TC3)", "Kondensortemperatur (TC3)", "temperatura skraplacza (TC3)") +MAKE_PSTR_LIST(hpTc3, "hptc3", "condenser temperature (TC3)", "Verflüssigertemperatur (TC3)", "Condensortemperatuur (TC3)", "Kondensortemperatur (TC3)", "temperatura skraplacza/na wyjściu sprężarki (TC3)") MAKE_PSTR_LIST(hpTr3, "hptr3", "refrigerant temperature liquid side (condenser output) (TR3)", "Kältemittel (flüssig) (TR3)", "Temperatuur koudemiddel vloeibare zijde (TR3)", "Köldmedium temperatur (kondensorutlopp) (TR3)", "temperatura skraplacza ogrzew. (TR3)") MAKE_PSTR_LIST(hpTr4, "hptr4", "evaporator inlet temperature (TR4)", "Verdampfer Eingang (TR4)", "Verdamper ingangstemperatuur (TR4)", "Förångare inloppstemp (TR4)") @@ -358,9 +358,9 @@ MAKE_PSTR_LIST(hpIn1Opt, "hpin1opt", "input 1 options", "Eingang 1 Einstellung", MAKE_PSTR_LIST(hpIn2Opt, "hpin2opt", "input 2 options", "Eingang 2 Einstellung", "Instelling input 2", "Inställningar Ingång 2", "opcje wejścia 2") MAKE_PSTR_LIST(hpIn3Opt, "hpin3opt", "input 3 options", "Eingang 3 Einstellung", "Instelling input 3", "Inställningar Ingång 3", "opcje wejścia 3") MAKE_PSTR_LIST(hpIn4Opt, "hpin4opt", "input 4 options", "Eingang 4 Einstellung", "Instelling input 4", "Inställningar Ingång 4", "opcje wejścia 4") -MAKE_PSTR_LIST(maxHeatComp, "maxheatcomp", "heat limit compressor", "Heizgrenze Kompressor", "heat limit compressor", "heat limit compressor", "ograniczenie grzania sprężarki") -MAKE_PSTR_LIST(maxHeatHeat, "maxheatheat", "heat limit heating", "Heizgrenze Heizen", "heat limit heating", "heat limit heating", "ograniczenie ogrzewania") -MAKE_PSTR_LIST(maxHeatDhw, "maxheatdhw", "heat limit dhw", "Heizgrenze Warmwasser", "heat limit dhw", "heat limit dhw", "ograniczenie grzania c.w.u.") +MAKE_PSTR_LIST(maxHeatComp, "maxheatcomp", "heat limit compressor", "Heizgrenze Kompressor", "heat limit compressor", "heat limit compressor", "limit ciepła sprężarki") +MAKE_PSTR_LIST(maxHeatHeat, "maxheatheat", "heat limit heating", "Heizgrenze Heizen", "heat limit heating", "heat limit heating", "limit ciepła dla ogrzewania") +MAKE_PSTR_LIST(maxHeatDhw, "maxheatdhw", "heat limit dhw", "Heizgrenze Warmwasser", "heat limit dhw", "heat limit dhw", "limit ciepła dla c.w.u.") // hybrid heatpump MAKE_PSTR_LIST(hybridStrategy, "hybridstrategy", "hybrid control strategy", "Hybrid Strategie", "Hybride strategie", "Hybrid kontrollstrategi") @@ -382,7 +382,7 @@ MAKE_PSTR_LIST(heatPumpOutput, "heatpumpoutput", "heatpump output", "WP Leistung MAKE_PSTR_LIST(coolingCircuit, "coolingcircuit", "cooling circuit", "Kühlkreislauf") MAKE_PSTR_LIST(compStartMod, "compstartmod", "compressor start modulation", "Kompressor Startleistung") MAKE_PSTR_LIST(heatDrainPan, "heatdrainpan", "heat drain pan", "Wärmeausgleichsgefäß") -MAKE_PSTR_LIST(heatCable, "heatcable", "heating cable", "Heizband") +MAKE_PSTR_LIST(heatCable, "heatcable", "heating cable", "Heizband", "heating cable", "heating cable", "przewód grzejny") // alternative heatsource AM200 MAKE_PSTR_LIST(aCylTopTemp, "cyltoptemp", "cylinder top temperature", "Speichertemperatur Oben", "Buffer temperatuur boven", "Cylindertemperatur Toppen", "temperatura na górze cylindra") @@ -417,14 +417,14 @@ MAKE_PSTR_LIST(releaseWait, "releasewait", "boiler release wait time", "Wartezei // the following are dhw for the boiler and automatically tagged with 'dhw' MAKE_PSTR_LIST(wwSelTempLow, "wwseltemplow", "selected lower temperature", "untere Solltemperatur", "Onderste streeftemperatuur", "Vald lägstatemperatur", "temperatura obniżona") MAKE_PSTR_LIST(wwSelTempOff, "wwseltempoff", "selected temperature for off", "Solltemperatur bei AUS", "Streeftemperatuur bij UIT", "Vald tempereatur för AV", "temperatura gdy grzanie wyłączone") -MAKE_PSTR_LIST(wwSelTempSingle, "wwseltempsingle", "single charge temperature", "Solltemperatur Einmalladung", "Streeftemperatuur enkele lading", "Temperatur Engångsladdning", "temperatura wody dodatkowej") -MAKE_PSTR_LIST(wwCylMiddleTemp, "wwcylmiddletemp", "cylinder middle temperature (TS3)", "Speichertemperatur Mitte", "Buffer temperatuur midden", "Cylinder Temperatur Mitten (TS3)") +MAKE_PSTR_LIST(wwSelTempSingle, "wwseltempsingle", "single charge temperature", "Solltemperatur Einmalladung", "Streeftemperatuur enkele lading", "Temperatur Engångsladdning", "temperatura dodatkowej ciepłej wody") +MAKE_PSTR_LIST(wwCylMiddleTemp, "wwcylmiddletemp", "cylinder middle temperature (TS3)", "Speichertemperatur Mitte", "Buffer temperatuur midden", "Cylinder Temperatur Mitten (TS3)", "temperatura środka cylindra (TS3)") MAKE_PSTR_LIST(wwSelTemp, "wwseltemp", "selected temperature", "gewählte Temperatur", "Geselecteerd temperatuur", "Vald Temperatur", "temperatura wybrana") MAKE_PSTR_LIST(wwSetTemp, "wwsettemp", "set temperature", "Solltemperatur", "Streeftemperatuut", "Börtempertur", "temperatura zadana") MAKE_PSTR_LIST(wwType, "wwtype", "type", "Typ", "type", "Typ", "typ") MAKE_PSTR_LIST(wwComfort, "wwcomfort", "comfort", "Komfort", "Comfort", "Komfort", "komfort") -MAKE_PSTR_LIST(wwComfort1, "wwcomfort1", "comfort mode", "Komfort-Modus", "Comfort modus", "Komfortläge", "tryb komfort") +MAKE_PSTR_LIST(wwComfort1, "wwcomfort1", "comfort mode", "Komfort-Modus", "Comfort modus", "Komfortläge", "tryb komfortowy") MAKE_PSTR_LIST(wwFlowTempOffset, "wwflowtempoffset", "flow temperature offset", "Vorlauftemperaturanhebung", "Aanvoertemperatuur offset", "Flödestemperatur förskjutning", "korekta temperatury wypływu") MAKE_PSTR_LIST(wwMaxPower, "wwmaxpower", "max power", "max Leistung", "Maximaal vermogen", "Max Effekt", "moc maksymalna") MAKE_PSTR_LIST(wwCircPump, "wwcircpump", "circulation pump available", "Zirkulationspumpe vorhanden", "Circulatiepomp aanwezig", "Cirkulationspump tillgänglig", "pompa cyrkulacyjna zainstalowana") @@ -438,7 +438,7 @@ MAKE_PSTR_LIST(wwCurFlow, "wwcurflow", "current tap water flow", "aktueller Durc MAKE_PSTR_LIST(wwStorageTemp1, "wwstoragetemp1", "storage intern temperature", "interne Speichertemperatur", "Interne buffertemperatuur", "Beredare Intern Temperatur", "temperatura wewnątrz zasobnika") MAKE_PSTR_LIST(wwStorageTemp2, "wwstoragetemp2", "storage extern temperature", "externer Speichertemperatur", "Externe buffertemperatuur", "Beredare Extern Tempereatur", "temperatura na wyjściu zasobnika") MAKE_PSTR_LIST(wwActivated, "wwactivated", "activated", "aktiviert", "geactiveerd", "Aktiverad", "system przygotowywania c.w.u.") -MAKE_PSTR_LIST(wwOneTime, "wwonetime", "one time charging", "Einmalladung", "Buffer eenmalig laden", "Engångsladdning", "woda dodatkowa (jednorazowo)") +MAKE_PSTR_LIST(wwOneTime, "wwonetime", "one time charging", "Einmalladung", "Buffer eenmalig laden", "Engångsladdning", "dodatkowa ciepła woda (jednorazowo)") MAKE_PSTR_LIST(wwDisinfecting, "wwdisinfecting", "disinfecting", "Desinfizieren", "Desinfectie", "Desinficerar", "dezynfekcja termiczna") MAKE_PSTR_LIST(wwCharging, "wwcharging", "charging", "Laden", "Laden", "Laddar", "grzanie") MAKE_PSTR_LIST(wwChargeOptimization, "wwchargeoptimization", "charge optimization", "Ladungsoptimierung", "laadoptimalisatie", "Laddningsoptimering", "optymalizacja grzania") @@ -457,7 +457,7 @@ MAKE_PSTR_LIST(wwProgMode, "wwprogmode", "program", "Programmmodus", "Programma" MAKE_PSTR_LIST(wwCircProg, "wwcircprog", "circulation program", "Zirkulationsprogramm", "Circulatieprogramma", "Cirkulationsprogram", "program cyrkulacji c.w.u.") MAKE_PSTR_LIST(wwMaxTemp, "wwmaxtemp", "maximum temperature", "Maximale Temperatur", "Maximale temperatuur", "Maximal Temperatur", "temperatura maksymalna") MAKE_PSTR_LIST(wwOneTimeKey, "wwonetimekey", "one time key function", "Einmalladungstaste", "Knop voor eenmalig laden buffer", "Engångsfunktion", "przycisk jednorazowego ogrzania") -MAKE_PSTR_LIST(wwSolarTemp, "wwsolartemp", "solar boiler temperature", "Solarboiler Temperatur", "Zonneboiler temperatuur", "", "") +MAKE_PSTR_LIST(wwSolarTemp, "wwsolartemp", "solar boiler temperature", "Solarboiler Temperatur", "Zonneboiler temperatuur", "", "temperatura zasobnika solarnego") // mqtt values / commands @@ -496,7 +496,7 @@ MAKE_PSTR_LIST(wwExtra1, "wwextra1", "circuit 1 extra", "Kreis 1 Extra", "Circui MAKE_PSTR_LIST(wwExtra2, "wwextra2", "circuit 2 extra", "Kreis 2 Extra", "Circuit 2 extra", "Kets 2 Extra", "obieg dodatkowy 2") MAKE_PSTR_LIST(wwCharge, "wwcharge", "charge", "Laden", "Laden", "Ladda", "grzanie") -MAKE_PSTR_LIST(wwChargeDuration, "wwchargeduration", "charge duration", "Ladedauer", "Laadtijd", "Laddtid", "czas grzania wody dodatkowej") +MAKE_PSTR_LIST(wwChargeDuration, "wwchargeduration", "charge duration", "Ladedauer", "Laadtijd", "Laddtid", "czas grzania dodatej ciepłej wody") MAKE_PSTR_LIST(wwDisinfect, "wwdisinfect", "disinfection", "Desinfektion", "Desinfectie", "Desinfektion", "dezynfekcja termiczna") MAKE_PSTR_LIST(wwDisinfectDay, "wwdisinfectday", "disinfection day", "Desinfektionstag", "Desinfectiedag", "Desinfektionsdag", "dzień dezynfekcji termicznej") MAKE_PSTR_LIST(wwDisinfectHour, "wwdisinfecthour", "disinfection hour", "Desinfektionsstunde", "Desinfectieuur", "Desinfektionstimme", "godzina dezynfekcji termicznej") @@ -505,8 +505,8 @@ MAKE_PSTR_LIST(wwDailyHeating, "wwdailyheating", "daily heating", "täglich Heiz MAKE_PSTR_LIST(wwDailyHeatTime, "wwdailyheattime", "daily heating time", "tägliche Heizzeit", "Tijd dagelijkse opwarming", "Daglig Uppvärmningstid", "czas trwania codziennego nagrzewania") // thermostat hc -MAKE_PSTR_LIST(selRoomTemp, "seltemp", "selected room temperature", "Sollwert Raumtemperatur", "Streeftemperatuur kamer", "Vald Rumstemperatur", "temperatura zadana w pomieszczeniu") -MAKE_PSTR_LIST(roomTemp, "currtemp", "current room temperature", "aktuelle Raumtemperatur", "Huidige kamertemperatuur", "Aktuell Rumstemperatur", "temperatura w pomieszczeniu") +MAKE_PSTR_LIST(selRoomTemp, "seltemp", "selected room temperature", "Sollwert Raumtemperatur", "Streeftemperatuur kamer", "Vald Rumstemperatur", "zadana temperatura pomieszczenia") +MAKE_PSTR_LIST(roomTemp, "currtemp", "current room temperature", "aktuelle Raumtemperatur", "Huidige kamertemperatuur", "Aktuell Rumstemperatur", "temperatura pomieszczenia") MAKE_PSTR_LIST(mode, "mode", "mode", "Modus", "Modus", "Läge", "sposób regulacji") MAKE_PSTR_LIST(modetype, "modetype", "mode type", "Modus Typ", "Type modus", "Typ av läge", "aktualny tryb pracy") MAKE_PSTR_LIST(fastheatup, "fastheatup", "fast heatup", "schnelles Aufheizen", "Snel opwarmen", "Snabb Uppvärmning", "szybkie nagrzewanie") @@ -519,8 +519,8 @@ MAKE_PSTR_LIST(nighttemp, "nighttemp", "night temperature", "Nachttemperatur", " MAKE_PSTR_LIST(nighttemp2, "nighttemp", "night temperature T1", "Nachttemperatur T1", "Nachttemperatuur T1", "Nattemperatur T1", "temperatura w nocy T1") MAKE_PSTR_LIST(ecotemp, "ecotemp", "eco temperature", "eco Temperatur", "Temperatuur eco", "Eko-temperatur", "temperatura eko") MAKE_PSTR_LIST(manualtemp, "manualtemp", "manual temperature", "manuelle Temperatur", "temperatuur handmatig", "Temperatur Manuell", "temperatura ręczna") -MAKE_PSTR_LIST(tempautotemp, "tempautotemp", "temporary set temperature automode", "temporäre Solltemperatur", "Streeftemperatuur automodus tijdelijk", "Temporär Aktivering av Auto-läge", "temperatura tymczasowa w trybie \"auto\"") -MAKE_PSTR_LIST(remoteseltemp, "remoteseltemp", "temporary set temperature from remote", "temporäre Solltemperatur Remote", "Temperatuur van afstandsbedieding", "Temperatur från fjärruppkoppling", "temperatura zadana (tymczasowa)") +MAKE_PSTR_LIST(tempautotemp, "tempautotemp", "temporary set temperature automode", "temporäre Solltemperatur", "Streeftemperatuur automodus tijdelijk", "Temporär Aktivering av Auto-läge", "zadana temperatura pomieszczenia w trybie \"auto\" (tymczasowa)") +MAKE_PSTR_LIST(remoteseltemp, "remoteseltemp", "temporary set temperature from remote", "temporäre Solltemperatur Remote", "Temperatuur van afstandsbedieding", "Temperatur från fjärruppkoppling", "zadana zdalnie temperatura pomieszczenia (tymczasowa)") MAKE_PSTR_LIST(comforttemp, "comforttemp", "comfort temperature", "Komforttemperatur", "Comforttemperatuur", "Komforttemperatur", "temperatura komfortowa") MAKE_PSTR_LIST(summertemp, "summertemp", "summer temperature", "Sommertemperatur", "Zomertemperatuur", "Sommartemperatur", "temperatura przełączania lato/zima") MAKE_PSTR_LIST(designtemp, "designtemp", "design temperature", "Auslegungstemperatur", "Ontwerptemperatuur", "Design-temperatur", "temperatura projektowa") @@ -540,27 +540,27 @@ MAKE_PSTR_LIST(controlmode, "controlmode", "control mode", "Kontrollmodus", "Com MAKE_PSTR_LIST(control, "control", "control device", "Fernsteuerung", "Afstandsbedieding", "Kontrollenhet", "sterownik") MAKE_PSTR_LIST(roomsensor, "roomsensor", "room sensor", "Raumsensor", "Ruimtesensor", "Rumssensor", "czujnik pomieszczeniowy") MAKE_PSTR_LIST(program, "program", "program", "Programm", "Programma", "Program", "program") -MAKE_PSTR_LIST(pause, "pause", "pause time", "Pausenzeit", "Pausetijd", "Paustid", "pauza?") -MAKE_PSTR_LIST(party, "party", "party time", "Partyzeit", "Partytijd", "Partytid", "przyjęcie") -MAKE_PSTR_LIST(holidaytemp, "holidaytemp", "holiday temperature", "Urlaubstemperatur", "Vakantietemperatuur", "Helgtemperatur", "temperatura wakacyjna") +MAKE_PSTR_LIST(pause, "pause", "pause time", "Pausenzeit", "Pausetijd", "Paustid", "czas przerwy") +MAKE_PSTR_LIST(party, "party", "party time", "Partyzeit", "Partytijd", "Partytid", "czas przyjęcia") +MAKE_PSTR_LIST(holidaytemp, "holidaytemp", "holiday temperature", "Urlaubstemperatur", "Vakantietemperatuur", "Helgtemperatur", "temperatura w trybie urlopowym") MAKE_PSTR_LIST(summermode, "summermode", "summer mode", "Sommerbetrieb", "Zomerbedrijf", "Sommarläge", "aktualny tryb lato/zima") -MAKE_PSTR_LIST(holidaymode, "holidaymode", "holiday mode", "Urlaubsbetrieb", "Vakantiebedrijf", "Helgläge", "tryb wakacyjny") +MAKE_PSTR_LIST(holidaymode, "holidaymode", "holiday mode", "Urlaubsbetrieb", "Vakantiebedrijf", "Helgläge", "tryb urlopowy") MAKE_PSTR_LIST(flowtempoffset, "flowtempoffset", "flow temperature offset for mixer", "Vorlauftemperaturanhebung", "Mixer aanvoertemperatuur offset", "Temperaturkorrigering Flödestemp. Blandningsventil", "korekta temperatury przepływu dla miksera") -MAKE_PSTR_LIST(reducemode, "reducemode", "reduce mode", "Absenkmodus", "Gereduceerde modus", "Reducerat Läge", "tryb redukcji") +MAKE_PSTR_LIST(reducemode, "reducemode", "reduce mode", "Absenkmodus", "Gereduceerde modus", "Reducerat Läge", "tryb zredukowany/obniżony") MAKE_PSTR_LIST(noreducetemp, "noreducetemp", "no reduce below temperature", "Durchheizen unter", "Reduceermodus onderbreken onder", "Inaktivera reducering under", "bez redukcji poniżej temperatury") MAKE_PSTR_LIST(reducetemp, "reducetemp", "off/reduce switch temperature", "Absenkmodus unter", "Onderste afschakeltemperatuur", "Avslag/Reducera under") MAKE_PSTR_LIST(vacreducetemp, "vacreducetemp", "vacations off/reduce switch temperature", "Urlaub Absenkmodus unter", "Vakantiemodus onderste afschakeltemperatuur", "Helg Avslag/Reducering under") -MAKE_PSTR_LIST(vacreducemode, "vacreducemode", "vacations reduce mode", "Urlaub Absenkmodus", "Vakantie afschakelmodus", "Helg reduceringsläge", "redukcja w trakcie wakacji") +MAKE_PSTR_LIST(vacreducemode, "vacreducemode", "vacations reduce mode", "Urlaub Absenkmodus", "Vakantie afschakelmodus", "Helg reduceringsläge", "redukcja w trakcie urlopu") MAKE_PSTR_LIST(nofrostmode, "nofrostmode", "nofrost mode", "Frostschutz Modus", "Vorstbeveiligingsmodus", "Frostskyddsläge", "temperatura wiodąca dla ochrony przed zamarzaniem") MAKE_PSTR_LIST(remotetemp, "remotetemp", "room temperature from remote", "Raumtemperatur Remote", "Ruimtetemperatuur van afstandsbediening", "Rumstemperatur från fjärr", "temperatura z czujnika w pomieszczeniu") MAKE_PSTR_LIST(wwHolidays, "wwholidays", "holiday dates", "Feiertage", "Feestdagen", "Helgdagar", "dni świąteczne") MAKE_PSTR_LIST(wwVacations, "wwvacations", "vacation dates", "Urlaubstage", "Vakantiedagen", "Semesterdatum Varmvatten", "dni urlopowe") MAKE_PSTR_LIST(holidays, "holidays", "holiday dates", "Feiertage", "Feestdagen", "Helgdatum", "święta") -MAKE_PSTR_LIST(vacations, "vacations", "vacation dates", "Urlaubstage", "Vakantiedagen", "Semesterdatum", "wakacje") +MAKE_PSTR_LIST(vacations, "vacations", "vacation dates", "Urlaubstage", "Vakantiedagen", "Semesterdatum", "urlop") MAKE_PSTR_LIST(wwprio, "wwprio", "dhw priority", "WW-Vorrang", "Prioriteit warm water", "Prioritera Varmvatten", "priorytet dla c.w.u.") -MAKE_PSTR_LIST(nofrostmode1, "nofrostmode1", "nofrost mode", "Frostschutz", "Vorstbeveiligingsmodus", "Frostskyddsläge", "ochrona przed zamarzaniem 1") +MAKE_PSTR_LIST(nofrostmode1, "nofrostmode1", "nofrost mode", "Frostschutz", "Vorstbeveiligingsmodus", "Frostskyddsläge", "ochrona przed zamarzaniem") MAKE_PSTR_LIST(reducehours, "reducehours", "duration for nighttemp", "Dauer Nachttemp.", "Duur nachtverlaging", "Timmar Nattsänkning", "czas trwania trybu nocnego") MAKE_PSTR_LIST(reduceminutes, "reduceminutes", "remaining time for nightmode", "Restzeit Nachttemp.", "Resterende tijd nachtverlaging", "Återstående Tid Nattläge", "czas do końca trybu nocnego") MAKE_PSTR_LIST(switchonoptimization, "switchonoptimization", "switch-on optimization", "Einschaltoptimierung", "Inschakeloptimalisering", "Växlingsoptimering", "optymalizacja załączania") @@ -653,7 +653,7 @@ MAKE_PSTR_LIST(solarIsEnabled, "solarenabled", "solarmodule enabled", "Solarmodu // telegram 0x035A MAKE_PSTR_LIST(solarPumpMode, "solarpumpmode", "pump mode", "Solar Pumpen Einst.", "Modus zonneboilerpomp", "Sol Pumpläge", "tryb pracy pompy") MAKE_PSTR_LIST(solarPumpKick, "pumpkick", "pump kick", "Röhrenkollektorfunktion", "Modus buizencollector", "Sol Kollektorfunktion", "wspomaganie startu pompy") -MAKE_PSTR_LIST(plainWaterMode, "plainwatermode", "plain water mode", "Südeuropafunktion", "Modus Zuid-Europa", "Sydeuropa-funktion", "tylko woda (dla Europy Południowaej)") +MAKE_PSTR_LIST(plainWaterMode, "plainwatermode", "plain water mode", "Südeuropafunktion", "Modus Zuid-Europa", "Sydeuropa-funktion", "tylko woda (dla Europy Południowej)") MAKE_PSTR_LIST(doubleMatchFlow, "doublematchflow", "doublematchflow", "Double Match Flow", "Double Match Flow", "Dubbelmatchning Flöde", "przepływ podwójnie dopasowany") MAKE_PSTR_LIST(solarPump2Mode, "pump2mode", "pump 2 mode", "Pumpe 2 Modus", "Modus pomp 2", "Pump 2 Läge", "tryb pracy pompy 2") MAKE_PSTR_LIST(solarPump2Kick, "pump2kick", "pump kick 2", "Pumpe 2 Startboost", "Startboost pomp 2", "Pump 2 Kollektorfunktion", "wspomaganie startu pompy 2") @@ -663,9 +663,9 @@ MAKE_PSTR_LIST(cylPriority, "cylpriority", "cylinder priority", "Speicher Priori // telegram 0x380 MAKE_PSTR_LIST(climateZone, "climatezone", "climate zone", "Klimazone", "klimaatzone", "Klimatzon", "strefa klimatyczna") -MAKE_PSTR_LIST(collector1Area, "collector1area", "collector 1 area", "Kollektor 1 Fläche", "oppervlakte collector 1", "Kollektor 1 Area", "obszar kolektra 1") +MAKE_PSTR_LIST(collector1Area, "collector1area", "collector 1 area", "Kollektor 1 Fläche", "oppervlakte collector 1", "Kollektor 1 Area", "powierzchnia kolektora 1") MAKE_PSTR_LIST(collector1Type, "collector1type", "collector 1 type", "Kollektor 1 Typ", "Type collector 1", "Kollektor 1 Typ", "typ kolektora 1") -MAKE_PSTR_LIST(collector2Area, "collector2area", "collector 2 area", "Kollektor 2 Fläche", "Oppervlakte collector 2", "Kollektor 2 Area", "obszar kolektora 2") +MAKE_PSTR_LIST(collector2Area, "collector2area", "collector 2 area", "Kollektor 2 Fläche", "Oppervlakte collector 2", "Kollektor 2 Area", "powierzchnia kolektora 2") MAKE_PSTR_LIST(collector2Type, "collector2type", "collector 2 type", "Kollektor 2 Typ", "Type collector 2", "Kollektor 2 Typ", "typ kolektora 2") // telegram 0x0363 heatCounter diff --git a/src/mqtt.cpp b/src/mqtt.cpp index 06455a1c9..923f603a5 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -1150,7 +1150,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdevice // always render boolean as strings true & false // and has no unit of measure or icon if (type == DeviceValueType::BOOL) { - char result[10]; + char result[12]; doc["payload_on"] = Helpers::render_boolean(result, true); doc["payload_off"] = Helpers::render_boolean(result, false); doc[sc_ha] = F_(measurement); diff --git a/src/shower.cpp b/src/shower.cpp index 28978a412..d2cb1c678 100644 --- a/src/shower.cpp +++ b/src/shower.cpp @@ -143,7 +143,7 @@ void Shower::set_shower_state(bool state, bool force) { old_shower_state_ = shower_state_; // copy current state // always publish as a string - char s[7]; + char s[12]; Mqtt::publish("shower_active", Helpers::render_boolean(s, shower_state_)); // https://github.com/emsesp/EMS-ESP/issues/369 // send out HA MQTT Discovery config topic @@ -157,7 +157,7 @@ void Shower::set_shower_state(bool state, bool force) { doc["stat_t"] = "~/shower_active"; // always render boolean as strings for HA - char result[10]; + char result[12]; doc[("payload_on")] = Helpers::render_boolean(result, true); doc[("payload_off")] = Helpers::render_boolean(result, false); diff --git a/src/system.cpp b/src/system.cpp index bd319dce5..b6a39c5a2 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -546,14 +546,14 @@ bool System::heartbeat_json(JsonObject & output) { output["uptime_sec"] = uuid::get_uptime_sec(); bool value_b = EMSESP::system_.ntp_connected(); if (Mqtt::ha_enabled()) { - char s[7]; + char s[12]; output["ntp_status"] = Helpers::render_boolean(s, value_b); // for HA always render as string } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) { output["ntp_status"] = value_b; } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) { output["ntp_status"] = value_b ? 1 : 0; } else { - char s[7]; + char s[12]; output["ntp_status"] = Helpers::render_boolean(s, value_b); } output["rxreceived"] = EMSESP::rxservice_.telegram_count();