iobroker.poolcontrol 0.2.2 → 0.3.1

package/lib/stateDefinitions/speechStates.js

@@ -18,7 +18,7 @@ async function createSpeechStates(adapter) {
         native: {},
     });
 
-    // Sprachausgaben global aktiv
+    // Sprachausgaben global aktiv (mit Persist-Schutz)
     await adapter.setObjectNotExistsAsync('speech.active', {
         type: 'state',
         common: {
@@ -27,13 +27,19 @@ async function createSpeechStates(adapter) {
             role: 'switch',
             read: true,
             write: true,
+            persist: true, // dauerhaft speichern
         },
         native: {},
     });
-    await adapter.setStateAsync('speech.active', {
-        val: adapter.config.speech_active ?? false,
-        ack: true,
-    });
+
+    // Prüfen, ob bereits ein persistierter Wert existiert
+    const existingSpeechActive = await adapter.getStateAsync('speech.active');
+    if (existingSpeechActive === null || existingSpeechActive.val === null || existingSpeechActive.val === undefined) {
+        await adapter.setStateAsync('speech.active', {
+            val: adapter.config.speech_active ?? false,
+            ack: true,
+        });
+    }
 
     // Letzter gesprochener Text
     await adapter.setObjectNotExistsAsync('speech.last_text', {
@@ -107,8 +113,9 @@ async function createSpeechStates(adapter) {
             type: 'boolean',
             role: 'indicator',
             read: true,
-            write: true,
+            write: false,
             hidden: true, // unsichtbar im Admin
+            dontShow: true,
         },
         native: {},
     });
@@ -120,8 +127,9 @@ async function createSpeechStates(adapter) {
             type: 'boolean',
             role: 'indicator',
             read: true,
-            write: true,
+            write: false,
             hidden: true, // unsichtbar im Admin
+            dontShow: true,
         },
         native: {},
     });
@@ -133,11 +141,29 @@ async function createSpeechStates(adapter) {
             type: 'boolean',
             role: 'indicator',
             read: true,
-            write: true,
+            write: false,
             hidden: true, // unsichtbar im Admin
+            dontShow: true,
         },
         native: {},
     });
+
+    // --- Sicherstellen, dass bestehende Installationen nachträglich korrigiert werden ---
+    const hiddenStates = ['speech.solar_active', 'speech.time_active', 'speech.frost_active'];
+    for (const id of hiddenStates) {
+        try {
+            await adapter.extendObjectAsync(id, {
+                common: {
+                    hidden: true,
+                    dontShow: true,
+                    write: false,
+                },
+            });
+        } catch (err) {
+            adapter.log.warn(`[speechStates] Konnte hidden-Flag für ${id} nicht setzen: ${err.message}`);
+        }
+    }
+    adapter.log.debug('[speechStates] Hidden-Flags für Solar/Time/Frost geprüft und aktualisiert');
 }
 
 module.exports = {

package/lib/stateDefinitions/statusStates.js

@@ -169,7 +169,7 @@ async function createStatusStates(adapter) {
     });
     await adapter.setStateAsync('status.system_warning_text', { val: '', ack: true });
 
-    // Saisonstatus
+    // Saisonstatus (mit Persist-Schutz)
     await adapter.setObjectNotExistsAsync('status.season_active', {
         type: 'state',
         common: {
@@ -178,10 +178,16 @@ async function createStatusStates(adapter) {
             role: 'switch',
             read: true,
             write: true,
+            persist: true, // dauerhaft speichern
         },
         native: {},
     });
-    await adapter.setStateAsync('status.season_active', { val: false, ack: true });
+
+    // Prüfen, ob bereits ein persistierter Wert existiert
+    const existingSeasonActive = await adapter.getStateAsync('status.season_active');
+    if (existingSeasonActive === null || existingSeasonActive.val === null || existingSeasonActive.val === undefined) {
+        await adapter.setStateAsync('status.season_active', { val: false, ack: true });
+    }
 }
 
 module.exports = {

package/main.js

@@ -9,6 +9,8 @@ const temperatureHelper = require('./lib/helpers/temperatureHelper');
 const timeHelper = require('./lib/helpers/timeHelper');
 const runtimeHelper = require('./lib/helpers/runtimeHelper');
 const pumpHelper = require('./lib/helpers/pumpHelper');
+const pumpHelper2 = require('./lib/helpers/pumpHelper2');
+const pumpHelper3 = require('./lib/helpers/pumpHelper3');
 const speechHelper = require('./lib/helpers/speechHelper');
 const consumptionHelper = require('./lib/helpers/consumptionHelper');
 const solarHelper = require('./lib/helpers/solarHelper');
@@ -18,8 +20,11 @@ const controlHelper = require('./lib/helpers/controlHelper');
 const controlHelper2 = require('./lib/helpers/controlHelper2');
 const debugLogHelper = require('./lib/helpers/debugLogHelper');
 const speechTextHelper = require('./lib/helpers/speechTextHelper');
+const migrationHelper = require('./lib/helpers/migrationHelper');
 const { createTemperatureStates } = require('./lib/stateDefinitions/temperatureStates');
 const { createPumpStates } = require('./lib/stateDefinitions/pumpStates');
+const { createPumpStates2 } = require('./lib/stateDefinitions/pumpStates2');
+const { createPumpStates3 } = require('./lib/stateDefinitions/pumpStates3');
 const { createSolarStates } = require('./lib/stateDefinitions/solarStates');
 const { createGeneralStates } = require('./lib/stateDefinitions/generalStates');
 const { createTimeStates } = require('./lib/stateDefinitions/timeStates');
@@ -29,6 +34,7 @@ const { createConsumptionStates } = require('./lib/stateDefinitions/consumptionS
 const { createStatusStates } = require('./lib/stateDefinitions/statusStates');
 const { createControlStates } = require('./lib/stateDefinitions/controlStates');
 const { createDebugLogStates } = require('./lib/stateDefinitions/debugLogStates');
+const { createHardwareStates } = require('./lib/stateDefinitions/hardwareStates');
 
 class Poolcontrol extends utils.Adapter {
     constructor(options) {
@@ -49,6 +55,8 @@ class Poolcontrol extends utils.Adapter {
 
         // --- Pumpe ---
         await createPumpStates(this);
+        await createPumpStates2(this);
+        await createPumpStates3(this);
 
         // --- Temperaturverwaltung ---
         await createTemperatureStates(this);
@@ -80,14 +88,22 @@ class Poolcontrol extends utils.Adapter {
         // --- Control States ---
         await createControlStates(this);
 
-        // --- DebugLog Staets ---
+        // --- DebugLog States ---
         await createDebugLogStates(this);
 
+        // --- Hardware States ---
+        await createHardwareStates(this);
+
+        // --- Migration Helper zuletzt starten ---
+        await migrationHelper.init(this);
+
         // --- Helper starten ---
         temperatureHelper.init(this);
         timeHelper.init(this);
         runtimeHelper.init(this);
         pumpHelper.init(this);
+        pumpHelper2.init(this);
+        pumpHelper3.init(this);
         speechHelper.init(this);
         consumptionHelper.init(this);
         solarHelper.init(this);
@@ -113,6 +129,12 @@ class Poolcontrol extends utils.Adapter {
             if (pumpHelper.cleanup) {
                 pumpHelper.cleanup();
             }
+            if (pumpHelper2.cleanup) {
+                pumpHelper2.cleanup();
+            }
+            if (pumpHelper3.cleanup) {
+                pumpHelper3.cleanup();
+            }
             if (speechHelper.cleanup) {
                 speechHelper.cleanup();
             }
@@ -173,6 +195,17 @@ class Poolcontrol extends utils.Adapter {
         } catch (e) {
             this.log.warn(`[pumpHelper] Fehler in handleStateChange: ${e.message}`);
         }
+        try {
+            pumpHelper2.handleStateChange(id, state);
+        } catch (e) {
+            this.log.warn(`[pumpHelper2] Fehler in handleStateChange: ${e.message}`);
+        }
+        try {
+            pumpHelper3.handleStateChange(id, state);
+        } catch (e) {
+            this.log.warn(`[pumpHelper3] Fehler in handleStateChange: ${e.message}`);
+        }
+
         try {
             speechHelper.handleStateChange(id, state);
         } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.poolcontrol",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Steuerung & Automatisierung für den Pool (Pumpe, Heizung, Ventile, Sensoren).",
   "author": "DasBo1975 <dasbo1975@outlook.de>",
   "homepage": "https://github.com/DasBo1975/ioBroker.poolcontrol",