diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts index ce1762eda..25c2738d3 100644 --- a/interface/src/i18n/en/index.ts +++ b/interface/src/i18n/en/index.ts @@ -123,7 +123,7 @@ const en: Translation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature', HEATINGOFF: 'Start boiler with forced heating off', - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Enable Shower Timer', ENABLE_SHOWER_ALERT: 'Enable Shower Alert', TRIGGER_TIME: 'Trigger Time', diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts index 3354f122f..74a59d09c 100644 --- a/interface/src/i18n/fr/index.ts +++ b/interface/src/i18n/fr/index.ts @@ -123,7 +123,7 @@ const fr: Translation = { HEATINGOFF: 'Start boiler with forced heating off', // TODO translate REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature', - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Activer la minuterie de la douche', ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche', TRIGGER_TIME: 'Durée avant déclenchement', diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts index c7daac020..a0a3cc4d9 100644 --- a/interface/src/i18n/it/index.ts +++ b/interface/src/i18n/it/index.ts @@ -123,7 +123,7 @@ const it: Translation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature', HEATINGOFF: 'Avviamento caldaia con riscaldamento forzato spento', - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Abilita timer doccia', ENABLE_SHOWER_ALERT: 'Abilita avviso doccia', TRIGGER_TIME: 'Tempo di avvio', diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts index c643913ac..304adc045 100644 --- a/interface/src/i18n/nl/index.ts +++ b/interface/src/i18n/nl/index.ts @@ -123,7 +123,7 @@ const nl: Translation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature', HEATINGOFF: 'Start ketel met geforceerde verwarming uit', - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)', ENABLE_SHOWER_ALERT: 'Activeer Douchemelding', TRIGGER_TIME: 'Trigger tijd', diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts index 7d961a727..4264b78b5 100644 --- a/interface/src/i18n/no/index.ts +++ b/interface/src/i18n/no/index.ts @@ -123,7 +123,7 @@ const no: Translation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature', HEATINGOFF: 'Start boiler with forced heating off', // TODO translate - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Aktiver Dusjtimer', ENABLE_SHOWER_ALERT: 'Aktiver Dusj-varsling', TRIGGER_TIME: 'Aktiveringstid', diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts index ee4df7ba1..53cfb0f21 100644 --- a/interface/src/i18n/pl/index.ts +++ b/interface/src/i18n/pl/index.ts @@ -123,7 +123,7 @@ const pl: BaseTranslation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature', HEATINGOFF: 'Uruchom kocioł z wymuszonym wyłączonym grzaniem', - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Aktywuj minutnik prysznica', ENABLE_SHOWER_ALERT: 'Aktywuj alarm prysznica', TRIGGER_TIME: 'Wyzwalaj po czasie', diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts index 0b75b8b6d..d34a9b823 100644 --- a/interface/src/i18n/sk/index.ts +++ b/interface/src/i18n/sk/index.ts @@ -123,7 +123,7 @@ const sk: Translation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature', HEATINGOFF: 'Spustiť kotol s vynúteným vykurovaním', - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Povoliť časovač sprchovania', ENABLE_SHOWER_ALERT: 'Povoliť upozornenie na sprchu', TRIGGER_TIME: 'Čas spustenia', diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts index 22fb3ed59..f2df96d2e 100644 --- a/interface/src/i18n/sv/index.ts +++ b/interface/src/i18n/sv/index.ts @@ -123,7 +123,7 @@ const sv: Translation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature', HEATINGOFF: 'Start boiler with forced heating off', // TODO translate - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Aktivera Dusch-timer', ENABLE_SHOWER_ALERT: 'Aktivera Dusch-varning', TRIGGER_TIME: 'Aktiveringstid', diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts index 95ab995c1..f38733110 100644 --- a/interface/src/i18n/tr/index.ts +++ b/interface/src/i18n/tr/index.ts @@ -123,7 +123,7 @@ const tr: Translation = { REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature', HEATINGOFF: 'Start boiler with forced heating off', // TODO translate - MIN_DURATION: 'Time for detection shower', + MIN_DURATION: 'Wait time', ENABLE_SHOWER_TIMER: 'Duş Sayacını Devreye Al', ENABLE_SHOWER_ALERT: 'Duş Alarmını Devreye Al', TRIGGER_TIME: 'Tetikleme Zamanı', diff --git a/src/default_settings.h b/src/default_settings.h index 41e6d12a4..336b29857 100644 --- a/src/default_settings.h +++ b/src/default_settings.h @@ -86,7 +86,7 @@ #endif #ifndef EMSESP_DEFAULT_SHOWER_MIN_DURATION -#define EMSESP_DEFAULT_SHOWER_MIN_DURATION 120 +#define EMSESP_DEFAULT_SHOWER_MIN_DURATION 180 #endif #ifndef EMSESP_DEFAULT_SHOWER_ALERT_COLDSHOT diff --git a/src/shower.h b/src/shower.h index 8d73e16bf..666a1668f 100644 --- a/src/shower.h +++ b/src/shower.h @@ -46,7 +46,7 @@ class Shower { bool shower_alert_; // true if we want the alert of cold water uint32_t shower_alert_trigger_; // default 7 minutes, before trigger a shot of cold water uint32_t shower_alert_coldshot_; // default 10 seconds for cold water before turning back hot water - uint32_t shower_min_duration_; // default 2 minutes (120 seconds), before recognizing its a shower + uint32_t shower_min_duration_; // default 3 minutes (180 seconds), before recognizing its a shower uint32_t next_alert_; bool ha_configdone_ = false; // for HA MQTT Discovery bool shower_state_;