iobroker.poolcontrol 1.2.22 → 1.3.1

package/README.md

@@ -186,6 +186,25 @@ New features are added regularly – please refer to the changelog.
 - [help.md (detailed description and notes)](./help.md)
 
 ---
+
+## Changelog
+### 1.3.1 (2026-04-17)
+
+- Fix: Solar Extended now correctly controls the pump
+- Fix: Integrated Solar Extended into existing solar status handling via `speech.solar_active`
+- Improvement: Consistent pump status display for Solar and Solar Extended
+- Minor bug fixes and internal optimizations
+
+### 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
@@ -201,19 +220,6 @@ New features are added regularly – please refer to the changelog.
 Release: 11.04.2026
 - (DasBo) Reduced unnecessary state writes in status and photovoltaic helpers. Summary and PV timestamps are now only updated when the functional result actually changes, making the adapter quieter without affecting existing logic.
 
-### 1.2.19
-Release: 10.04.2026
-- Fixed an interaction issue between `photovoltaicHelper` and `controlHelper` where automatic follow-up pumping could be stopped unexpectedly
-- photovoltaicHelper now respects controlHelper priority and no longer stops the pump while automatic follow-up pumping is active
-- Fixed an issue where `controlHelper` could remain in "nachpumpen" state if the pump was stopped externally
-- `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
-
 ## 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.22",
+    "version": "1.3.1",
     "news": {
+      "1.3.1": {
+        "en": "Fix: Solar Extended now correctly controls the pump and integrates with existing solar status handling. The helper now uses speech.solar_active like the standard solar logic, ensuring consistent pump status display and behavior. Minor fixes and optimizations.",
+        "de": "Fix: Solar Extended steuert jetzt korrekt die Pumpe und ist sauber in die bestehende Solar-Statuslogik integriert. Der Helper nutzt nun wie die Standard-Solarsteuerung den State speech.solar_active, wodurch Anzeige und Verhalten der Pumpe konsistent sind. Kleine Fehlerbehebungen und Optimierungen.",
+        "ru": "Исправление: Solar Extended теперь правильно управляет насосом и интегрируется с существующей системой обработки состояния солнечной энергии. Помощник теперь использует voice.solar_active как стандартную логику Solar, обеспечивая единообразное отображение состояния и поведения насоса. Мелкие исправления и оптимизации.",
+        "pt": "Correção: o Solar Extended agora controla corretamente a bomba e se integra ao tratamento do status solar existente. O auxiliar agora usa Speech.solar_active como a lógica solar padrão, garantindo exibição e comportamento consistentes do status da bomba. Pequenas correções e otimizações.",
+        "nl": "Oplossing: Solar Extended bestuurt de pomp nu correct en integreert met bestaande zonnestatusafhandeling. De helper gebruikt nu speech.solar_active zoals de standaard zonnelogica, waardoor een consistente weergave en gedrag van de pompstatus wordt gegarandeerd. Kleine reparaties en optimalisaties.",
+        "fr": "Correctif : Solar Extended contrôle désormais correctement la pompe et s'intègre à la gestion de l'état solaire existante. L'assistant utilise désormais Speech.solar_active comme la logique solaire standard, garantissant un affichage et un comportement cohérents de l'état de la pompe. Corrections mineures et optimisations.",
+        "it": "Correzione: Solar Extended ora controlla correttamente la pompa e si integra con la gestione dello stato solare esistente. L'helper ora utilizza Speech.solar_active come la logica solare standard, garantendo una visualizzazione e un comportamento coerenti dello stato della pompa. Correzioni e ottimizzazioni minori.",
+        "es": "Solución: Solar Extended ahora controla correctamente la bomba y se integra con el manejo del estado solar existente. El asistente ahora utiliza Speech.solar_active como la lógica solar estándar, lo que garantiza una visualización y un comportamiento consistentes del estado de la bomba. Correcciones y optimizaciones menores.",
+        "pl": "Poprawka: Solar Extended teraz poprawnie steruje pompą i integruje się z istniejącą obsługą stanu solarnego. Pomocnik używa teraz mowy.solar_active jak standardowej logiki solarnej, zapewniając spójne wyświetlanie stanu i zachowanie pompy. Drobne poprawki i optymalizacje.",
+        "uk": "Виправлення: Solar Extended тепер правильно керує насосом та інтегрується з існуючою обробкою стану сонячної енергії. Помічник тепер використовує speak.solar_active як стандартну сонячну логіку, забезпечуючи послідовне відображення стану насоса та поведінку. Незначні виправлення та оптимізації.",
+        "zh-cn": "修复：Solar Extended 现在可以正确控制泵并与现有的太阳能状态处理集成。助手现在像标准太阳能逻辑一样使用pepe.solar_active，确保一致的泵状态显示和行为。小修复和优化。"
+      },
+      "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.",
@@ -41,32 +67,6 @@
         "pl": "Wydanie poprawek błędów. Redukcja zbędnych zapisów stanu w statusie i pomocnikach fotowoltaicznych. Sumaryczne znaczniki czasu i znaczniki czasu aktualizacji PV są teraz zapisywane tylko wtedy, gdy faktycznie zmienia się powiązany wynik funkcjonalny. Dzięki temu adapter jest zauważalnie cichszy i pozwala uniknąć niepotrzebnych aktualizacji stanu bez zmiany istniejącej logiki sterowania.",
         "uk": "Реліз виправлення помилок. Зменшено непотрібні записи стану в статусі та фотоелектричні помічники. Підсумкові мітки часу та мітки часу оновлення PV тепер записуються лише тоді, коли відповідний функціональний результат фактично змінюється. Це робить адаптер помітно тихішим і дозволяє уникнути непотрібних оновлень стану без зміни існуючої логіки керування.",
         "zh-cn": "错误修复版本。减少状态和光伏助手中不必要的状态写入。摘要时间戳和 PV 更新时间戳现在仅在相关功能结果实际更改时写入。这使得适配器明显更安静，并且在不改变现有控制逻辑的情况下避免了不必要的状态更新。"
-      },
-      "1.2.19": {
-        "en": "Bugfix release. Fixes an interaction issue between photovoltaicHelper and controlHelper where automatic follow-up pumping could be interrupted unexpectedly. The photovoltaic stop logic now respects controlHelper priority and no longer stops the pump while automatic follow-up pumping is active. In addition, the read-only state photovoltaic.threshold_w is now synchronized correctly with the instance configuration so that changes in the adapter settings are reflected reliably in the visible datapoint.",
-        "de": "Bugfix-Release. Behebt ein Zusammenspielproblem zwischen photovoltaicHelper und controlHelper, durch das automatisches Nachpumpen unerwartet unterbrochen werden konnte. Die Abschaltlogik des PV-Helfers respektiert nun den Vorrang des controlHelper und stoppt die Pumpe nicht mehr, solange automatisches Nachpumpen aktiv ist. Zusätzlich wird der schreibgeschützte Datenpunkt photovoltaic.threshold_w jetzt korrekt mit der Instanzkonfiguration synchronisiert, sodass Änderungen in den Adaptereinstellungen zuverlässig im sichtbaren Datenpunkt übernommen werden.",
-        "ru": "Выпуск с исправлением ошибок. Устранена проблема взаимодействия между фотоэлектрическим помощником и controlHelper, из-за которой автоматическая последующая откачка могла неожиданно прерваться. Логика фотоэлектрической остановки теперь учитывает приоритет controlHelper и больше не останавливает насос, пока активна автоматическая последующая откачка. Кроме того, состояние только для чтения photovoltaic.threshold_w теперь правильно синхронизируется с конфигурацией экземпляра, так что изменения в настройках адаптера надежно отражаются в видимой точке данных.",
-        "pt": "Lançamento de correção de bug. Corrige um problema de interação entre photovoltaicHelper e controlHelper onde o bombeamento de acompanhamento automático poderia ser interrompido inesperadamente. A lógica de paragem fotovoltaica respeita agora a prioridade controlHelper e já não para a bomba enquanto o bombeamento de acompanhamento automático estiver ativo. Além disso, o estado somente leitura photovoltaic.threshold_w agora está sincronizado corretamente com a configuração da instância para que as alterações nas configurações do adaptador sejam refletidas de forma confiável no ponto de dados visível.",
-        "nl": "Bugfix-release. Er is een interactieprobleem opgelost tussen photovoltaicHelper en controlHelper waarbij automatisch napompen onverwacht kon worden onderbroken. De fotovoltaïsche stoplogica respecteert nu de prioriteit van controlHelper en stopt de pomp niet langer terwijl automatisch napompen actief is. Bovendien wordt de alleen-lezen status photovoltaic.threshold_w nu correct gesynchroniseerd met de instanceconfiguratie, zodat wijzigingen in de adapterinstellingen betrouwbaar worden weerspiegeld in het zichtbare datapunt.",
-        "fr": "Version de correction de bugs. Corrige un problème d'interaction entre photovoltaicHelper et controlHelper où le pompage de suivi automatique pouvait être interrompu de manière inattendue. La logique d'arrêt photovoltaïque respecte désormais la priorité controlHelper et n'arrête plus la pompe lorsque le pompage de suivi automatique est actif. De plus, l'état en lecture seule photovoltaic.threshold_w est désormais correctement synchronisé avec la configuration de l'instance afin que les modifications apportées aux paramètres de l'adaptateur soient reflétées de manière fiable dans le point de données visible.",
-        "it": "Rilascio di correzione bug. Risolve un problema di interazione tra fotovoltaicoHelper e controlHelper in cui il pompaggio automatico di follow-up poteva essere interrotto inaspettatamente. La logica di arresto fotovoltaico ora rispetta la priorità di controlHelper e non arresta più la pompa mentre è attivo il pompaggio di follow-up automatico. Inoltre, lo stato di sola lettura fotovoltaico.threshold_w è ora sincronizzato correttamente con la configurazione dell'istanza in modo che le modifiche nelle impostazioni dell'adattatore si riflettano in modo affidabile nel punto dati visibile.",
-        "es": "Lanzamiento de corrección de errores. Soluciona un problema de interacción entre photovoltaicHelper y controlHelper donde el bombeo de seguimiento automático podría interrumpirse inesperadamente. La lógica de parada fotovoltaica ahora respeta la prioridad de controlHelper y ya no detiene la bomba mientras el bombeo de seguimiento automático está activo. Además, el estado de solo lectura photovoltaic.threshold_w ahora está sincronizado correctamente con la configuración de la instancia para que los cambios en la configuración del adaptador se reflejen de manera confiable en el punto de datos visible.",
-        "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 现在不再在适配器启动时被覆盖。防霜保护设置现在可以永久存储。"
       }
     },
     "titleLang": {

package/lib/helpers/solarExtendedHelper.js

@@ -0,0 +1,299 @@
+'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;
+            }
+
+            const speechSolarActive = requestActive && !blocked;
+            const oldSpeechSolarActive = (await this.adapter.getStateAsync('speech.solar_active'))?.val;
+            if (oldSpeechSolarActive !== speechSolarActive) {
+                await this.adapter.setStateChangedAsync('speech.solar_active', {
+                    val: speechSolarActive,
+                    ack: true,
+                });
+            }
+
+            await this.adapter.setStateChangedAsync('pump.pump_switch', {
+                val: speechSolarActive,
+                ack: 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

@@ -33,6 +33,7 @@ const solarHelper = {
     async _checkSolar() {
         try {
             const activeHelper = (await this.adapter.getStateAsync('pump.active_helper'))?.val || '';
+            const isExternalPriority = activeHelper === 'controlHelper' || activeHelper === 'timeHelper';
 
             // --- NEU: Vorrangprüfung durch ControlHelper ---
             if (activeHelper === 'controlHelper') {
@@ -41,7 +42,6 @@ const solarHelper = {
                     ack: true,
                 });
                 this.adapter.log.debug('[solarHelper] Priority by ControlHelper active – solar control paused.');
-                return;
             }
 
             // --- NEU: Vorrangprüfung durch TimeHelper ---
@@ -51,7 +51,6 @@ const solarHelper = {
                     ack: true,
                 });
                 this.adapter.log.debug('[solarHelper] Priority by TimeHelper active – solar control paused.');
-                return;
             }
 
             // --- NEU: Saisonstatus ---
@@ -60,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;
 
@@ -82,8 +84,21 @@ const solarHelper = {
                 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;
 
@@ -135,9 +150,13 @@ const solarHelper = {
                     ? '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"
 }