diff --git a/src/devices/ventilation.cpp b/src/devices/ventilation.cpp index 65d01d9fa..22ed3bdc7 100644 --- a/src/devices/ventilation.cpp +++ b/src/devices/ventilation.cpp @@ -37,7 +37,8 @@ Ventilation::Ventilation(uint8_t device_type, uint8_t device_id, uint8_t product register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &inEx_, DeviceValueType::SHORT, FL_(inEx), DeviceValueUOM::DEGREES); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &ventInSpeed_, DeviceValueType::UINT, FL_(ventInSpeed), DeviceValueUOM::PERCENT); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &ventOutSpeed_, DeviceValueType::UINT, FL_(ventOutSpeed), DeviceValueUOM::PERCENT); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &mode_, DeviceValueType::ENUM, FL_(enum_ventMode), FL_(ventInSpeed), DeviceValueUOM::NONE, MAKE_CF_CB(set_ventMode)); + register_device_value( + DeviceValueTAG::TAG_DEVICE_DATA, &mode_, DeviceValueType::ENUM, FL_(enum_ventMode), FL_(ventInSpeed), DeviceValueUOM::NONE, MAKE_CF_CB(set_ventMode)); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &voc_, DeviceValueType::USHORT, FL_(airquality), DeviceValueUOM::NONE); } @@ -47,10 +48,10 @@ void Ventilation::process_SetMessage(std::shared_ptr telegram) { // message 583 void Ventilation::process_MonitorMessage(std::shared_ptr telegram) { - // has_update(telegram, outFresh_, ?); - // has_update(telegram, inFresh_, ?); - // has_update(telegram, outEx_, ?); - // has_update(telegram, inEx_, ?); + has_update(telegram, outEx_, 0); // Fortluft + has_update(telegram, inEx_, 7); // Abluft + has_update(telegram, outFresh_, 13); // Außenluft + has_update(telegram, inFresh_, 15); // Zuluft } // message 575 10 bytes @@ -58,7 +59,7 @@ void Ventilation::process_MonitorMessage(std::shared_ptr telegra // 0-level out, 1-level in, 2-mod out, 3-mod in, 9-mode:1-manual/2-auto/3-prog // message 585 26 bytes long -// Data: 46 46 00 00 00 77 00 03 F4 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +// Data: 46 46 00 00 00 77 00 03 F4 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 void Ventilation::process_BlowerMessage(std::shared_ptr telegram) { has_update(telegram, ventOutSpeed_, 0); has_update(telegram, ventInSpeed_, 1); diff --git a/src/locale_translations.h b/src/locale_translations.h index df5ea75d2..f614cf7f0 100644 --- a/src/locale_translations.h +++ b/src/locale_translations.h @@ -49,7 +49,7 @@ MAKE_WORD_TRANSLATION(pump_device, "Pump Module", "Pumpenmodul", "Pump Module", MAKE_WORD_TRANSLATION(heatsource_device, "Heatsource", "Heizquelle", "Heatsource", "Värmekälla", "ŹródÅ‚o ciepÅ‚a", "Varmekilde", "", "Isı Kaynağı") // TODO translate MAKE_WORD_TRANSLATION(sensors_device, "Sensors", "Sensoren", "Sensoren", "Sensorer", "Czujniki", "Sensorer", "Capteurs", "Sensör Cihazı") MAKE_WORD_TRANSLATION(unknown_device, "Unknown", "Unbekannt", "Onbekend", "Okänt", "Nieznane urzÄ…dzenie", "Ukjent", "Inconnu", "") // TODO translate -MAKE_WORD_TRANSLATION(custom_device, "Custom", "", "", "", "Niestandardowe", "", "", "") // TODO translate +MAKE_WORD_TRANSLATION(custom_device, "Custom", "Nutzerdefiniert", "", "", "Niestandardowe", "", "", "") // TODO translate MAKE_WORD_TRANSLATION(custom_device_name, "User defined entities", "Nutzer deklarierte Entitäten", "", "", "Encje zdefiniowane przez użytkownika", "", "", "") // TODO translate MAKE_WORD_TRANSLATION(ventilation_device, "Ventilation", "Lüftung", "", "", "", "", "", "") // TODO translate @@ -62,8 +62,8 @@ MAKE_WORD_TRANSLATION(send_cmd, "send a telegram", "Sende EMS-Telegramm", "", "" MAKE_WORD_TRANSLATION(setiovalue_cmd, "set io value", "Setze Wertevorgabe", "", "", "ustaw wartość", "sett en io verdi", "", "GiriÅŸ/Çıkış deÄŸerlerini ayarla") // TODO translate MAKE_WORD_TRANSLATION(changeloglevel_cmd, "change log level", "Ändere Sysloglevel", "", "", "zmieÅ„ poziom log-u", "endre loggnivÃ¥", "", "Kayıt seviyesini deÄŸiÅŸtir") // TODO translate MAKE_WORD_TRANSLATION(fetch_cmd, "refresh all EMS values", "Lese alle EMS-Werte neu", "", "", "odÅ›wież wszystkie wartoÅ›ci EMS", "oppfrisk alle EMS verdier", "", "Bütün EMS deÄŸerlerini yenile") // TODO translate -MAKE_WORD_TRANSLATION(restart_cmd, "restart EMS-ESP", "Neustart", "", "", "uruchom ponownie EMS-ESP", "restart EMS-ESP", "", "EMS-ESPyi yeniden baÅŸlat") // TODO translate -MAKE_WORD_TRANSLATION(watch_cmd, "watch incoming telegrams", "Watch auf eingehende Telegramme", "", "", "obserwuj przychodzÄ…ce telegramy", "se innkommende telegrammer", "", "Gelen telegramları ") // TODO translate +MAKE_WORD_TRANSLATION(restart_cmd, "restart EMS-ESP", "Neustart", "", "", "uruchom ponownie EMS-ESP", "restart EMS-ESP", "redémarrer EMS-ESP", "EMS-ESPyi yeniden baÅŸlat") // TODO translate +MAKE_WORD_TRANSLATION(watch_cmd, "watch incoming telegrams", "Watch auf eingehende Telegramme", "", "", "obserwuj przyczodzÄ…ce telegramy", "se innkommende telegrammer", "", "Gelen telegramları ") // TODO translate MAKE_WORD_TRANSLATION(publish_cmd, "publish all to MQTT", "Publiziere MQTT", "", "", "opublikuj wszystko na MQTT", "Publiser alt til MQTT", "", "Hepsini MQTTye gönder") // TODO translate MAKE_WORD_TRANSLATION(system_info_cmd, "show system status", "Zeige System-Status", "", "", "pokaż status systemu", "vis system status", "", "Sistem Durumunu Göster") // TODO translate MAKE_WORD_TRANSLATION(schedule_cmd, "enable schedule item", "Aktiviere Zeitplan", "", "", "aktywuj wybrany harmonogram", "", "", "") // TODO translate @@ -769,8 +769,8 @@ MAKE_TRANSLATION(RFTemp, "rftemp", "RF room temperature sensor", "RF Raumtempera // ventilation MAKE_TRANSLATION(outFresh, "outfresh", "outdoor fresh air", "Außenlufttemp.") MAKE_TRANSLATION(inFresh, "infresh", "indoor fresh air", "Zulufttemp.") -MAKE_TRANSLATION(outEx, "outexhaust", "outdoor exhaust air", "Ablufttemp.") -MAKE_TRANSLATION(inEx, "inexhaust", "indoor exhaust air", "Fortlufttemp.") +MAKE_TRANSLATION(outEx, "outexhaust", "outdoor exhaust air", "Fortlufttemp.") +MAKE_TRANSLATION(inEx, "inexhaust", "indoor exhaust air", "Ablufttemp.") MAKE_TRANSLATION(ventMode, "ventmode", "ventilation mode", "Belüftungsmodus") MAKE_TRANSLATION(ventInSpeed, "ventinspeed", "in blower speed", "Zuluft-Drehzahl") MAKE_TRANSLATION(ventOutSpeed, "ventoutspeed", "out blower speed", "Abluft-Drehzahl")