iobroker.poolcontrol 1.3.35 → 1.4.0

package/lib/helpers/timeHelper.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { I18n } = require('@iobroker/adapter-core');
+
 /**
  * timeHelper
  * - Überwacht Zeitfenster (time1, time2, time3)
@@ -41,6 +43,7 @@ const timeHelper = {
                     await this.adapter.setStateAsync('pump.active_helper', { val: '', ack: true });
                     this.adapter.log.debug('[timeHelper] Time mode ended – priority released to solar/control.');
                 }
+                await this.adapter.setStateChangedAsync('timecontrol.status_text', { val: '', ack: true });
                 return;
             } // nur aktiv im Zeitmodus
 
@@ -49,9 +52,13 @@ const timeHelper = {
 
             const now = new Date();
             const hhmm = now.toTimeString().slice(0, 5); // "HH:MM"
+            const nowMinutes = now.getHours() * 60 + now.getMinutes();
             const weekday = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'][now.getDay()];
 
             let shouldRun = false;
+            let intervalWindowActive = false;
+            let pausedIntervalExists = false;
+            let invalidIntervalExists = false;
             for (let i = 1; i <= 3; i++) {
                 const active = (await this.adapter.getStateAsync(`timecontrol.time${i}_active`))?.val;
                 const start = (await this.adapter.getStateAsync(`timecontrol.time${i}_start`))?.val;
@@ -59,11 +66,60 @@ const timeHelper = {
                 const dayOk = (await this.adapter.getStateAsync(`timecontrol.time${i}_day_${weekday}`))?.val;
 
                 if (active && dayOk && this._inTimeRange(hhmm, start, end)) {
-                    shouldRun = true;
-                    break;
+                    const intervalActive =
+                        (await this.adapter.getStateAsync(`timecontrol.time${i}_interval_active`))?.val === true;
+
+                    if (!intervalActive) {
+                        shouldRun = true;
+                        continue;
+                    }
+
+                    intervalWindowActive = true;
+                    const intervalEvery = Number(
+                        (await this.adapter.getStateAsync(`timecontrol.time${i}_interval_every_min`))?.val,
+                    );
+                    const intervalRun = Number(
+                        (await this.adapter.getStateAsync(`timecontrol.time${i}_interval_run_min`))?.val,
+                    );
+                    const startMinutes = this._timeToMinutes(start);
+                    const intervalValid =
+                        startMinutes !== null &&
+                        Number.isFinite(intervalEvery) &&
+                        intervalEvery >= 10 &&
+                        intervalEvery <= 1440 &&
+                        Number.isFinite(intervalRun) &&
+                        intervalRun >= 5 &&
+                        intervalRun <= 1440 &&
+                        intervalRun <= intervalEvery;
+
+                    if (!intervalValid) {
+                        invalidIntervalExists = true;
+                        shouldRun = true;
+                        continue;
+                    }
+
+                    const elapsed = nowMinutes - startMinutes;
+                    const phase = elapsed % intervalEvery;
+                    if (phase < intervalRun) {
+                        shouldRun = true;
+                    } else {
+                        pausedIntervalExists = true;
+                    }
                 }
             }
 
+            let statusText = '';
+            if (invalidIntervalExists) {
+                statusText = I18n.translate('Invalid interval configuration');
+            } else if (shouldRun && pausedIntervalExists) {
+                statusText = I18n.translate('Another time window keeps the pump running');
+            } else if (intervalWindowActive) {
+                statusText = I18n.translate('Interval mode active');
+            } else if (shouldRun) {
+                statusText = I18n.translate('Time control active');
+            }
+            await this.adapter.setStateChangedAsync('timecontrol.status_text', { val: statusText, ack: true });
+
             // --- Sprachsignal für Zeitsteuerung setzen ---
             const oldVal = (await this.adapter.getStateAsync('speech.time_active'))?.val;
             if (oldVal !== shouldRun) {
@@ -107,6 +163,21 @@ const timeHelper = {
         return start <= now && now < end;
     },
 
+    _timeToMinutes(value) {
+        const match = /^(\d{2}):(\d{2})$/.exec(String(value || ''));
+        if (!match) {
+            return null;
+        }
+
+        const hours = Number(match[1]);
+        const minutes = Number(match[2]);
+        if (hours > 23 || minutes > 59) {
+            return null;
+        }
+
+        return hours * 60 + minutes;
+    },
+
     cleanup() {
         if (this.checkTimer) {
             this.adapter.clearInterval(this.checkTimer);

package/lib/i18n/de.json

@@ -381,5 +381,14 @@
   "circulation_plausibility_flow_warning": "Der berechnete Durchfluss ist im Verhältnis zur konfigurierten Nennförderleistung unplausibel hoch.",
   "circulation_plausibility_daily_total_jump_warning": "Das Tagesumwälzvolumen ist schneller gestiegen als physikalisch plausibel.",
   "circulation_plausibility_multiple_warnings": "Mehrere Plausibilitätswarnungen zur Umwälzberechnung sind aktiv.",
-  "circulation_plausibility_disabled": "Die Plausibilitätsprüfung der Umwälzberechnung ist deaktiviert."
+  "circulation_plausibility_disabled": "Die Plausibilitätsprüfung der Umwälzberechnung ist deaktiviert.",
+  "Pump is running within the normal range": "Pumpe läuft im Normalbereich",
+  "Pump is running below the normal range": "Pumpe läuft unterhalb des Normalbereichs",
+  "Pump is running above the normal range": "Pumpe läuft oberhalb des Normalbereichs",
+  "Pump is outside the known range": "Pumpe außerhalb des bekannten Bereichs",
+  "Pump learning values reset": "Pumpen-Lernwerte zurückgesetzt",
+  "Time control active": "Zeitsteuerung aktiv",
+  "Interval mode active": "Intervallbetrieb aktiv",
+  "Another time window keeps the pump running": "Ein anderes Zeitfenster hält die Pumpe in Betrieb",
+  "Invalid interval configuration": "Ungültige Intervallkonfiguration"
 }

package/lib/i18n/en.json

@@ -408,5 +408,14 @@
   "circulation_plausibility_flow_warning": "Calculated flow rate is implausibly high compared to the configured nominal flow.",
   "circulation_plausibility_daily_total_jump_warning": "Daily circulation volume increased faster than physically plausible.",
   "circulation_plausibility_multiple_warnings": "Multiple circulation plausibility warnings are active.",
-  "circulation_plausibility_disabled": "Circulation plausibility check is disabled."
+  "circulation_plausibility_disabled": "Circulation plausibility check is disabled.",
+  "Pump is running within the normal range": "Pump is running within the normal range",
+  "Pump is running below the normal range": "Pump is running below the normal range",
+  "Pump is running above the normal range": "Pump is running above the normal range",
+  "Pump is outside the known range": "Pump is outside the known range",
+  "Pump learning values reset": "Pump learning values reset",
+  "Time control active": "Time control active",
+  "Interval mode active": "Interval mode active",
+  "Another time window keeps the pump running": "Another time window keeps the pump running",
+  "Invalid interval configuration": "Invalid interval configuration"
 }

package/lib/i18n/es.json

@@ -404,6 +404,14 @@
   "circulation_plausibility_flow_warning": "El caudal calculado es excesivo en relación con el caudal nominal configurado.",
   "circulation_plausibility_daily_total_jump_warning": "El volumen diario de circulación ha aumentado más rápido de lo físicamente plausible.",
   "circulation_plausibility_multiple_warnings": "Hay varias advertencias de plausibilidad de circulación activas.",
-  "circulation_plausibility_disabled": "La comprobación de plausibilidad de la circulación está desactivada."
+  "circulation_plausibility_disabled": "La comprobación de plausibilidad de la circulación está desactivada.",
+  "Pump is running within the normal range": "La bomba funciona dentro del rango normal",
+  "Pump is running below the normal range": "La bomba funciona por debajo del rango normal",
+  "Pump is running above the normal range": "La bomba funciona por encima del rango normal",
+  "Pump is outside the known range": "La bomba está fuera del rango conocido",
+  "Pump learning values reset": "Valores de aprendizaje de la bomba restablecidos",
+  "Time control active": "Control horario activo",
+  "Interval mode active": "Modo de intervalo activo",
+  "Another time window keeps the pump running": "Otra franja horaria mantiene la bomba en funcionamiento",
+  "Invalid interval configuration": "Configuración de intervalo no válida"
 }
-

package/lib/i18n/fr.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "Le débit calculé est anormalement élevé par rapport au débit nominal configuré.",
   "circulation_plausibility_daily_total_jump_warning": "Le volume quotidien de circulation a augmenté plus rapidement que physiquement plausible.",
   "circulation_plausibility_multiple_warnings": "Plusieurs avertissements de plausibilité de circulation sont actifs.",
-  "circulation_plausibility_disabled": "La vérification de plausibilité de la circulation est désactivée."
+  "circulation_plausibility_disabled": "La vérification de plausibilité de la circulation est désactivée.",
+  "Pump is running within the normal range": "La pompe fonctionne dans la plage normale",
+  "Pump is running below the normal range": "La pompe fonctionne en dessous de la plage normale",
+  "Pump is running above the normal range": "La pompe fonctionne au-dessus de la plage normale",
+  "Pump is outside the known range": "La pompe est hors de la plage connue",
+  "Pump learning values reset": "Valeurs d’apprentissage de la pompe réinitialisées",
+  "Time control active": "Commande horaire active",
+  "Interval mode active": "Mode intervalle actif",
+  "Another time window keeps the pump running": "Une autre plage horaire maintient la pompe en marche",
+  "Invalid interval configuration": "Configuration d’intervalle non valide"
 }

package/lib/i18n/it.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "La portata calcolata è eccessivamente alta rispetto alla portata nominale configurata.",
   "circulation_plausibility_daily_total_jump_warning": "Il volume giornaliero di circolazione è aumentato più velocemente di quanto fisicamente plausibile.",
   "circulation_plausibility_multiple_warnings": "Sono attivi più avvisi di plausibilità della circolazione.",
-  "circulation_plausibility_disabled": "Il controllo di plausibilità della circolazione è disattivato."
+  "circulation_plausibility_disabled": "Il controllo di plausibilità della circolazione è disattivato.",
+  "Pump is running within the normal range": "La pompa funziona nell’intervallo normale",
+  "Pump is running below the normal range": "La pompa funziona al di sotto dell’intervallo normale",
+  "Pump is running above the normal range": "La pompa funziona al di sopra dell’intervallo normale",
+  "Pump is outside the known range": "La pompa è fuori dall’intervallo noto",
+  "Pump learning values reset": "Valori di apprendimento della pompa reimpostati",
+  "Time control active": "Controllo orario attivo",
+  "Interval mode active": "Modalità intervallo attiva",
+  "Another time window keeps the pump running": "Un’altra fascia oraria mantiene la pompa in funzione",
+  "Invalid interval configuration": "Configurazione dell’intervallo non valida"
 }

package/lib/i18n/nl.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "Het berekende debiet is onwaarschijnlijk hoog ten opzichte van het ingestelde nominale debiet.",
   "circulation_plausibility_daily_total_jump_warning": "Het dagelijkse circulatievolume is sneller gestegen dan fysiek plausibel.",
   "circulation_plausibility_multiple_warnings": "Er zijn meerdere waarschuwingen voor circulatie-plausibiliteit actief.",
-  "circulation_plausibility_disabled": "De plausibiliteitscontrole van de circulatie is uitgeschakeld."
+  "circulation_plausibility_disabled": "De plausibiliteitscontrole van de circulatie is uitgeschakeld.",
+  "Pump is running within the normal range": "De pomp draait binnen het normale bereik",
+  "Pump is running below the normal range": "De pomp draait onder het normale bereik",
+  "Pump is running above the normal range": "De pomp draait boven het normale bereik",
+  "Pump is outside the known range": "De pomp valt buiten het bekende bereik",
+  "Pump learning values reset": "Geleerde pompwaarden gereset",
+  "Time control active": "Tijdregeling actief",
+  "Interval mode active": "Intervalmodus actief",
+  "Another time window keeps the pump running": "Een ander tijdvenster houdt de pomp in werking",
+  "Invalid interval configuration": "Ongeldige intervalconfiguratie"
 }

package/lib/i18n/pl.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "Obliczony przepływ jest nienaturalnie wysoki względem skonfigurowanego przepływu nominalnego.",
   "circulation_plausibility_daily_total_jump_warning": "Dzienna objętość obiegu wzrosła szybciej niż jest to fizycznie możliwe.",
   "circulation_plausibility_multiple_warnings": "Aktywnych jest kilka ostrzeżeń dotyczących wiarygodności obiegu.",
-  "circulation_plausibility_disabled": "Kontrola wiarygodności obiegu jest wyłączona."
+  "circulation_plausibility_disabled": "Kontrola wiarygodności obiegu jest wyłączona.",
+  "Pump is running within the normal range": "Pompa pracuje w normalnym zakresie",
+  "Pump is running below the normal range": "Pompa pracuje poniżej normalnego zakresu",
+  "Pump is running above the normal range": "Pompa pracuje powyżej normalnego zakresu",
+  "Pump is outside the known range": "Pompa jest poza znanym zakresem",
+  "Pump learning values reset": "Wyuczone wartości pompy zresetowane",
+  "Time control active": "Sterowanie czasowe aktywne",
+  "Interval mode active": "Tryb interwałowy aktywny",
+  "Another time window keeps the pump running": "Inne okno czasowe podtrzymuje pracę pompy",
+  "Invalid interval configuration": "Nieprawidłowa konfiguracja interwału"
 }

package/lib/i18n/pt.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "O caudal calculado é excessivamente elevado em relação ao caudal nominal configurado.",
   "circulation_plausibility_daily_total_jump_warning": "O volume diário de circulação aumentou mais rapidamente do que seria fisicamente plausível.",
   "circulation_plausibility_multiple_warnings": "Existem vários avisos de plausibilidade da circulação ativos.",
-  "circulation_plausibility_disabled": "A verificação de plausibilidade da circulação está desativada."
+  "circulation_plausibility_disabled": "A verificação de plausibilidade da circulação está desativada.",
+  "Pump is running within the normal range": "A bomba está a funcionar dentro do intervalo normal",
+  "Pump is running below the normal range": "A bomba está a funcionar abaixo do intervalo normal",
+  "Pump is running above the normal range": "A bomba está a funcionar acima do intervalo normal",
+  "Pump is outside the known range": "A bomba está fora do intervalo conhecido",
+  "Pump learning values reset": "Valores aprendidos da bomba redefinidos",
+  "Time control active": "Controlo de tempo ativo",
+  "Interval mode active": "Modo de intervalo ativo",
+  "Another time window keeps the pump running": "Outra janela de tempo mantém a bomba em funcionamento",
+  "Invalid interval configuration": "Configuração de intervalo inválida"
 }

package/lib/i18n/ru.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "Расчётный поток слишком велик по сравнению с настроенным номинальным потоком.",
   "circulation_plausibility_daily_total_jump_warning": "Суточный объём циркуляции увеличился быстрее, чем это физически возможно.",
   "circulation_plausibility_multiple_warnings": "Активны несколько предупреждений проверки достоверности циркуляции.",
-  "circulation_plausibility_disabled": "Проверка достоверности циркуляции отключена."
+  "circulation_plausibility_disabled": "Проверка достоверности циркуляции отключена.",
+  "Pump is running within the normal range": "Насос работает в нормальном диапазоне",
+  "Pump is running below the normal range": "Насос работает ниже нормального диапазона",
+  "Pump is running above the normal range": "Насос работает выше нормального диапазона",
+  "Pump is outside the known range": "Насос вне известного диапазона",
+  "Pump learning values reset": "Обученные значения насоса сброшены",
+  "Time control active": "Управление по времени активно",
+  "Interval mode active": "Интервальный режим активен",
+  "Another time window keeps the pump running": "Другое временное окно поддерживает работу насоса",
+  "Invalid interval configuration": "Недопустимая конфигурация интервала"
 }

package/lib/i18n/uk.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "Розрахований потік надто високий відносно налаштованого номінального потоку.",
   "circulation_plausibility_daily_total_jump_warning": "Добовий обсяг циркуляції збільшився швидше, ніж це фізично можливо.",
   "circulation_plausibility_multiple_warnings": "Активні кілька попереджень перевірки правдоподібності циркуляції.",
-  "circulation_plausibility_disabled": "Перевірку правдоподібності циркуляції вимкнено."
+  "circulation_plausibility_disabled": "Перевірку правдоподібності циркуляції вимкнено.",
+  "Pump is running within the normal range": "Насос працює в нормальному діапазоні",
+  "Pump is running below the normal range": "Насос працює нижче нормального діапазону",
+  "Pump is running above the normal range": "Насос працює вище нормального діапазону",
+  "Pump is outside the known range": "Насос поза відомим діапазоном",
+  "Pump learning values reset": "Навчені значення насоса скинуто",
+  "Time control active": "Керування за часом активне",
+  "Interval mode active": "Інтервальний режим активний",
+  "Another time window keeps the pump running": "Інше часове вікно підтримує роботу насоса",
+  "Invalid interval configuration": "Неприпустима конфігурація інтервалу"
 }

package/lib/i18n/zh-cn.json

@@ -404,5 +404,14 @@
   "circulation_plausibility_flow_warning": "计算出的流量相对于配置的额定流量异常偏高。",
   "circulation_plausibility_daily_total_jump_warning": "每日循环量增长速度超过物理合理范围。",
   "circulation_plausibility_multiple_warnings": "存在多个循环合理性警告。",
-  "circulation_plausibility_disabled": "循环合理性检查已禁用。"
+  "circulation_plausibility_disabled": "循环合理性检查已禁用。",
+  "Pump is running within the normal range": "水泵在正常范围内运行",
+  "Pump is running below the normal range": "水泵低于正常范围运行",
+  "Pump is running above the normal range": "水泵高于正常范围运行",
+  "Pump is outside the known range": "水泵超出已知范围",
+  "Pump learning values reset": "水泵学习值已重置",
+  "Time control active": "时间控制已启用",
+  "Interval mode active": "间歇模式已启用",
+  "Another time window keeps the pump running": "另一个时间窗口使水泵保持运行",
+  "Invalid interval configuration": "间隔配置无效"
 }

package/lib/stateDefinitions/controlStates.js

@@ -390,6 +390,170 @@ async function createControlStates(adapter) {
             await adapter.setStateAsync('control.circulation.check_time', { val: '18:00', ack: true });
         }
 
+        // Temperaturabhängiger Umwälzfaktor
+        await adapter.setObjectNotExistsAsync('control.circulation.temperature_factor', {
+            type: 'channel',
+            common: {
+                name: {
+                    en: 'Temperature-dependent circulation factor',
+                    de: 'Temperaturabhaengiger Umwaelzfaktor',
+                },
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync('control.circulation.temperature_factor.enabled', {
+            type: 'state',
+            common: {
+                name: {
+                    en: 'Enable temperature-dependent circulation factor',
+                    de: 'Temperaturabhaengigen Umwaelzfaktor aktivieren',
+                },
+                desc: {
+                    en: 'Adds the configured factor to the daily circulation factor when the temperature threshold is reached',
+                    de: 'Addiert den eingestellten Faktor zum taeglichen Umwaelzfaktor, wenn die Temperaturschwelle erreicht ist',
+                },
+                type: 'boolean',
+                role: 'switch',
+                read: true,
+                write: true,
+                def: false,
+                persist: true,
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync('control.circulation.temperature_factor.sensor', {
+            type: 'state',
+            common: {
+                name: {
+                    en: 'Temperature sensor for circulation factor',
+                    de: 'Temperatursensor fuer Umwaelzfaktor',
+                },
+                desc: {
+                    en: 'Selects the temperature sensor used for the temperature-dependent circulation factor',
+                    de: 'Waehlt den Temperatursensor fuer den temperaturabhaengigen Umwaelzfaktor aus',
+                },
+                type: 'string',
+                role: 'level',
+                read: true,
+                write: true,
+                def: 'surface',
+                persist: true,
+                states: {
+                    surface: 'Surface',
+                    ground: 'Ground',
+                    flow: 'Flow',
+                    return: 'Return',
+                    collector: 'Collector',
+                    outside: 'Outside',
+                },
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync('control.circulation.temperature_factor.threshold_c', {
+            type: 'state',
+            common: {
+                name: { en: 'Temperature threshold', de: 'Temperaturschwelle' },
+                desc: {
+                    en: 'Temperature from which the additional circulation factor is applied',
+                    de: 'Temperatur, ab der der zusaetzliche Umwaelzfaktor angewendet wird',
+                },
+                type: 'number',
+                role: 'level.temperature',
+                unit: '°C',
+                read: true,
+                write: true,
+                def: 28,
+                min: -20,
+                max: 60,
+                step: 0.5,
+                persist: true,
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync('control.circulation.temperature_factor.add_factor', {
+            type: 'state',
+            common: {
+                name: { en: 'Additional circulation factor', de: 'Zusaetzlicher Umwaelzfaktor' },
+                desc: {
+                    en: 'Factor added to the base circulation factor when the temperature threshold is reached',
+                    de: 'Faktor, der beim Erreichen der Temperaturschwelle zum Basis-Umwaelzfaktor addiert wird',
+                },
+                type: 'number',
+                role: 'level',
+                unit: 'x',
+                read: true,
+                write: true,
+                def: 0.5,
+                min: 0,
+                max: 2.5,
+                step: 0.1,
+                persist: true,
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync('control.circulation.temperature_factor.active', {
+            type: 'state',
+            common: {
+                name: {
+                    en: 'Temperature-dependent circulation factor active',
+                    de: 'Temperaturabhaengiger Umwaelzfaktor aktiv',
+                },
+                desc: {
+                    en: 'Shows whether the additional temperature-dependent circulation factor is currently applied',
+                    de: 'Zeigt, ob der zusaetzliche temperaturabhaengige Umwaelzfaktor aktuell angewendet wird',
+                },
+                type: 'boolean',
+                role: 'indicator',
+                read: true,
+                write: false,
+                def: false,
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync('control.circulation.temperature_factor.status', {
+            type: 'state',
+            common: {
+                name: {
+                    en: 'Temperature-dependent circulation factor status',
+                    de: 'Status des temperaturabhaengigen Umwaelzfaktors',
+                },
+                desc: {
+                    en: 'Technical status of the temperature-dependent circulation factor',
+                    de: 'Technischer Status des temperaturabhaengigen Umwaelzfaktors',
+                },
+                type: 'string',
+                role: 'text',
+                read: true,
+                write: false,
+                def: 'disabled',
+            },
+            native: {},
+        });
+
+        const temperatureFactorDefaults = {
+            enabled: false,
+            sensor: 'surface',
+            threshold_c: 28,
+            add_factor: 0.5,
+            active: false,
+            status: 'disabled',
+        };
+        for (const [stateId, defaultValue] of Object.entries(temperatureFactorDefaults)) {
+            const existingState = await adapter.getStateAsync(`control.circulation.temperature_factor.${stateId}`);
+            if (existingState === null || existingState.val === null || existingState.val === undefined) {
+                await adapter.setStateAsync(`control.circulation.temperature_factor.${stateId}`, {
+                    val: defaultValue,
+                    ack: true,
+                });
+            }
+        }
+
         // letzter Bericht
         await adapter.setObjectNotExistsAsync('control.circulation.last_report', {
             type: 'state',

package/lib/stateDefinitions/generalStates.js

@@ -54,22 +54,113 @@ async function createGeneralStates(adapter) {
                 de: 'Min. Umwaelzung pro Tag',
             },
             desc: {
-                en: 'Configured minimum circulation count per day',
-                de: 'Konfigurierte minimale Umwaelzung pro Tag',
+                en: 'Effective minimum circulation count per day. The admin value is used only as an initial value if this state is empty or invalid.',
+                de: 'Wirksame minimale Umwaelzung pro Tag. Der Admin-Wert wird nur als Initialwert verwendet, wenn dieser State leer oder ungueltig ist.',
+            },
+            type: 'number',
+            role: 'value',
+            unit: 'x',
+            read: true,
+            write: true,
+            min: 0.5,
+            max: 3,
+            step: 0.5,
+            persist: true,
+        },
+        native: {},
+    });
+    await adapter.extendObjectAsync('general.min_circulation_per_day', {
+        common: {
+            write: true,
+            min: 0.5,
+            max: 3,
+            step: 0.5,
+            persist: true,
+        },
+    });
+
+    const normalizeMinCirculation = value => {
+        const num = Number(value);
+        return Number.isFinite(num) && num >= 0.5 && num <= 3 ? num : null;
+    };
+    const configMinCirculation = normalizeMinCirculation(adapter.config.min_circulation_per_day) ?? 1;
+    const existingMinCirculation = normalizeMinCirculation(
+        (await adapter.getStateAsync('general.min_circulation_per_day'))?.val,
+    );
+
+    if (existingMinCirculation === null) {
+        await adapter.setStateAsync('general.min_circulation_per_day', {
+            val: configMinCirculation,
+            ack: true,
+        });
+    }
+
+    await adapter.setObjectNotExistsAsync('general.min_circulation_effective_per_day', {
+        type: 'state',
+        common: {
+            name: {
+                en: 'Effective minimum circulation per day',
+                de: 'Wirksame minimale Umwaelzung pro Tag',
+            },
+            desc: {
+                en: 'Currently effective circulation factor including the optional temperature-dependent addition',
+                de: 'Aktuell wirksamer Umwaelzfaktor inklusive der optionalen temperaturabhaengigen Erhoehung',
             },
             type: 'number',
             role: 'value',
             unit: 'x',
             read: true,
             write: false,
+            def: configMinCirculation,
+            min: 0.5,
+            max: 3,
+            step: 0.1,
+            persist: true,
         },
         native: {},
     });
-    await adapter.setStateAsync('general.min_circulation_per_day', {
-        val: adapter.config.min_circulation_per_day,
-        ack: true,
+
+    await adapter.setObjectNotExistsAsync('general.min_circulation_effective_reason', {
+        type: 'state',
+        common: {
+            name: {
+                en: 'Reason for effective minimum circulation',
+                de: 'Grund fuer wirksame minimale Umwaelzung',
+            },
+            desc: {
+                en: 'Technical reason for the currently effective circulation factor',
+                de: 'Technischer Grund fuer den aktuell wirksamen Umwaelzfaktor',
+            },
+            type: 'string',
+            role: 'text',
+            read: true,
+            write: false,
+            def: 'base',
+        },
+        native: {},
     });
 
+    const existingEffectiveMinCirculation = await adapter.getStateAsync('general.min_circulation_effective_per_day');
+    if (
+        existingEffectiveMinCirculation === null ||
+        existingEffectiveMinCirculation.val === null ||
+        existingEffectiveMinCirculation.val === undefined
+    ) {
+        await adapter.setStateAsync('general.min_circulation_effective_per_day', {
+            val: existingMinCirculation ?? configMinCirculation,
+            ack: true,
+        });
+    }
+
+    const existingEffectiveReason = await adapter.getStateAsync('general.min_circulation_effective_reason');
+    if (
+        existingEffectiveReason === null ||
+        existingEffectiveReason.val === null ||
+        existingEffectiveReason.val === undefined
+    ) {
+        await adapter.setStateAsync('general.min_circulation_effective_reason', { val: 'base', ack: true });
+    }
+
     // Poolgröße (Liter)
     await adapter.setObjectNotExistsAsync('general.pool_size', {
         type: 'state',

package/lib/stateDefinitions/pumpStates3.js

@@ -332,6 +332,30 @@ async function createPumpStates3(adapter) {
         await adapter.setStateAsync('pump.learning.learning_cycles_total', { val: 0, ack: true });
     }
 
+    // ------------------------------------------------------
+    // Reset der Pumpen-Lernwerte
+    // ------------------------------------------------------
+    await adapter.setObjectNotExistsAsync('pump.learning.reset', {
+        type: 'state',
+        common: {
+            name: {
+                en: 'Reset pump learning values',
+                de: 'Pumpen-Lernwerte zurücksetzen',
+            },
+            desc: {
+                en: 'Resets the learned pump power and flow values after a pump change or incorrect learning. User settings and live values are kept.',
+                de: 'Setzt die gelernten Pumpen-Leistungs- und Durchflusswerte nach einem Pumpenwechsel oder falschen Lernwerten zurück. Nutzereinstellungen und Livewerte bleiben erhalten.',
+            },
+            type: 'boolean',
+            role: 'button',
+            read: true,
+            write: true,
+            def: false,
+            persist: false,
+        },
+        native: {},
+    });
+
     // ------------------------------------------------------
     // Log-Eintrag
     // ------------------------------------------------------