iobroker.sun2000 2.1.0 → 2.1.1

package/README.md

@@ -65,6 +65,13 @@ browse in the [wiki](https://github.com/bolliy/ioBroker.sun2000/wiki)
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.1.1 (2025-09-24)
+* dependency and configuration updates
+* fix: adjust event value limits based on usableSurplus parameters
+* fix: swap register values for power consumption in Emma driver #190
+* emma: improve power calculation with exponential moving average in EmmaCharger
+* update surplus power state definitions and deprecate old identifiers
+
 ### 2.1.0 (2025-07-06)
 * emma: system time is being determined [#179](https://github.com/bolliy/ioBroker.sun2000/issues/179)
 * control: add grid power scheduling functionality to inverter driver [#176](https://github.com/bolliy/ioBroker.sun2000/issues/176)

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "news": {
+      "2.1.1": {
+        "en": "dependency and configuration updates\nfix: adjust event value limits based on usableSurplus parameters\nfix: swap register values for power consumption in Emma driver #190\nemma: improve power calculation with exponential moving average in EmmaCharger\nupdate surplus power state definitions and deprecate old identifiers",
+        "de": "abhängigkeits- und konfigurationsupdates\nfix: Event-Wert-Grenze basierend auf nutzbar Überschüssige Parameter\nfix: Swap-Registerwerte für den Stromverbrauch in Emma Treiber #190\nemma: Leistungsberechnung mit exponentiellem Bewegungsmittel in EmmaCharger verbessern\naktualisierung der überschussstrom-zustandsdefinitionen und abschreibung alter kennungen",
+        "ru": "обновления зависимостей и конфигурации\nисправление: корректировка предельных значений событий на основе пригодных для использования Дополнительные параметры\nисправление: значения регистра свопов для энергопотребления в драйвере Emma #190\nemma: улучшите расчет мощности с экспоненциальной скользящей средней в EmmaCharger\nобновить определения состояния избыточной мощности и обесценить старые идентификаторы",
+        "pt": "atualizações de dependência e configuração\ncorreção: ajustar os limites do valor do evento com base no utilizável Parâmetros do excedente\ncorreção: valores de registro de swap para consumo de energia em Emma driver #190\nemma: melhorar o cálculo de potência com média móvel exponencial em EmmaCharger\natualizar definições de estado de potência excedente e depreciar identificadores antigos",
+        "nl": "afhankelijkheid en configuratie-updates\nfix: aanpassen gebeurtenis waarde limieten op basis van bruikbaar Overschotparameters\nfix: swap register waarden voor energieverbruik in Emma driver #190\nemma: verbeteren van de stroomberekening met exponentieel bewegend gemiddelde in EmmaCharger\nde definitie van overtollige vermogenstoestand bij te werken en oude identificatienummers te schrappen",
+        "fr": "mises à jour de la dépendance et de la configuration\nfix: ajuster les limites de valeur d'événement en fonction de la valeur utilisable Paramètres excédentaires\nfix: valeurs de registre d'échange pour la consommation d'énergie en Emma driver #190\nemma: améliorer le calcul de la puissance avec la moyenne mobile exponentielle en EmmaCharger\nmettre à jour les définitions de l'état de puissance excédentaire et supprimer les anciens identifiants",
+        "it": "aggiornamenti di dipendenza e configurazione\ncorrezione: regolare i limiti del valore dell'evento in base all'utilizzabile Parametri in eccesso\ncorrezione: swap valori di registro per il consumo di energia in Emma driver #190\nemma: migliorare il calcolo di potenza con una media mobile esponenziale in EmmaCharger\naggiornare le definizioni di stato di potenza eccedente e deprecare vecchi identificatori",
+        "es": "actualizaciones de dependencia y configuración\nfijación: ajustar los límites de valor de evento basados en utilizables Parámetros adicionales\nfijado: cambiar los valores de registro para el consumo de energía en el controlador Emma #190\nemma: mejorar el cálculo de potencia con promedio de movimiento exponencial en EmmaCharger\nactualizar las definiciones de estado de excedente de energía y depreparar identificadores antiguos",
+        "pl": "aktualizacje zależności i konfiguracji\nfix: dostosować wartości graniczne dla zdarzeń w oparciu o wartość użytkową Parametry nadwyżki\nfix: wartości rejestru swap dla zużycia energii w sterowniku Emma # 190\nemma: ulepszenie obliczania mocy przy zastosowaniu wykładniczej średniej ruchomej w EmmaCharger\naktualizacja definicji nadwyżek energii elektrycznej i deprecjacja starych identyfikatorów",
+        "uk": "оновлення залежності та конфігурації\nвиправити: регулювати ліміти значення події на основі Параметри Surplus\nвиправити: значення swap для споживання енергії в машині Емма #190\nемма: поліпшення розрахунку потужності з постійним рухомим середнім в ЕммаКхаргер\nоновлення надлишок визначення стану живлення та депресувати старі ідентифікатори",
+        "zh-cn": "依赖和配置更新\n固定:根据可用值调整事件值限制 盈余参数\n修补: Emma 驱动器中用电量的交换记录值 # 190\nemma: 改进电量计算, 以 Emmacourer 中的指数移动平均值\n更新剩余电源状态定义并折旧旧标识符"
+      },
       "2.1.0": {
         "en": "emma: system time is being determined [#179](https://github.com/bolliy/ioBroker.sun2000/issues/179)\ncontrol: add grid power scheduling functionality to inverter driver [#176](https://github.com/bolliy/ioBroker.sun2000/issues/176)",
         "de": "emma: Die Systemzeit wird bestimmt [#179](https://github.com/bolliy/ioBroker.sun2000/issues/179)\nsteuerung: Netz-Leistungs-Scheduling-Funktionalität zum Wechselrichtertreiber hinzufügen [#176](https://github.com/bolliy/ioBroker.sun2000/issues/176)",
@@ -80,19 +93,6 @@
         "pl": "rozmieszczenie 1.2",
         "uk": "розгортання 1.2",
         "zh-cn": "部署"
-      },
-      "1.2.2-alpha.0": {
-        "en": "test release",
-        "de": "prüfbericht",
-        "ru": "испытательный выпуск",
-        "pt": "liberação de teste",
-        "nl": "loslaten van de test",
-        "fr": "libération d'essai",
-        "it": "rilascio del test",
-        "es": "prueba de liberación",
-        "pl": "uwalnianie testowe",
-        "uk": "тестовий реліз",
-        "zh-cn": "测试发布"
       }
     },
     "titleLang": {
@@ -221,7 +221,7 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=7.4.10"
+        "admin": ">=7.6.17"
       }
     ],
     "plugins": {

package/lib/controls/config_map.js

@@ -26,6 +26,12 @@ class ConfigMap {
 					if (event.value < 0) {
 						event.value = 0;
 					}
+					const bufferSoc = this.get('usableSurplus.bufferSoc')?.value ?? 0;
+
+					if (bufferSoc > 0 && event.value > bufferSoc) {
+						event.value = bufferSoc;
+					}
+
 					event.value = Math.round(event.value);
 					return true;
 				},
@@ -46,6 +52,11 @@ class ConfigMap {
 					if (event.value < 0) {
 						event.value = 0;
 					}
+					const minSoc = this.get('usableSurplus.minSoc')?.value ?? 0;
+
+					if (event.value > 0 && event.value < minSoc) {
+						event.value = minSoc;
+					}
 					event.value = Math.round(event.value);
 					return true;
 				},

package/lib/drivers/driver_emma.js

@@ -650,7 +650,7 @@ class Emma extends DriverBase {
 							role: 'value.power',
 							desc: 'reg:31651, len:2',
 						},
-						register: { reg: 31651, type: dataType.int32, gain: 1000 },
+						register: { reg: 31651, type: dataType.int32, gain: -1000 },
 					},
 					{
 						state: {
@@ -661,7 +661,7 @@ class Emma extends DriverBase {
 							role: 'value.power',
 							desc: 'reg:31653, len:2',
 						},
-						register: { reg: 31653, type: dataType.int32, gain: 1000 },
+						register: { reg: 31653, type: dataType.int32, gain: -1000 },
 					},
 					{
 						state: {
@@ -672,7 +672,7 @@ class Emma extends DriverBase {
 							role: 'value.power',
 							desc: 'reg:31655, len:2',
 						},
-						register: { reg: 31655, type: dataType.int32, gain: 1000 },
+						register: { reg: 31655, type: dataType.int32, gain: -1000 },
 					},
 					{
 						state: {
@@ -683,7 +683,7 @@ class Emma extends DriverBase {
 							role: 'value.power.consumption',
 							desc: 'reg:31679, len:4',
 						},
-						register: { reg: 31679, type: dataType.int64, gain: 100 },
+						register: { reg: 31687, type: dataType.int64, gain: 100 },
 					},
 					{
 						state: {
@@ -694,7 +694,7 @@ class Emma extends DriverBase {
 							role: 'value.power.consumption',
 							desc: 'reg:31687, len:4',
 						},
-						register: { reg: 31687, type: dataType.int64, gain: 100 },
+						register: { reg: 31679, type: dataType.int64, gain: 100 },
 					},
 				],
 			},
@@ -852,24 +852,30 @@ class EmmaCharger extends DriverBase {
 					},
 				],
 				postHook: path => {
-					const now = new Date();
 					//this.log.debug('#### POSTHOOK CHARGER ####');
+					const now = new Date();
 					const totalCharged = this.stateCache.get(`${path}totalEnergyCharged`)?.value ?? 0;
-					//const totalCharged = this.stateCache.get(`collected.dailySolarYield`)?.value ?? 0;
-					//const test = this.stateCache.get(`collected.inputPower`)?.value ?? 0;
+					const smoothingFactor = 0.5; // between 0 (slow) and 1 (fast), tune as needed
+
 					if (this._lastTime === undefined) {
 						this._lastTime = now;
 						this._lastEnergy = totalCharged;
 						this.stateCache.set(`${path}derived.outputPower`, 0, { type: 'number' });
+						//this.stateCache.set(`${path}derived.smoothedOutputPower`, 0, { type: 'number' });
+						this._smoothedPower = 0;
 						return;
 					}
 					const timeDiff = now.getTime() - this._lastTime.getTime();
-					if (timeDiff < 1000 * 20) return; // ignore changes less than 20 seconds
+					if (timeDiff < 1000 * 30) return; // ignore changes less than 30 seconds
 					const energyDiff = totalCharged - this._lastEnergy;
 					const power = (energyDiff / timeDiff) * 1000 * 3600;
 
-					this.stateCache.set(`${path}derived.outputPower`, power, { type: 'number' });
-					//this.stateCache.set(`${path}derived.testpower`, test, { type: 'number' });
+					// Exponential Moving Average
+					this._smoothedPower = (this._smoothedPower ?? 0) * (1 - smoothingFactor) + power * smoothingFactor;
+
+					this.stateCache.set(`${path}derived.outputPower`, this._smoothedPower, { type: 'number' });
+					//this.stateCache.set(`${path}derived.smoothedOutputPower`, this._smoothedPower, { type: 'number' });
+
 					this._lastTime = now;
 					this._lastEnergy = totalCharged;
 				},

package/lib/register.js

@@ -2,7 +2,6 @@
 
 const { deviceType, driverClasses, dataRefreshRate } = require(`${__dirname}/types.js`);
 const { StateMap } = require(`${__dirname}/tools.js`);
-//const getDriverHandler = require(__dirname + '/drivers/drivers_old.js');
 const getDriverHandler = require(`${__dirname}/drivers/index.js`);
 
 class Registers {
@@ -42,7 +41,30 @@ class Registers {
 						unit: 'kW',
 						role: 'value.power',
 					},
-					{ id: 'collected.usableSurplusPower', name: 'usable surplus power', type: 'number', unit: 'kW', role: 'value.power' },
+					{
+						id: 'collected.usableSurplusPower',
+						name: 'usable surplus power',
+						type: 'number',
+						unit: 'kW',
+						role: 'value.power',
+						desc: 'depreciated: Please use collected.surplus.usablePower instead',
+					},
+					{
+						id: 'collected.surplus.power',
+						name: 'surplus power',
+						type: 'number',
+						unit: 'kW',
+						role: 'value.power',
+						desc: 'Power from solar minus house consumption',
+					},
+					{
+						id: 'collected.surplus.usablePower',
+						name: 'usable surplus power',
+						type: 'number',
+						unit: 'kW',
+						role: 'value.power',
+						desc: 'Power from solar minus house consumption and usable battery power',
+					},
 					{ id: 'collected.externalPower', name: 'external power', type: 'number', unit: 'kW', role: 'value.power' },
 					//{ id: 'collected.ratedPower', name: 'rated power', type: 'number', unit: 'kW', role: 'value.power' },
 				],
@@ -55,11 +77,13 @@ class Registers {
 
 					function calcUsableSurplus() {
 						let surplusPower = 0;
+						let usableSurplusPower = 0;
+
 						if (this.adapter.control) {
 							surplusPower += meterPower;
 
-							let minSoc = this.adapter.control.get('usableSurplus.minSoc')?.value ?? 0;
-							const bufferSoc = this.adapter.control.get('usableSurplus.bufferSoc')?.value ?? 0;
+							const minSoc = this.adapter.control.get('usableSurplus.minSoc')?.value ?? 0;
+							let bufferSoc = this.adapter.control.get('usableSurplus.bufferSoc')?.value ?? 0;
 							const residualPower = this.adapter.control.get('usableSurplus.residualPower')?.value ?? 0;
 							const soc = this.stateCache.get('collected.SOC')?.value ?? 0;
 							const allowNegativeValue = this.adapter.control.get('usableSurplus.allowNegativeValue')?.value ?? false;
@@ -68,19 +92,22 @@ class Registers {
 							if (chargeDischarge < 0) {
 								surplusPower += chargeDischarge;
 							}
+							if (soc >= minSoc) {
+								if (chargeDischarge > 0) surplusPower += chargeDischarge;
+							}
+
+							usableSurplusPower = surplusPower;
 
 							if (bufferSoc > 0) {
 								let threshold = hysterese / 2;
-								if (minSoc > bufferSoc - threshold) {
-									minSoc = bufferSoc - threshold;
-								}
+
 								if (this.bufferOn) {
 									threshold = -threshold;
 								}
-								if (soc >= bufferSoc + threshold) {
+								if (soc > minSoc && soc >= bufferSoc + threshold) {
 									this.bufferOn = true;
 									const bufferPower = this.adapter.control.get('usableSurplus.bufferPower')?.value ?? 0;
-									surplusPower += bufferPower / 1000;
+									usableSurplusPower += bufferPower / 1000;
 								} else {
 									this.bufferOn = false;
 								}
@@ -88,25 +115,27 @@ class Registers {
 								this.bufferOn = false;
 							}
 
-							if (soc >= minSoc) {
-								if (chargeDischarge > 0) surplusPower += chargeDischarge;
-								if (!this.bufferOn) {
-									surplusPower -= residualPower / 1000;
-								}
+							if (!this.bufferOn && surplusPower > residualPower / 1000) {
+								surplusPower -= residualPower / 1000;
 							}
 
 							if (surplusPower > ratedPower) {
 								surplusPower = ratedPower;
 							}
+
+							if (usableSurplusPower > ratedPower) {
+								usableSurplusPower = ratedPower;
+							}
 							if (!allowNegativeValue) {
 								if (surplusPower < 0.1) surplusPower = 0;
+								if (usableSurplusPower < 0.1) usableSurplusPower = 0;
 							}
 
 							this.adapter.log.debug(
 								`### Caculate usableSurplus power ${surplusPower} bufferOn ${this.bufferOn} soc ${soc} minSoc ${minSoc} bufferSoc ${bufferSoc} threshold ${hysterese / 2}`,
 							);
 						}
-						return surplusPower;
+						return [surplusPower, usableSurplusPower];
 					}
 
 					for (const inverter of inverters) {
@@ -131,18 +160,24 @@ class Registers {
 						houseConsum = 0;
 					}
 					//Überschuss (Differenz)
-					const surplusPower = calcUsableSurplus.bind(this)();
+					const surplusArray = calcUsableSurplus.bind(this)();
 
 					this.stateCache.set('collected.inputPower', inPower, { type: 'number', renew: true });
 					this.stateCache.set('collected.inputPowerWithEfficiencyLoss', inPowerEff, { type: 'number' });
 					this.stateCache.set('collected.activePower', actPower, { type: 'number', renew: true });
 					this.stateCache.set('collected.houseConsumption', houseConsum, { type: 'number' });
 					this.stateCache.set('collected.chargeDischargePower', chargeDischarge, { type: 'number' });
-					this.stateCache.set('collected.usableSurplusPower', surplusPower, {
+					this.stateCache.set('collected.usableSurplusPower', surplusArray[1], {
+						type: 'number',
+					});
+					this.stateCache.set('collected.surplus.power', surplusArray[0], {
+						type: 'number',
+					});
+					this.stateCache.set('collected.surplus.usablePower', surplusArray[1], {
 						type: 'number',
 					});
+
 					this.stateCache.set('collected.externalPower', extPower, { type: 'number' });
-					//this.stateCache.set('collected.ratedPower', ratedPower, { type: 'number' });
 				},
 			},
 			{
@@ -175,7 +210,7 @@ class Registers {
 					{ id: 'collected.accumulatedEnergyYield', name: 'Accumulated energy yield', type: 'number', unit: 'kWh', role: 'value.power.consumption' },
 					{ id: 'collected.consumptionSum', name: 'Consumption sum', type: 'number', unit: 'kWh', role: 'value.power.consumption' },
 					{ id: 'collected.gridExportStart', name: 'Grid export start today', type: 'number', unit: 'kWh', role: 'value.power.consumption' },
-					{ id: 'collected.gridImportStart', name: 'Grid export start today', type: 'number', unit: 'kWh', role: 'value.power.consumption' },
+					{ id: 'collected.gridImportStart', name: 'Grid import start today', type: 'number', unit: 'kWh', role: 'value.power.consumption' },
 					{ id: 'collected.consumptionStart', name: 'Consumption start today', type: 'number', unit: 'kWh', role: 'value.power.consumption' },
 					{ id: 'collected.gridExportToday', name: 'Grid export today', type: 'number', unit: 'kWh', role: 'value.power.consumption' },
 					{ id: 'collected.gridImportToday', name: 'Grid import today', type: 'number', unit: 'kWh', role: 'value.power.consumption' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "sun2000",
   "author": {
     "name": "bolliy",
@@ -27,7 +27,7 @@
     "node": ">= 20"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.3",
+    "@iobroker/adapter-core": "^3.3.2",
     "modbus-serial": "^8.0.21",
     "suncalc2": "^1.8.1",
     "tcp-port-used": "^1.0.2"
@@ -38,25 +38,13 @@
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.25.0",
-    "@iobroker/adapter-dev": "^1.4.0",
-    "@iobroker/eslint-config": "^2.0.2",
-    "@iobroker/testing": "^5.0.4",
+    "@eslint/js": "^9.34.0",
+    "@iobroker/adapter-dev": "^1.5.0",
+    "@iobroker/eslint-config": "^2.2.0",
+    "@iobroker/testing": "^5.1.1",
     "@tsconfig/node20": "^20.1.6",
-    "@types/chai": "^4.3.20",
-    "@types/chai-as-promised": "^7.1.8",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.34",
-    "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.4",
-    "@types/sinon-chai": "^3.2.12",
-    "chai": "^4.5.0",
-    "chai-as-promised": "^7.1.2",
-    "globals": "^16.2.0",
-    "mocha": "^11.7.1",
-    "proxyquire": "^2.1.3",
-    "sinon": "^19.0.5",
-    "sinon-chai": "^3.7.0",
+    "@types/node": "^24.5.2",
+    "globals": "^16.4.0",
     "typescript": "~5.8.3"
   },
   "main": "main.js",