iobroker.smartloadmanager 0.0.7 → 0.1.0

package/README.md

@@ -30,6 +30,15 @@ The **smartloadmanager** adapter is used for dynamic control of loads based on a
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.1.0 (2025-11-07)
+
+- (quorle) Added a checkbox for activating consumers from the settings to the object tree
+
+### 0.0.8 (2025-10-03)
+
+- (quorle) Fix for binary consumers that do not turn off
+- (quorle) Fix for heating elements that are not switched off at max temperature
+
 ### 0.0.7 (2025-09-09)
 
 - (quorle) modified Readme
@@ -52,15 +61,6 @@ The **smartloadmanager** adapter is used for dynamic control of loads based on a
 - (quorle) Adjustments package.json
 - (quorle) Code changed
 
-### 0.0.2 (2025-09-03)
-
-- (quorle) Adjustments package.json
-- (quorle) Code changed
-
-### 0.0.1 (2025-09-02)
-
-- (quorle) Release
-
 ## License
 
 MIT License

package/admin/jsonConfig.json

@@ -113,23 +113,6 @@
                                 "zh-cn": "名称"
                             }
                         },
-                        {
-                            "type": "checkbox",
-                            "attr": "enabled",
-                            "title": {
-                                "en": "Active",
-                                "de": "Aktiv",
-                                "ru": "Активный",
-                                "pt": "Activo",
-                                "nl": "Actief",
-                                "fr": "Activité",
-                                "it": "Attivo",
-                                "es": "Activo",
-                                "pl": "Aktywne",
-                                "uk": "Активний",
-                                "zh-cn": "活动"
-                            }
-                        },
                         {
                             "type": "objectId",
                             "attr": "datapoint",

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "smartloadmanager",
-    "version": "0.0.7",
+    "version": "0.1.0",
     "news": {
+      "0.1.0": {
+        "en": "Added a checkbox for activating consumers from the settings to the object tree",
+        "de": "Hinzufügen eines Kontrollkästchens zur Aktivierung von Verbrauchern von den Einstellungen zum Objektbaum",
+        "ru": "Добавлен чекбокс для активации потребителей от настроек до дерева объектов",
+        "pt": "Adicionada uma caixa de seleção para ativar os consumidores das configurações para a árvore de objetos",
+        "nl": "Een selectievakje toegevoegd voor het activeren van consumenten van de instellingen naar de objectboom",
+        "fr": "Ajout d'une case à cocher pour activer les consommateurs depuis les paramètres vers l'arborescence des objets",
+        "it": "Aggiunto una casella di controllo per attivare i consumatori dalle impostazioni all'albero dell'oggetto",
+        "es": "Se agregó una casilla de verificación para activar a los consumidores desde la configuración hasta el árbol objeto",
+        "pl": "Dodano opcję aktywacji konsumentów od ustawień do drzewa obiektów",
+        "uk": "Додано прапорець для активації споживачів з налаштувань до дерева об'єкта",
+        "zh-cn": "从设置中添加一个激活消费者的复选框到对象树"
+      },
+      "0.0.8": {
+        "en": "Fix for binary consumers that do not turn off\nFix for heating elements that are not switched off at max temperature",
+        "de": "Fix für binäre Verbraucher, die nicht ausschalten\nBefestigung für Heizelemente, die bei max Temperatur nicht abgeschaltet werden",
+        "ru": "Исправьте для бинарных потребителей, которые не отключаются\nИсправьте нагревательные элементы, которые не выключены при максимальной температуре",
+        "pt": "Corrigir para consumidores binários que não se desligam\nFixação para elementos de aquecimento que não são desligados à temperatura máxima",
+        "nl": "Fix voor binaire consumenten die niet uitschakelen\nFix voor verwarmingselementen die niet zijn uitgeschakeld bij maximale temperatuur",
+        "fr": "Correction pour les consommateurs binaires qui ne s'arrêtent pas\nFixation pour éléments chauffants qui ne sont pas éteints à la température maximale",
+        "it": "Fissare per i consumatori binari che non si spegne\nFissaggio per elementi di riscaldamento non spenti a temperatura massima",
+        "es": "Fijación para los consumidores binarios que no apagan\nFijación para elementos de calefacción que no se apagan a temperatura máxima",
+        "pl": "Napraw dla konsumentów binarnych, którzy nie wyłączają\nNaprawa elementów grzewczych, które nie są wyłączone w maksymalnej temperaturze",
+        "uk": "Виправлення для бінарних споживачів, які не вимкнено\nФіксація нагрівальних елементів, які не відключені при максимальній температурі",
+        "zh-cn": "为不关闭的二进制消费者修复\n用于未在最大温度下关闭的加热元素的修复"
+      },
       "0.0.7": {
         "en": "modified Readme\nGerman and English description created\nchore: cleanup devDependencies\nFixed bugs in timeouts in functions\nsetTimeout/setInterval allowed maximum values ​​implemented\n",
         "de": "geänderte Readme\nDeutsche und englische Beschreibung erstellt\nchore: devDependencies aufräumen\nFehler bei Timeouts in Funktionen behoben\nsetTimeout/setInterval erlaubte Höchstwerte implementiert\n",

package/main.js

@@ -66,14 +66,23 @@ class ZeroFeedIn extends utils.Adapter {
             this.consumerList = Array.isArray(this.config.consumer)
                 ? this.config.consumer.filter(
                       v =>
-                          v &&
-                          v.enabled &&
-                          (v.ruletype === 'battery' || ((v.datapoint || v.numericDatapoint) && v.performance > 0)),
+                          v && (v.ruletype === 'battery' || ((v.datapoint || v.numericDatapoint) && v.performance > 0)),
                   )
                 : [];
 
             this.consumerList.forEach(v => (v.processingLockSwitch = false));
 
+            for (let i = 0; i < this.consumerList.length; i++) {
+                const v = this.consumerList[i];
+                const safeName = this.name2id(v.name);
+                const id = `${this.namespace}.consumer.${i}_${safeName}.active`;
+                const state = await this.getStateAsync(id);
+                if (state && state.val !== null) {
+                    v.enabled = state.val;
+                    this.log.debug(`"${v.name}": Active status taken from object tree (${state.val})`);
+                }
+            }
+
             this.log.info(`Loaded consumers: ${this.consumerList.map(v => v.name).join(', ')}`);
 
             await this.checkAndCreateConsumerObjects();
@@ -227,6 +236,20 @@ class ZeroFeedIn extends utils.Adapter {
                 native: {},
             });
 
+            // === NEUER STATE: Aktiv-Status ============================
+            await this.setObjectNotExistsAsync(`${channelId}.active`, {
+                type: 'state',
+                common: {
+                    name: `${v.name} aktiv`,
+                    type: 'boolean',
+                    role: 'switch',
+                    read: true,
+                    write: true,
+                    def: v.enabled || false,
+                },
+                native: {},
+            });
+
             if (v.ruletype === 'battery') {
                 await this.setObjectNotExistsAsync(`${channelId}.batterySetpoint`, {
                     type: 'state',
@@ -303,6 +326,8 @@ class ZeroFeedIn extends utils.Adapter {
             await this.setStateAsync(`${this.namespace}.${channelId}.onTimerRemaining`, { val: 0, ack: true });
             await this.setStateAsync(`${this.namespace}.${channelId}.offTimerRemaining`, { val: 0, ack: true });
 
+            await this.setStateAsync(`${channelId}.active`, { val: v.enabled || false, ack: true });
+
             v.switchOnTime = finalOnTime;
             v.switchOffTime = finalOffTime;
         }
@@ -387,6 +412,19 @@ class ZeroFeedIn extends utils.Adapter {
         if (state && !state.ack) {
             this.log.debug(`State changed: ${id} => ${state.val}`);
 
+            // --- Aktiv-Status manuell umschalten ---------------------------------
+            if (id.match(/consumer\.(\d+)_.*?\.active/)) {
+                const match = id.match(/consumer\.(\d+)_.*?\.active/);
+                const index = parseInt(match[1]);
+                const v = this.consumerList[index];
+                if (v) {
+                    v.enabled = state.val;
+                    this.log.info(`Consumer "${v.name}" became ${state.val ? 'activated' : 'deactivated'}.`);
+                    await this.setStateAsync(id, { val: state.val, ack: true });
+                }
+                return;
+            }
+
             // ControlMode Änderungen
             const match = id.match(/consumer\.(\d+)_.*?\.controlMode/);
             if (match) {
@@ -423,11 +461,7 @@ class ZeroFeedIn extends utils.Adapter {
         try {
             if (!this.feedInDatapoint) {
                 this.log.warn('No FeedIn datapoint set – skipping checkConsumers()');
-                await this.sendNotification(
-                    'smartloadmanager',
-                    'alert',
-                    '❗ Kein FeedIn-Datenpunkt gesetzt – Regelung übersprungen.',
-                );
+                await this.sendNotification('smartloadmanager', 'alert', '❗ No FeedIn data point set – rule skipped.');
                 this.checkRunning = false;
                 if (this.checkQueued) {
                     await this.checkConsumers();
@@ -456,6 +490,11 @@ class ZeroFeedIn extends utils.Adapter {
             this.log.debug(`Switch-on check for ${sortedOn.length} binary/heating-consumers.`);
 
             for (const v of sortedOn) {
+                // Überspringe deaktivierte Verbraucher
+                if (!v.enabled) {
+                    this.log.debug(`"${v.name}" is deactivated – skipped (power-on check).`);
+                    continue;
+                }
                 const idx = this.consumerList.indexOf(v);
                 const safeName = this.name2id(v.name);
                 const id = `${this.namespace}.consumer.${idx}_${safeName}`;
@@ -510,7 +549,7 @@ class ZeroFeedIn extends utils.Adapter {
                     if (v.enableDatapoint) {
                         const enableState = await this.getForeignStateAsync(v.enableDatapoint);
                         if (!enableState?.val) {
-                            this.log.debug(`"${v.name}" NICHT eingeschaltet – Hardware release missing.`);
+                            this.log.debug(`"${v.name}" NOT switched on – Hardware release missing.`);
                             continue;
                         }
                     }
@@ -577,6 +616,11 @@ class ZeroFeedIn extends utils.Adapter {
                 const safeName = this.name2id(v.name);
                 const id = `${this.namespace}.consumer.${idx}_${safeName}`;
                 const mode = await this.getStateAsync(`${id}.controlMode`);
+                // Überspringe deaktivierte Verbraucher
+                if (!v.enabled) {
+                    this.log.debug(`"${v.name}" is deactivated – will be skipped (power-off check).`);
+                    continue;
+                }
                 if (!mode || mode.val !== 2) {
                     continue;
                 }
@@ -654,8 +698,24 @@ class ZeroFeedIn extends utils.Adapter {
                     continue;
                 }
 
+                // Temperatur-basierte Ausschaltung für heating
+                if (v.ruletype === 'heating' && v.maxTemperature !== undefined && isOn) {
+                    const tempState = v.temperatureDatapoint
+                        ? await this.getForeignStateAsync(v.temperatureDatapoint)
+                        : null;
+                    const currentTemp = tempState?.val !== undefined ? Number(tempState.val) : null;
+                    if (currentTemp !== null && currentTemp >= v.maxTemperature) {
+                        this.log.warn(
+                            `"${v.name}" switched off due to maxTemperature reached: ${currentTemp}°C >= ${v.maxTemperature}°C`,
+                        );
+                        await this.switchConsumerWithDelay(v, false, 0);
+                        continue; // weiter zum nächsten Verbraucher
+                    }
+                }
+
                 // Timer-Abbruch bei wegfallender Bedingung (Ausschalten)
-                if (v.timer && v.timerEnd && v.pendingAction === false && withinWindow && !gridUsage) {
+                const surplus = feedIn - baseload;
+                if (v.timer && v.timerEnd && v.pendingAction === false && withinWindow && surplus >= v.switchOffPoint) {
                     clearTimeout(v.timer);
                     v.timer = null;
                     v.timerEnd = null;
@@ -666,20 +726,32 @@ class ZeroFeedIn extends utils.Adapter {
                     this.log.debug(`Switch-off timer for "${v.name}" canceled (condition no longer valid).`);
                 }
 
-                if (!v.alwaysOffAtTime && (!withinWindow || gridUsage)) {
+                // Ausschalten, wenn:
+                // - Zeitfenster verlassen ODER
+                // - Netzbezug aktiv ODER
+                // - Überschuss < switchOffPoint
+                const shouldSwitchOff = !withinWindow || gridUsage || surplus < v.switchOffPoint;
+
+                if (!v.alwaysOffAtTime && shouldSwitchOff) {
                     if (v.timer && v.timerEnd && v.pendingAction === false) {
                         const remaining = Math.max(0, Math.round((v.timerEnd - Date.now()) / 1000));
                         this.log.debug(`Active timer for ${v.name}: ${remaining}s remaining`);
                     } else {
-                        this.log.debug(`Switching off: "${v.name}" - offDelay ${v.switchOffDelay || 0}s.`);
+                        this.log.debug(
+                            `Switching off: "${v.name}" - surplus ${surplus}W < switchOffPoint ${v.switchOffPoint}W, offDelay ${v.switchOffDelay || 0}s.`,
+                        );
                         await this.switchConsumerWithDelay(v, false, v.switchOffDelay || 0);
                     }
                 }
             }
 
-            // --- Batterie bleibt unverändert ---
+            // --- Batterie unverändert ---
             const batteryConsumers = this.consumerList.filter(c => c.ruletype === 'battery');
             for (const v of batteryConsumers) {
+                if (!v.enabled) {
+                    this.log.debug(`"${v.name}" is deactivated – battery control skipped.`);
+                    continue;
+                }
                 await this.controlBattery(v, feedIn);
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.smartloadmanager",
-  "version": "0.0.7",
+  "version": "0.1.0",
   "description": "This adapter allows devices to be controlled via PV surplus and thus achieve zero feed-in.",
   "author": {
     "name": "quorle",
@@ -28,16 +28,16 @@
     "translate": "^3.0.1"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.8.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
-    "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/adapter-dev": "^1.4.0",
-    "@iobroker/eslint-config": "^2.1.0",
+    "@alcalzone/release-script": "^5.0.0",
+    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
+    "@alcalzone/release-script-plugin-license": "^4.0.0",
+    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
+    "@iobroker/adapter-dev": "^1.5.0",
+    "@iobroker/eslint-config": "^2.2.0",
     "@iobroker/testing": "^5.1.1",
     "@tsconfig/node20": "^20.1.6",
-    "@types/node": "^20.19.1",
-    "typescript": "~5.0.4"
+    "@types/node": "^24.9.2",
+    "typescript": "~5.9.3"
   },
   "main": "main.js",
   "files": [