iobroker.poolcontrol 1.2.21 → 1.3.0

package/README.md

@@ -186,6 +186,21 @@ New features are added regularly – please refer to the changelog.
 - [help.md (detailed description and notes)](./help.md)
 
 ---
+### 1.3.0 (2026-04-16)
+
+- Added extended solar control (delta-based temperature logic)
+- Support for external actuator control (boolean/socket)
+- Standard / Extended solar mode selection
+- Priority and blocking logic (controlHelper, timeHelper, pump mode, season)
+- Improved status states (active, request, blocked, reason, info)
+- Added i18n support for solar extended status texts
+- Added selectable configuration for temperature source and control type
+
+### 1.2.22 (2026-04-16)
+
+- Added new read-only state `solar.request_active` to indicate when solar logic would request the pump
+- Improved solarHelper robustness by handling invalid temperature values
+
 ### 1.2.21 (2026-04-15)
 
 - Fixed photovoltaic afterrun timer restarting on every recalculation without PV surplus
@@ -204,15 +219,6 @@ Release: 10.04.2026
 - `photovoltaic.threshold_w` is now correctly synchronized with the instance configuration
 - Changes to the PV surplus threshold in adapter settings are now reliably reflected in the corresponding read-only datapoint
 
-### 1.2.18
-Release: 07.04.2026
-- Fixed persistence issue for `status.season_active` (no longer overwritten on adapter start)
-- Improved persistence for frost protection settings
-
-### 1.2.17
-Release: 07.04.2026
-- Fix: Resolved an issue where the pressure learning reset button did not trigger reliably. The pumpHelper4 now explicitly subscribes to its relevant internal states to ensure proper event handling.
-
 ## Support
 - [ioBroker Forum](https://forum.iobroker.net/)  
 - [GitHub Issues](https://github.com/DasBo1975/ioBroker.poolcontrol/issues)

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "poolcontrol",
-    "version": "1.2.21",
+    "version": "1.3.0",
     "news": {
+      "1.3.0": {
+        "en": "Added extended solar control with selectable standard/extended mode, delta-based control logic, external actuator support, priority/blocking handling, and localized status texts.",
+        "de": "Erweiterte Solarsteuerung ergänzt mit wählbarem Standard-/Extended-Modus, differenzbasierter Regelung, externer Aktor-Ansteuerung, Vorrang-/Blockierlogik und lokalisierten Statusmeldungen.",
+        "ru": "Добавлено расширенное управление солнечной батареей с возможностью выбора стандартного/расширенного режима, логикой управления на основе дельты, поддержкой внешнего исполнительного механизма, обработкой приоритета/блокировки и локализованными текстами состояния.",
+        "pt": "Adicionado controle solar estendido com modo padrão/estendido selecionável, lógica de controle baseada em delta, suporte a atuador externo, tratamento de prioridade/bloqueio e textos de status localizados.",
+        "nl": "Uitgebreide zonneregeling toegevoegd met selecteerbare standaard/uitgebreide modus, op delta gebaseerde besturingslogica, ondersteuning voor externe actuatoren, afhandeling van prioriteiten/blokkeringen en gelokaliseerde statusteksten.",
+        "fr": "Ajout d'un contrôle solaire étendu avec mode standard/étendu sélectionnable, logique de contrôle basée sur le delta, prise en charge d'actionneurs externes, gestion des priorités/blocages et textes d'état localisés.",
+        "it": "Aggiunto controllo solare esteso con modalità standard/estesa selezionabile, logica di controllo basata su delta, supporto per attuatori esterni, gestione priorità/blocco e testi di stato localizzati.",
+        "es": "Se agregó control solar extendido con modo estándar/extendido seleccionable, lógica de control basada en delta, soporte de actuador externo, manejo de prioridad/bloqueo y textos de estado localizados.",
+        "pl": "Dodano rozszerzone sterowanie solarne z możliwością wyboru trybu standardowego/rozszerzonego, logikę sterowania opartą na delta, obsługę zewnętrznych siłowników, obsługę priorytetów/blokowania i zlokalizowane teksty stanu.",
+        "uk": "Додано розширене керування геліосистемою з вибором стандартного/розширеного режиму, логікою керування на основі дельти, підтримкою зовнішнього приводу, обробкою пріоритетів/блокування та локалізованими текстами стану.",
+        "zh-cn": "添加了扩展太阳能控制，具有可选的标准/扩展模式、基于增量的控制逻辑、外部执行器支持、优先级/阻止处理和本地化状态文本。"
+      },
+      "1.2.22": {
+        "en": "Added new read-only state solar.request_active to indicate when solar logic would request the pump. Improved robustness of solarHelper by handling invalid temperature values.",
+        "de": "Neuer read-only Datenpunkt solar.request_active hinzugefügt, der anzeigt, wann die Solarlogik die Pumpe anfordern würde. Stabilität des solarHelpers verbessert durch Behandlung ungültiger Temperaturwerte.",
+        "ru": "Добавлено новое состояние Solar.request_active, доступное только для чтения, чтобы указать, когда солнечная логика запросит насос. Повышена надежность SolarHelper за счет обработки недопустимых значений температуры.",
+        "pt": "Adicionado novo estado somente leitura solar.request_active para indicar quando a lógica solar solicitaria a bomba. Robustez aprimorada do solarHelper ao lidar com valores de temperatura inválidos.",
+        "nl": "Nieuwe alleen-lezen status solar.request_active toegevoegd om aan te geven wanneer de zonnelogica de pomp zou aanvragen. Verbeterde robuustheid van solarHelper door ongeldige temperatuurwaarden te verwerken.",
+        "fr": "Ajout d'un nouvel état en lecture seule solar.request_active pour indiquer quand la logique solaire demanderait la pompe. Robustesse améliorée de solarHelper en gérant des valeurs de température invalides.",
+        "it": "Aggiunto nuovo stato di sola lettura solar.request_active per indicare quando la logica solare richiederebbe la pompa. Robustezza migliorata di solarHelper gestendo valori di temperatura non validi.",
+        "es": "Se agregó un nuevo estado de solo lectura solar.request_active para indicar cuándo la lógica solar solicitaría la bomba. Robustez mejorada de solarHelper al manejar valores de temperatura no válidos.",
+        "pl": "Dodano nowy stan tylko do odczytu solar.request_active, aby wskazać, kiedy logika solarna zażąda pompy. Poprawiona niezawodność solarHelper poprzez obsługę nieprawidłowych wartości temperatur.",
+        "uk": "Додано новий стан solar.request_active лише для читання, щоб вказати, коли сонячна логіка запитуватиме насос. Покращена надійність solarHelper завдяки обробці недійсних значень температури.",
+        "zh-cn": "添加了新的只读状态 Solar.request_active 以指示太阳能逻辑何时请求泵。通过处理无效温度值提高了 SolarHelper 的稳健性。"
+      },
       "1.2.21": {
         "en": "Bugfix: Fixed an issue in the photovoltaic helper where the afterrun timer was unintentionally restarted on every recalculation without PV surplus. This could delay the pump shutdown significantly. The afterrun now starts only once when surplus ends and runs reliably to completion. Also ensures proper cleanup when surplus becomes active again during afterrun.",
         "de": "Bugfix: Fehler im Photovoltaik-Helper behoben, bei dem der Nachlauf-Timer bei jedem Recalc ohne PV-Überschuss erneut gestartet wurde. Dadurch konnte sich das Abschalten der Pumpe stark verzögern. Der Nachlauf startet jetzt nur noch einmal beim Wegfall des Überschusses und läuft zuverlässig zu Ende. Zusätzlich wird der Nachlauf sauber beendet, wenn währenddessen wieder Überschuss vorhanden ist.",
@@ -41,32 +67,6 @@
         "pl": "Wydanie poprawek błędów. Rozwiązuje problem interakcji pomiędzy photovoltaicHelper i controlHelper, powodujący nieoczekiwane przerwanie automatycznego pompowania uzupełniającego. Logika zatrzymania fotowoltaiki uwzględnia teraz priorytet ControlHelper i nie zatrzymuje już pompy, gdy aktywne jest automatyczne pompowanie uzupełniające. Ponadto stan tylko do odczytu photovoltaic.threshold_w jest teraz poprawnie zsynchronizowany z konfiguracją instancji, dzięki czemu zmiany w ustawieniach adaptera są niezawodnie odzwierciedlane w widocznym punkcie danych.",
         "uk": "Реліз виправлення помилок. Вирішує проблему взаємодії між photovoltaicHelper і controlHelper, через яку автоматичне подальше відкачування може бути несподівано перервано. Логіка фотоелектричної зупинки тепер враховує пріоритет controlHelper і більше не зупиняє насос, поки активна автоматична подальша перекачування. Крім того, стан тільки для читання photovoltaic.threshold_w тепер правильно синхронізовано з конфігурацією екземпляра, щоб зміни в налаштуваннях адаптера надійно відображалися у видимій точці даних.",
         "zh-cn": "错误修复版本。修复了 PVHelper 和 controlHelper 之间的交互问题，其中自动后续泵送可能会意外中断。光伏停止逻辑现在尊重 controlHelper 优先级，并且在自动后续泵送处于活动状态时不再停止泵。此外，只读状态 PV.threshold_w 现在已与实例配置正确同步，以便适配器设置中的更改能够可靠地反映在可见数据点中。"
-      },
-      "1.2.18": {
-        "en": "Fixed persistence issues for season and frost states. Season_active is now no longer overwritten on adapter start. Frost protection settings are now stored persistently.",
-        "de": "Persistenzprobleme für Saison- und Frost-States behoben. season_active wird beim Adapterstart nicht mehr überschrieben. Frostschutz-Einstellungen werden nun dauerhaft gespeichert.",
-        "ru": "Исправлены проблемы с постоянством состояний сезона и заморозков. Season_active теперь больше не перезаписывается при запуске адаптера. Настройки защиты от замерзания теперь сохраняются постоянно.",
-        "pt": "Corrigidos problemas de persistência para estados sazonais e de geada. Season_active agora não é mais substituído na inicialização do adaptador. As configurações de proteção contra congelamento agora são armazenadas de forma persistente.",
-        "nl": "Vaste persistentieproblemen voor seizoens- en vorsttoestanden. Season_active wordt nu niet langer overschreven bij het starten van de adapter. De vorstbeveiligingsinstellingen worden nu permanent opgeslagen.",
-        "fr": "Correction de problèmes de persistance pour les états de saison et de gel. Season_active n’est désormais plus écrasé au démarrage de l’adaptateur. Les paramètres de protection contre le gel sont désormais stockés de manière persistante.",
-        "it": "Risolti i problemi di persistenza relativi alla stagione e agli stati di gelo. Season_active ora non viene più sovrascritto all'avvio dell'adattatore. Le impostazioni della protezione antigelo vengono ora memorizzate in modo persistente.",
-        "es": "Se corrigieron problemas de persistencia para los estados de temporada y heladas. Season_active ya no se sobrescribe al iniciar el adaptador. Los ajustes de protección contra heladas ahora se almacenan de forma persistente.",
-        "pl": "Naprawiono problemy z trwałością stanów pór roku i mrozu. Sezon_aktywny nie jest już nadpisywany podczas uruchamiania adaptera. Ustawienia ochrony przed zamarzaniem są teraz przechowywane trwale.",
-        "uk": "Виправлено проблеми стійкості для сезону та морозу. Season_active тепер більше не перезаписується під час запуску адаптера. Параметри захисту від замерзання тепер зберігаються постійно.",
-        "zh-cn": "修复了季节和霜冻状态的持久性问题。 Season_active 现在不再在适配器启动时被覆盖。防霜保护设置现在可以永久存储。"
-      },
-      "1.2.17": {
-        "en": "Fix: Resolved an issue where the pressure learning reset button did not trigger reliably. The pumpHelper4 now explicitly subscribes to its relevant internal states (e.g. reset and configuration values), ensuring proper event handling and immediate execution of the reset logic.",
-        "de": "Fix: Problem behoben, bei dem der Reset-Button für das Druck-Lernsystem nicht zuverlässig ausgelöst wurde. Der pumpHelper4 abonniert nun explizit die relevanten eigenen States (z. B. Reset und Konfigurationswerte), wodurch die Eventverarbeitung und die sofortige Ausführung der Reset-Logik sichergestellt sind.",
-        "ru": "Исправление: решена проблема, из-за которой кнопка сброса обучения давлению не срабатывала надежно. PumpHelper4 теперь явно подписывается на соответствующие внутренние состояния (например, значения сброса и конфигурации), обеспечивая правильную обработку событий и немедленное выполнение логики сброса.",
-        "pt": "Correção: Resolvido um problema em que o botão de redefinição do aprendizado de pressão não acionava de maneira confiável. O pumpHelper4 agora assina explicitamente seus estados internos relevantes (por exemplo, valores de redefinição e configuração), garantindo o tratamento adequado de eventos e a execução imediata da lógica de redefinição.",
-        "nl": "Oplossing: een probleem opgelost waarbij de resetknop voor het leren van de druk niet betrouwbaar werd geactiveerd. De pumpHelper4 onderschrijft nu expliciet de relevante interne statussen (bijvoorbeeld reset- en configuratiewaarden), waardoor een juiste afhandeling van gebeurtenissen en onmiddellijke uitvoering van de resetlogica wordt gegarandeerd.",
-        "fr": "Correction : Résolution d'un problème où le bouton de réinitialisation de l'apprentissage de la pression ne se déclenchait pas de manière fiable. Le PumpHelper4 s'abonne désormais explicitement à ses états internes pertinents (par exemple, les valeurs de réinitialisation et de configuration), garantissant une gestion appropriée des événements et l'exécution immédiate de la logique de réinitialisation.",
-        "it": "Correzione: risolto un problema per cui il pulsante di ripristino dell'apprendimento della pressione non si attivava in modo affidabile. Il pumpHelper4 ora sottoscrive esplicitamente i suoi stati interni rilevanti (ad esempio valori di ripristino e configurazione), garantendo la corretta gestione degli eventi e l'esecuzione immediata della logica di ripristino.",
-        "es": "Solución: se resolvió un problema por el cual el botón de reinicio del aprendizaje de presión no se activaba de manera confiable. El pumpHelper4 ahora se suscribe explícitamente a sus estados internos relevantes (por ejemplo, valores de reinicio y configuración), lo que garantiza un manejo adecuado de eventos y la ejecución inmediata de la lógica de reinicio.",
-        "pl": "Poprawka: rozwiązano problem polegający na tym, że przycisk resetowania uczenia się ciśnienia nie uruchamiał się niezawodnie. PumpHelper4 teraz jawnie subskrybuje swoje odpowiednie stany wewnętrzne (np. wartości resetowania i konfiguracji), zapewniając prawidłową obsługę zdarzeń i natychmiastowe wykonanie logiki resetowania.",
-        "uk": "Виправлення: вирішено проблему, через яку кнопка скидання навчання тиску не спрацьовувала надійно. PumpHelper4 тепер явно підписується на свої відповідні внутрішні стани (наприклад, значення скидання та конфігурації), забезпечуючи правильну обробку подій і негайне виконання логіки скидання.",
-        "zh-cn": "修复：解决了压力学习重置按钮无法可靠触发的问题。 PumpHelper4 现在显式订阅其相关的内部状态（例如重置和配置值），确保正确的事件处理和立即执行重置逻辑。"
       }
     },
     "titleLang": {

package/lib/helpers/solarExtendedHelper.js

@@ -0,0 +1,285 @@
+'use strict';
+
+const { I18n } = require('@iobroker/adapter-core');
+
+/**
+ * solarExtendedHelper
+ * - Prüft die Temperaturdifferenz zwischen Kollektor und Pooltemperatur
+ * - Nutzt States aus solarExtendedStates.js und temperatureStates.js
+ * - Bewertet nur die logische Anforderung und Status-/Info-States
+ * - Schaltet den externen Aktor gemäß Konfiguration
+ * - Berücksichtigt Invertierung und Aktorstatus
+ */
+
+const solarExtendedHelper = {
+    adapter: null,
+    checkTimer: null,
+
+    init(adapter) {
+        this.adapter = adapter;
+
+        // Minütlicher Check
+        this._scheduleCheck();
+
+        this.adapter.log.debug('[solarExtendedHelper] Initialized (check every 60s)');
+    },
+
+    _scheduleCheck() {
+        if (this.checkTimer) {
+            clearInterval(this.checkTimer);
+        }
+
+        this.checkTimer = setInterval(() => this._checkSolarExtended(), 60 * 1000);
+        // Beim Start sofort prüfen
+        this._checkSolarExtended();
+    },
+
+    async _checkSolarExtended() {
+        try {
+            const activeHelper = (await this.adapter.getStateAsync('pump.active_helper'))?.val || '';
+            const seasonActive = (await this.adapter.getStateAsync('status.season_active'))?.val;
+            const masterActive = (await this.adapter.getStateAsync('solar.solar_control_active'))?.val;
+            const controlMode = (await this.adapter.getStateAsync('solar.control_mode'))?.val || 'standard';
+            const pumpMode = (await this.adapter.getStateAsync('pump.mode'))?.val;
+
+            const deltaOn = Number((await this.adapter.getStateAsync('solar.extended.delta_on'))?.val);
+            const deltaOff = Number((await this.adapter.getStateAsync('solar.extended.delta_off'))?.val);
+            const maxTemperature = Number((await this.adapter.getStateAsync('solar.extended.max_temperature'))?.val);
+            const poolTemperatureSource = (await this.adapter.getStateAsync('solar.extended.pool_temperature_source'))
+                ?.val;
+            const controlObjectId = (await this.adapter.getStateAsync('solar.extended.control_object_id'))?.val || '';
+            const controlType = (await this.adapter.getStateAsync('solar.extended.control_type'))?.val || '';
+            const controlInverted = (await this.adapter.getStateAsync('solar.extended.control_inverted'))?.val === true;
+
+            const oldEnabledByMaster = (await this.adapter.getStateAsync('solar.extended.enabled_by_master'))?.val;
+            const oldRequestActive = (await this.adapter.getStateAsync('solar.extended.request_active'))?.val;
+            const oldActive = (await this.adapter.getStateAsync('solar.extended.active'))?.val;
+            const oldBlocked = (await this.adapter.getStateAsync('solar.extended.blocked'))?.val;
+            const oldBlockedBy = (await this.adapter.getStateAsync('solar.extended.blocked_by'))?.val;
+            const oldPriorityStatus = (await this.adapter.getStateAsync('solar.extended.priority_status'))?.val;
+            const oldConfigOk = (await this.adapter.getStateAsync('solar.extended.config_ok'))?.val;
+            const oldActorState = (await this.adapter.getStateAsync('solar.extended.actor_state'))?.val;
+            const oldReason = (await this.adapter.getStateAsync('solar.extended.reason'))?.val;
+            const oldInfo = (await this.adapter.getStateAsync('solar.extended.info'))?.val;
+
+            const enabledByMaster = masterActive === true;
+            const isExtendedMode = controlMode === 'extended';
+            const isControlPriority = activeHelper === 'controlHelper';
+            const isTimePriority = activeHelper === 'timeHelper';
+            const actorConfigOk = controlObjectId !== '' && (controlType === 'boolean' || controlType === 'socket');
+
+            let configOk = false;
+            let requestActive = false;
+            let active = false;
+            let blocked = false;
+            let blockedBy = '';
+            let priorityStatus = '';
+            let reason = '';
+            let info = '';
+            let actorState = false;
+            let actorWriteValue = false;
+
+            if (
+                Number.isFinite(deltaOn) &&
+                Number.isFinite(deltaOff) &&
+                Number.isFinite(maxTemperature) &&
+                deltaOn >= deltaOff &&
+                maxTemperature > 0 &&
+                (poolTemperatureSource === 'surface' || poolTemperatureSource === 'ground') &&
+                actorConfigOk
+            ) {
+                configOk = true;
+            }
+
+            if (!configOk) {
+                blocked = true;
+                blockedBy = 'invalid_config';
+                priorityStatus = I18n.translate('extended blocked by invalid config');
+                reason = I18n.translate('Extended solar configuration invalid');
+                info = I18n.translate('Solar Extended configuration invalid');
+            } else if (isControlPriority) {
+                blocked = true;
+                blockedBy = 'controlHelper';
+                priorityStatus = I18n.translate('extended blocked by controlHelper');
+                reason = I18n.translate('Priority blocked by controlHelper');
+                info = I18n.translate('Solar Extended blocked by controlHelper');
+            } else if (isTimePriority) {
+                blocked = true;
+                blockedBy = 'timeHelper';
+                priorityStatus = I18n.translate('extended blocked by timeHelper');
+                reason = I18n.translate('Priority blocked by timeHelper');
+                info = I18n.translate('Solar Extended blocked by timeHelper');
+            } else if (!enabledByMaster) {
+                blocked = true;
+                blockedBy = 'master_disabled';
+                priorityStatus = I18n.translate('extended blocked by master');
+                reason = I18n.translate('Solar master disabled');
+                info = I18n.translate('Solar Extended disabled by main solar switch');
+            } else if (!isExtendedMode) {
+                blocked = true;
+                blockedBy = 'mode_standard';
+                priorityStatus = I18n.translate('extended blocked by standard mode');
+                reason = I18n.translate('Solar control mode is %s', controlMode);
+                info = I18n.translate('Solar Extended inactive because standard solar mode is selected');
+            } else if (!seasonActive) {
+                blocked = true;
+                blockedBy = 'season_inactive';
+                priorityStatus = I18n.translate('extended blocked by inactive season');
+                reason = I18n.translate('Season inactive');
+                info = I18n.translate('Solar Extended inactive because the season is disabled');
+            } else if (pumpMode !== 'auto') {
+                blocked = true;
+                blockedBy = 'pump_mode_not_auto';
+                priorityStatus = I18n.translate('extended blocked by pump mode');
+                reason = I18n.translate('Pump mode is %s', pumpMode);
+                info = I18n.translate('Solar Extended inactive because pump mode is not auto');
+            } else {
+                const collector = Number((await this.adapter.getStateAsync('temperature.collector.current'))?.val);
+                const poolStateId =
+                    poolTemperatureSource === 'ground' ? 'temperature.ground.current' : 'temperature.surface.current';
+                const pool = Number((await this.adapter.getStateAsync(poolStateId))?.val);
+
+                if (!Number.isFinite(collector) || !Number.isFinite(pool)) {
+                    requestActive = false;
+                    active = false;
+                    priorityStatus = I18n.translate('extended waiting for temperatures');
+                    reason = I18n.translate('No valid temperature values available');
+                    info = I18n.translate('Solar Extended waiting for valid temperature values');
+                    this.adapter.log.debug('[solarExtendedHelper] No valid temperatures available');
+                } else {
+                    const delta = collector - pool;
+                    if (delta >= deltaOn && pool < maxTemperature) {
+                        requestActive = true;
+                    }
+
+                    if (delta <= deltaOff || pool >= maxTemperature) {
+                        requestActive = false;
+                    }
+
+                    if (pool >= maxTemperature) {
+                        reason = I18n.translate('Pool temperature >= max temperature (%s >= %s)', pool, maxTemperature);
+                        info = I18n.translate('Solar Extended inactive because maximum pool temperature is reached');
+                    } else if (requestActive) {
+                        reason = I18n.translate('Collector delta >= delta_on (%s >= %s)', delta.toFixed(2), deltaOn);
+                        info = I18n.translate('Solar Extended requests heating from collector surplus');
+                    } else {
+                        reason = I18n.translate('Collector delta <= delta_off (%s <= %s)', delta.toFixed(2), deltaOff);
+                        info = I18n.translate('Solar Extended currently has no temperature request');
+                    }
+
+                    this.adapter.log.debug(
+                        `[solarExtendedHelper] Extended solar ${requestActive ? 'ON' : 'OFF'} (Collector=${collector}°C, Pool=${pool}°C, Delta=${delta.toFixed(2)}°C, Source=${poolTemperatureSource})`,
+                    );
+                }
+            }
+
+            actorWriteValue = requestActive;
+            if (controlInverted) {
+                actorWriteValue = !actorWriteValue;
+            }
+
+            if (actorConfigOk) {
+                try {
+                    await this.adapter.setForeignStateAsync(controlObjectId, actorWriteValue, false);
+                    actorState = actorWriteValue;
+
+                    if (!blocked) {
+                        active = requestActive;
+                        if (priorityStatus === '') {
+                            priorityStatus = requestActive
+                                ? I18n.translate('extended active')
+                                : I18n.translate('extended inactive');
+                        }
+                    }
+                } catch (err) {
+                    blocked = true;
+                    blockedBy = 'actor_write_error';
+                    priorityStatus = I18n.translate('extended blocked by actor write error');
+                    reason = I18n.translate('Actor write failed: %s', err.message);
+                    info = I18n.translate('Solar Extended could not write to the external actuator');
+                    actorState = false;
+                    active = false;
+                    this.adapter.log.warn(`[solarExtendedHelper] Error writing actor state: ${err.message}`);
+                }
+            } else {
+                actorState = false;
+                active = false;
+            }
+
+            await this.adapter.setStateChangedAsync('solar.extended.enabled_by_master', {
+                val: enabledByMaster,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.request_active', {
+                val: requestActive,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.active', {
+                val: active,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.blocked', {
+                val: blocked,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.blocked_by', {
+                val: blockedBy,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.priority_status', {
+                val: priorityStatus,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.config_ok', {
+                val: configOk,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.actor_state', {
+                val: actorState,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.reason', {
+                val: reason,
+                ack: true,
+            });
+            await this.adapter.setStateChangedAsync('solar.extended.info', {
+                val: info,
+                ack: true,
+            });
+
+            const statusChanged =
+                oldEnabledByMaster !== enabledByMaster ||
+                oldRequestActive !== requestActive ||
+                oldActive !== active ||
+                oldBlocked !== blocked ||
+                oldBlockedBy !== blockedBy ||
+                oldPriorityStatus !== priorityStatus ||
+                oldConfigOk !== configOk ||
+                oldActorState !== actorState ||
+                oldReason !== reason ||
+                oldInfo !== info;
+
+            if (statusChanged) {
+                await this.adapter.setStateChangedAsync('solar.extended.last_change', {
+                    val: Date.now(),
+                    ack: true,
+                });
+            }
+
+            if (blocked) {
+                this.adapter.log.debug(`[solarExtendedHelper] Extended solar skipped (${blockedBy || 'blocked'})`);
+            }
+        } catch (err) {
+            this.adapter.log.warn(`[solarExtendedHelper] Error in check: ${err.message}`);
+        }
+    },
+
+    cleanup() {
+        if (this.checkTimer) {
+            clearInterval(this.checkTimer);
+            this.checkTimer = null;
+        }
+    },
+};
+
+module.exports = solarExtendedHelper;

package/lib/helpers/solarHelper.js

@@ -32,17 +32,25 @@ const solarHelper = {
 
     async _checkSolar() {
         try {
-            // --- NEU: Vorrangprüfung durch ControlHelper ---
             const activeHelper = (await this.adapter.getStateAsync('pump.active_helper'))?.val || '';
+            const isExternalPriority = activeHelper === 'controlHelper' || activeHelper === 'timeHelper';
+
+            // --- NEU: Vorrangprüfung durch ControlHelper ---
             if (activeHelper === 'controlHelper') {
+                await this.adapter.setStateChangedAsync('solar.request_active', {
+                    val: false,
+                    ack: true,
+                });
                 this.adapter.log.debug('[solarHelper] Priority by ControlHelper active – solar control paused.');
-                return;
             }
 
             // --- NEU: Vorrangprüfung durch TimeHelper ---
             if (activeHelper === 'timeHelper') {
+                await this.adapter.setStateChangedAsync('solar.request_active', {
+                    val: false,
+                    ack: true,
+                });
                 this.adapter.log.debug('[solarHelper] Priority by TimeHelper active – solar control paused.');
-                return;
             }
 
             // --- NEU: Saisonstatus ---
@@ -51,6 +59,9 @@ const solarHelper = {
             // Solarsteuerung aktiv?
             const active = (await this.adapter.getStateAsync('solar.solar_control_active'))?.val;
 
+            // NEU: Solarsteuerungsmodus
+            const controlMode = (await this.adapter.getStateAsync('solar.control_mode'))?.val || 'standard';
+
             // Pumpenmodus
             const mode = (await this.adapter.getStateAsync('pump.mode'))?.val;
 
@@ -63,13 +74,31 @@ const solarHelper = {
             const collector = Number((await this.adapter.getStateAsync('temperature.collector.current'))?.val);
             const pool = Number((await this.adapter.getStateAsync('temperature.surface.current'))?.val); // Oberfläche = Pooltemp
 
-            if (collector == null || pool == null) {
+            // NEU: Absicherung gegen ungültige Werte
+            if (isNaN(collector) || isNaN(pool)) {
+                await this.adapter.setStateChangedAsync('solar.request_active', {
+                    val: false,
+                    ack: true,
+                });
                 this.adapter.log.debug('[solarHelper] No valid temperatures available');
                 return;
             }
 
+            // NEU: Standard-Solar nur ausführen, wenn control_mode = standard
+            const isStandardMode = controlMode === 'standard';
+
+            if (!isStandardMode) {
+                await this.adapter.setStateChangedAsync('solar.request_active', {
+                    val: false,
+                    ack: true,
+                });
+                this.adapter.log.debug(
+                    `[solarHelper] Standard solar paused because solar.control_mode = ${controlMode}`,
+                );
+            }
+
             // --- Schaltlogik nur ausführen, wenn Saison aktiv, Solar aktiv und Modus AUTO ---
-            if (season && active && mode === 'auto') {
+            if (season && active && mode === 'auto' && isStandardMode && !isExternalPriority) {
                 let shouldRun = false;
                 const delta = collector - pool;
 
@@ -96,6 +125,10 @@ const solarHelper = {
                         ack: true,
                     });
                 }
+                await this.adapter.setStateChangedAsync('solar.request_active', {
+                    val: shouldRun,
+                    ack: true,
+                });
 
                 // ZENTRAL: Pumpe über Bool-Schalter setzen
                 await this.adapter.setStateChangedAsync('pump.pump_switch', {
@@ -107,14 +140,23 @@ const solarHelper = {
                     `[solarHelper] Solar control → pump ${shouldRun ? 'ON' : 'OFF'} (Collector=${collector}°C, Pool=${pool}°C, Delta=${delta}°C)`,
                 );
             } else {
+                await this.adapter.setStateChangedAsync('solar.request_active', {
+                    val: false,
+                    ack: true,
+                });
+
                 // Keine Schaltung – Grund protokollieren
                 const reason = !season
                     ? 'Saison inaktiv'
                     : !active
                       ? 'Solarsteuerung aus'
-                      : mode !== 'auto'
-                        ? 'Pumpenmodus != auto'
-                        : 'unbekannt';
+                      : !isStandardMode
+                        ? `Solarmodus = ${controlMode}`
+                        : isExternalPriority
+                          ? `Vorrang durch ${activeHelper}`
+                          : mode !== 'auto'
+                            ? 'Pumpenmodus != auto'
+                            : 'unbekannt';
                 this.adapter.log.debug(`[solarHelper] Solar control skipped (${reason})`);
             }
 

package/lib/i18n/de.json

@@ -65,5 +65,41 @@
   "Then let the filter run patiently until the water becomes clear again.": "Dann geduldig filtern lassen, bis das Wasser wieder klar ist.",
 
   "Note: This problem is not known yet.": "Hinweis: Dieses Problem ist noch nicht bekannt.",
-  "Please select one of the existing items or use \"Issue unclear / not specific\".": "Bitte einen vorhandenen Punkt auswählen oder \"Problem unklar\" nutzen."
+  "Please select one of the existing items or use \"Issue unclear / not specific\".": "Bitte einen vorhandenen Punkt auswählen oder \"Problem unklar\" nutzen.",
+
+  "Extended solar configuration invalid": "Konfiguration der erweiterten Solarsteuerung ungültig",
+  "Solar Extended configuration invalid": "Konfiguration von Solar Extended ungültig",
+  "Priority blocked by controlHelper": "Durch controlHelper blockiert",
+  "Solar Extended blocked by controlHelper": "Solar Extended durch controlHelper blockiert",
+  "Priority blocked by timeHelper": "Durch timeHelper blockiert",
+  "Solar Extended blocked by timeHelper": "Solar Extended durch timeHelper blockiert",
+  "Solar master disabled": "Solar-Hauptschalter deaktiviert",
+  "Solar Extended disabled by main solar switch": "Solar Extended durch den Hauptschalter deaktiviert",
+  "Solar control mode is %s": "Solarsteuerungsmodus ist %s",
+  "Solar Extended inactive because standard solar mode is selected": "Solar Extended ist inaktiv, weil Standard-Solar ausgewählt ist",
+  "Season inactive": "Saison inaktiv",
+  "Solar Extended inactive because the season is disabled": "Solar Extended ist inaktiv, weil die Saison deaktiviert ist",
+  "Pump mode is %s": "Pumpenmodus ist %s",
+  "Solar Extended inactive because pump mode is not auto": "Solar Extended ist inaktiv, weil der Pumpenmodus nicht auf Auto steht",
+  "No valid temperature values available": "Keine gültigen Temperaturwerte verfügbar",
+  "Solar Extended waiting for valid temperature values": "Solar Extended wartet auf gültige Temperaturwerte",
+  "Pool temperature >= max temperature (%s >= %s)": "Pooltemperatur >= Maximaltemperatur (%s >= %s)",
+  "Solar Extended inactive because maximum pool temperature is reached": "Solar Extended ist inaktiv, weil die maximale Pooltemperatur erreicht ist",
+  "Collector delta >= delta_on (%s >= %s)": "Kollektor-Differenz >= delta_on (%s >= %s)",
+  "Solar Extended requests heating from collector surplus": "Solar Extended fordert Heizung durch Kollektorüberschuss an",
+  "Collector delta <= delta_off (%s <= %s)": "Kollektor-Differenz <= delta_off (%s <= %s)",
+  "Solar Extended currently has no temperature request": "Solar Extended hat aktuell keine Temperaturanforderung",
+  "Actor write failed: %s": "Schreiben auf den Aktor fehlgeschlagen: %s",
+  "Solar Extended could not write to the external actuator": "Solar Extended konnte nicht auf den externen Aktor schreiben",
+  "extended blocked by invalid config": "Extended durch ungültige Konfiguration blockiert",
+  "extended blocked by controlHelper": "Extended durch controlHelper blockiert",
+  "extended blocked by timeHelper": "Extended durch timeHelper blockiert",
+  "extended blocked by master": "Extended durch Hauptschalter blockiert",
+  "extended blocked by standard mode": "Extended durch Standard-Modus blockiert",
+  "extended blocked by inactive season": "Extended durch inaktive Saison blockiert",
+  "extended blocked by pump mode": "Extended durch Pumpenmodus blockiert",
+  "extended waiting for temperatures": "Extended wartet auf Temperaturen",
+  "extended blocked by actor write error": "Extended durch Aktor-Schreibfehler blockiert",
+  "extended active": "Extended aktiv",
+  "extended inactive": "Extended inaktiv"
 }

package/lib/i18n/en.json

@@ -137,5 +137,41 @@
   "Odor / irritation is often not too much chlorine, but incorrectly bound / organically loaded water.": "Odor / irritation is often not too much chlorine, but incorrectly bound / organically loaded water.",
 
   "Note: This problem is not known yet.": "Note: This problem is not known yet.",
-  "Please select one of the existing items or use \"Issue unclear / not specific\".": "Please select one of the existing items or use \"Issue unclear / not specific\"."
+  "Please select one of the existing items or use \"Issue unclear / not specific\".": "Please select one of the existing items or use \"Issue unclear / not specific\".",
+
+  "Extended solar configuration invalid": "Extended solar configuration invalid",
+  "Solar Extended configuration invalid": "Solar Extended configuration invalid",
+  "Priority blocked by controlHelper": "Priority blocked by controlHelper",
+  "Solar Extended blocked by controlHelper": "Solar Extended blocked by controlHelper",
+  "Priority blocked by timeHelper": "Priority blocked by timeHelper",
+  "Solar Extended blocked by timeHelper": "Solar Extended blocked by timeHelper",
+  "Solar master disabled": "Solar master disabled",
+  "Solar Extended disabled by main solar switch": "Solar Extended disabled by main solar switch",
+  "Solar control mode is %s": "Solar control mode is %s",
+  "Solar Extended inactive because standard solar mode is selected": "Solar Extended inactive because standard solar mode is selected",
+  "Season inactive": "Season inactive",
+  "Solar Extended inactive because the season is disabled": "Solar Extended inactive because the season is disabled",
+  "Pump mode is %s": "Pump mode is %s",
+  "Solar Extended inactive because pump mode is not auto": "Solar Extended inactive because pump mode is not auto",
+  "No valid temperature values available": "No valid temperature values available",
+  "Solar Extended waiting for valid temperature values": "Solar Extended waiting for valid temperature values",
+  "Pool temperature >= max temperature (%s >= %s)": "Pool temperature >= max temperature (%s >= %s)",
+  "Solar Extended inactive because maximum pool temperature is reached": "Solar Extended inactive because maximum pool temperature is reached",
+  "Collector delta >= delta_on (%s >= %s)": "Collector delta >= delta_on (%s >= %s)",
+  "Solar Extended requests heating from collector surplus": "Solar Extended requests heating from collector surplus",
+  "Collector delta <= delta_off (%s <= %s)": "Collector delta <= delta_off (%s <= %s)",
+  "Solar Extended currently has no temperature request": "Solar Extended currently has no temperature request",
+  "Actor write failed: %s": "Actor write failed: %s",
+  "Solar Extended could not write to the external actuator": "Solar Extended could not write to the external actuator",
+  "extended blocked by invalid config": "extended blocked by invalid config",
+  "extended blocked by controlHelper": "extended blocked by controlHelper",
+  "extended blocked by timeHelper": "extended blocked by timeHelper",
+  "extended blocked by master": "extended blocked by master",
+  "extended blocked by standard mode": "extended blocked by standard mode",
+  "extended blocked by inactive season": "extended blocked by inactive season",
+  "extended blocked by pump mode": "extended blocked by pump mode",
+  "extended waiting for temperatures": "extended waiting for temperatures",
+  "extended blocked by actor write error": "extended blocked by actor write error",
+  "extended active": "extended active",
+  "extended inactive": "extended inactive"
 }