mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-07 16:29:51 +03:00
default shower detect start time 3 minutes (was 2)
This commit is contained in:
@@ -123,7 +123,7 @@ const en: Translation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
||||||
HEATINGOFF: 'Start boiler with forced heating off',
|
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_TIMER: 'Enable Shower Timer',
|
||||||
ENABLE_SHOWER_ALERT: 'Enable Shower Alert',
|
ENABLE_SHOWER_ALERT: 'Enable Shower Alert',
|
||||||
TRIGGER_TIME: 'Trigger Time',
|
TRIGGER_TIME: 'Trigger Time',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const fr: Translation = {
|
|||||||
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
|
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
|
||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
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_TIMER: 'Activer la minuterie de la douche',
|
||||||
ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche',
|
ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche',
|
||||||
TRIGGER_TIME: 'Durée avant déclenchement',
|
TRIGGER_TIME: 'Durée avant déclenchement',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const it: Translation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
||||||
HEATINGOFF: 'Avviamento caldaia con riscaldamento forzato spento',
|
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_TIMER: 'Abilita timer doccia',
|
||||||
ENABLE_SHOWER_ALERT: 'Abilita avviso doccia',
|
ENABLE_SHOWER_ALERT: 'Abilita avviso doccia',
|
||||||
TRIGGER_TIME: 'Tempo di avvio',
|
TRIGGER_TIME: 'Tempo di avvio',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const nl: Translation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
||||||
HEATINGOFF: 'Start ketel met geforceerde verwarming uit',
|
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_TIMER: 'Activeer Douche Timer (tijdmeting)',
|
||||||
ENABLE_SHOWER_ALERT: 'Activeer Douchemelding',
|
ENABLE_SHOWER_ALERT: 'Activeer Douchemelding',
|
||||||
TRIGGER_TIME: 'Trigger tijd',
|
TRIGGER_TIME: 'Trigger tijd',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const no: Translation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature',
|
||||||
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
|
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_TIMER: 'Aktiver Dusjtimer',
|
||||||
ENABLE_SHOWER_ALERT: 'Aktiver Dusj-varsling',
|
ENABLE_SHOWER_ALERT: 'Aktiver Dusj-varsling',
|
||||||
TRIGGER_TIME: 'Aktiveringstid',
|
TRIGGER_TIME: 'Aktiveringstid',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const pl: BaseTranslation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote control on missing roomtemperature',
|
||||||
HEATINGOFF: 'Uruchom kocioł z wymuszonym wyłączonym grzaniem',
|
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_TIMER: 'Aktywuj minutnik prysznica',
|
||||||
ENABLE_SHOWER_ALERT: 'Aktywuj alarm prysznica',
|
ENABLE_SHOWER_ALERT: 'Aktywuj alarm prysznica',
|
||||||
TRIGGER_TIME: 'Wyzwalaj po czasie',
|
TRIGGER_TIME: 'Wyzwalaj po czasie',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const sk: Translation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
||||||
HEATINGOFF: 'Spustiť kotol s vynúteným vykurovaním',
|
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_TIMER: 'Povoliť časovač sprchovania',
|
||||||
ENABLE_SHOWER_ALERT: 'Povoliť upozornenie na sprchu',
|
ENABLE_SHOWER_ALERT: 'Povoliť upozornenie na sprchu',
|
||||||
TRIGGER_TIME: 'Čas spustenia',
|
TRIGGER_TIME: 'Čas spustenia',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const sv: Translation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
||||||
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
|
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_TIMER: 'Aktivera Dusch-timer',
|
||||||
ENABLE_SHOWER_ALERT: 'Aktivera Dusch-varning',
|
ENABLE_SHOWER_ALERT: 'Aktivera Dusch-varning',
|
||||||
TRIGGER_TIME: 'Aktiveringstid',
|
TRIGGER_TIME: 'Aktiveringstid',
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ const tr: Translation = {
|
|||||||
REMOTE_TIMEOUT: 'Remote timeout',
|
REMOTE_TIMEOUT: 'Remote timeout',
|
||||||
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
REMOTE_TIMEOUT_EN: 'Disable remote on missing roomtemperature',
|
||||||
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate
|
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_TIMER: 'Duş Sayacını Devreye Al',
|
||||||
ENABLE_SHOWER_ALERT: 'Duş Alarmını Devreye Al',
|
ENABLE_SHOWER_ALERT: 'Duş Alarmını Devreye Al',
|
||||||
TRIGGER_TIME: 'Tetikleme Zamanı',
|
TRIGGER_TIME: 'Tetikleme Zamanı',
|
||||||
|
|||||||
@@ -86,7 +86,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef EMSESP_DEFAULT_SHOWER_MIN_DURATION
|
#ifndef EMSESP_DEFAULT_SHOWER_MIN_DURATION
|
||||||
#define EMSESP_DEFAULT_SHOWER_MIN_DURATION 120
|
#define EMSESP_DEFAULT_SHOWER_MIN_DURATION 180
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef EMSESP_DEFAULT_SHOWER_ALERT_COLDSHOT
|
#ifndef EMSESP_DEFAULT_SHOWER_ALERT_COLDSHOT
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class Shower {
|
|||||||
bool shower_alert_; // true if we want the alert of cold water
|
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_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_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_;
|
uint32_t next_alert_;
|
||||||
bool ha_configdone_ = false; // for HA MQTT Discovery
|
bool ha_configdone_ = false; // for HA MQTT Discovery
|
||||||
bool shower_state_;
|
bool shower_state_;
|
||||||
|
|||||||
Reference in New Issue
Block a user