iobroker.sun2000 1.3.0 → 1.4.1-alpha.2

package/README.md

@@ -64,14 +64,17 @@ 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**
 -->
-### 1.3.0 (2025-04-02)
-* usableSurplusPower: new control state `sun2000.0.control.usableSurplus.allowNegativeValue`
+### 1.4.1-alpha.2 (2025-05-20)
+* update dependencies
+* fix: surplus power during battery discharge
+* control: new control value `sun2000.0.control.usableSurplus.bufferHysteresis`
 
-### 1.2.2 (2025-04-01)
-* deploy 1.2
+### 1.4.0 (2025-04-07)
+* control: new control state `sun2000.0.control.externalPower` #76
+* fixed issue detected by repository checker #166
 
-### 1.2.1 (2025-04-01)
-* dependency update
+### 1.3.0 (2025-04-02)
+* usableSurplusPower: new control state `sun2000.0.control.usableSurplus.allowNegativeValue`
 
 ### 1.2.0 (2025-04-01)
 * dependency and configuration updates

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "1.3.0",
+    "version": "1.4.1-alpha.2",
     "news": {
+      "1.4.1-alpha.2": {
+        "en": "update dependencies\nfix: surplus power during battery discharge\ncontrol: new control value `sun2000.0.control.usableSurplus.bufferHysteresis`",
+        "de": "aktualisierung der abhängigkeiten\nfix: überschussleistung während der batterieentladung\nsteuerung: neuer Steuerwert `sun2000.0.control.usableSurplus.bufferHysteresis`",
+        "ru": "обновление зависимостей\nисправление: избыточная мощность во время разрядки батареи\nконтроль: новое значение управления 'sun2000.0.control.usableSurplus.bufferHysteresis'",
+        "pt": "dependências\ncorreção: energia excedente durante a descarga da bateria\ncontrol: novo valor de controle `sun2000.0.control.usableSurplus.bufferHysteresis`",
+        "nl": "afhankelijkheden bijwerken\nfix: overtollig vermogen tijdens batterijontlading\ncontrole: nieuwe controlewaarde ",
+        "fr": "mettre à jour les dépendances\nfix: puissance excédentaire pendant la décharge de la batterie\ncontrôle: nouvelle valeur de contrôle `sun2000.0.control.usableSurplus.bufferHystérésis`",
+        "it": "aggiornamento dipendenze\nfix: potenza in eccesso durante la scarica della batteria\ncontrollo: nuovo valore di controllo `sun2000.0.control.usableSurplus.bufferHysteresis`",
+        "es": "dependencias de actualización\nfijación: superávit durante la descarga de la batería\ncontrol: nuevo valor de control `sun2000.0.control.usableSurplus.bufferHysteresis`",
+        "pl": "aktualizacji zależności\nfix: nadwyżka mocy podczas rozładowania akumulatora\ncontrol: nowa wartość kontrolna 'sun2000.0.control.usableSurplus.buverHysteresis'",
+        "uk": "оновлення залежності\nвиправити: надлишок живлення при розряді акумулятора\n`sun2000.0.control.usableSurplus.bufferHysteresis`",
+        "zh-cn": "更新依赖关系\n固定:电池放电时的剩余功率\n控制: 新的控制值 `sun2000.control.ulySurplus.bufferHysteresis'"
+      },
+      "1.4.0": {
+        "en": "control: new control state `sun2000.0.control.externalPower` #76\nfixed issue detected by repository checker #166",
+        "de": "steuerung: neuer Steuerzustand `sun2000.0.control.externalPower` #76\nbehobenes problem erkannt von repository checker #166",
+        "ru": "новый контрольный режим «sun2000.0.control.externalPower» #76\nфиксированная проблема, обнаруженная проверкой репозитория #166",
+        "pt": "controle: novo estado de controle `sun2000.0.control.externalPower` #76\nproblema fixo detectado pelo verificador de repositório #166",
+        "nl": "controle: nieuwe controle staat  #76\nvaste uitgifte gedetecteerd door repository checker #166",
+        "fr": "contrôle: nouvel état de contrôle `sun2000.0.control.externalPower` #76\nproblème corrigé détecté par le vérificateur de dépôt #166",
+        "it": "controllo: nuovo stato di controllo `sun2000.0.control.externalPower` #76\nproblema fisso rilevato da repository checker #166",
+        "es": "control: nuevo estado de control `sun2000.0.control.externalPower` #76\nnúmero fijo detectado por el repositorio #166",
+        "pl": "control: nowy stan kontroli 'sun2000.0.control.externalPower' # 76\nstała emisja wykryta przez kontroler repozytorium # 166",
+        "uk": "контроль: новий стан управління `sun2000.0.control.externalPower` #76\nвиправлено проблему, виявлену репозиторійною перевіркою #166",
+        "zh-cn": "控制:新的控制状态`sun 2000.0.control.external Power ' 76号\n仓库检查器检测到的固定问题 # 166"
+      },
       "1.3.0": {
         "en": "usableSurplusPower: new control state `sun2000.0.control.usableSurplus.allowNegativeValue`",
         "de": "usableSurplusPower: neuer Steuerzustand `sun2000.0.control.usableSurplus.allowNegativeValue `",
@@ -42,32 +68,6 @@
         "uk": "тестовий реліз",
         "zh-cn": "测试发布"
       },
-      "1.2.1": {
-        "en": "dependency update",
-        "de": "aktualisierung der abhängigkeit",
-        "ru": "обновление зависимостей",
-        "pt": "atualização de dependência",
-        "nl": "afhankelijkheidsupdate",
-        "fr": "mise à jour de la dépendance",
-        "it": "aggiornamento della dipendenza",
-        "es": "actualización de la dependencia",
-        "pl": "aktualizacja zależności",
-        "uk": "оновлення залежності",
-        "zh-cn": "依赖性更新"
-      },
-      "1.2.0": {
-        "en": "dependency and configuration updates updates\nfix: Object state sDongle.OSVersion to short\nnew setting path for controlling the usableSurplus parameters `control.usableSurplus`",
-        "de": "abhängigkeit und konfiguration updates\nfix: Objektzustand sDongle. OSVersion kurz\nneuer Einstellpfad zur Steuerung des Nutzbar Überschüssige Parameter `control.usableSurplus `",
-        "ru": "обновления зависимостей и конфигураций\nобсуждение Object State sDongle. OSVersion to Short\nновый путь настройки для контроля полезного Дополнительные параметры 'control.usable Surplus пункт",
-        "pt": "atualizações de dependência e configuração\ncorreção: Objeto estado sDongle. OSVersion to short\nnovo caminho de configuração para controlar a usável Parâmetros do Surplus `control.usableSurplus \"",
-        "nl": "afhankelijkheid en configuratie updates\nfix: Object state sDongle. OSVersion to short\nnieuw instellingspad voor het bedienen van het bruikbare Overschotparameters Controle.bruikbaarSurplus Wat",
-        "fr": "mises à jour de la dépendance et de la configuration\ncorrection : État de l'objet sDongle. OSVersion à court\nnouveau chemin de réglage pour contrôler l'utilisable Paramètres excédentaires \"control.usableExcédent \"",
-        "it": "aggiornamenti di dipendenza e configurazione\ncorrezione: SDongle di stato dell'oggetto. OSVersione a breve\nnuovo percorso di regolazione per il controllo dell'utilizzabile Parametri in eccesso `control.usableSurplus #",
-        "es": "actualizaciones de dependencia y configuración\nresolver: \"Objeto estado sDongle\". OSVersion to short\nnuevo camino de configuración para controlar el usable Parámetros adicionales `control.usableSurplus `",
-        "pl": "aktualizacje zależności i konfiguracji\nfix: Object state sDongle. OSVersion to short\nnowa ścieżka ustawień do sterowania użytecznym Parametry nadwyżki 'control.usableSurplus'",
-        "uk": "оновлення залежності та конфігурації\nвиправити: Об'єктний стан sDongle. OSVersion до короткого\nновий шлях налаштування для контролю Параметри Surplus `control.usableSurplus й",
-        "zh-cn": "依赖性和配置更新\n固定:对象状态 sDongle。 OSVsion 缩写\n用于控制可用的新设置路径 盈余参数 `控制.可使用余额' `"
-      },
       "1.1.0": {
         "en": "startupTime/shutdownTime are read from the inverter as local time and not as UTC - fixed times are saved in path `derived`\nnew state [usableSurplusPower](https://github.com/bolliy/ioBroker.sun2000/wiki/%C3%9Cberschuss-(surplus))\ncontrol: checking and rounding integer numbers\nbetter solution for math rounding",
         "de": "startzeit/Shutdown Zeit wird vom Wechselrichter als Ortszeit gelesen und nicht als UTC - Festzeiten werden im Pfad gespeichert `derived `\nneuer Staat [usableSurplusPower](https://github.com/bolliy/ioBroker.sun2000/wiki/%C3%9Cberschuss-(surplus))\nsteuerung: überprüfung und rundung ganzzahliger zahlen\nbessere lösung für matherundung",

package/lib/controls/config_map.js

@@ -26,6 +26,7 @@ class ConfigMap {
 					if (event.value < 0) {
 						event.value = 0;
 					}
+					event.value = Math.round(event.value);
 					return true;
 				},
 			},
@@ -45,6 +46,7 @@ class ConfigMap {
 					if (event.value < 0) {
 						event.value = 0;
 					}
+					event.value = Math.round(event.value);
 					return true;
 				},
 			},
@@ -64,6 +66,7 @@ class ConfigMap {
 					if (event.value < 0) {
 						event.value = 0;
 					}
+					event.value = Math.round(event.value);
 					return true;
 				},
 			},
@@ -83,6 +86,27 @@ class ConfigMap {
 					if (event.value < -1000) {
 						event.value = -1000;
 					}
+					event.value = Math.round(event.value);
+					return true;
+				},
+			},
+			{
+				state: {
+					id: 'usableSurplus.bufferHysteresis',
+					name: 'BufferSoc hysteresis',
+					type: 'number',
+					unit: '%',
+					role: 'level',
+					desc: 'Hysteresis of the bufferSoc [0..10%]',
+				},
+				fn: async event => {
+					if (event.value > 10) {
+						event.value = 10;
+					}
+					if (event.value < 0) {
+						event.value = 0;
+					}
+					event.value = Math.round(event.value);
 					return true;
 				},
 			},
@@ -101,6 +125,21 @@ class ConfigMap {
 					return true;
 				},
 			},
+			{
+				state: {
+					id: 'externalPower',
+					name: 'external power',
+					type: 'number',
+					role: 'level.power',
+					unit: 'kW',
+					desc: 'external energy production',
+				},
+				fn: async event => {
+					if (event.value < 0) event.values = 0;
+					event.value = Math.round(event.value * 1000) / 1000;
+					return true;
+				},
+			},
 		];
 	}
 
@@ -121,11 +160,6 @@ class ConfigMap {
 		}
 		this.adapter.subscribeStates(`${this._path}.*`);
 		this._initialized = true;
-		/*
-		if (this._initialized) {
-			this.log.info('Control: Config map initialized');
-		}
-		*/
 	}
 
 	/**
@@ -150,7 +184,7 @@ class ConfigMap {
 		const service = this._serviceMap.get(id);
 		if (state && service) {
 			if (state.val !== null) {
-				if (!state.ack) this.log.info(`Control: Event - state: ${this._path}.${id} changed: ${state.val} ack: ${state.ack}`);
+				if (!state.ack) this.log.debug(`Control: Event - state: ${this._path}.${id} changed: ${state.val} ack: ${state.ack}`);
 				const event = this._eventMap.get(id);
 				if (event) {
 					event.value = state.val;
@@ -185,11 +219,10 @@ class ConfigMap {
 		const service = this._serviceMap.get(event.id);
 		if (event.value !== null && service.fn) {
 			if (service.state.type === 'number') {
-				if (!this.isNumber(event)) {
+				if (!this.isNumber(event, false)) {
 					this.log.warn(`Control: Event is discarded because the value ${event.value} is not a number. State: ${this._path}.${event.id}`);
 					return;
 				}
-				event.value = Math.round(event.value * 100) / 100;
 			}
 			if (await service.fn(event)) {
 				await this.adapter.setState(`${this._path}.${event.id}`, { val: event.value, ack: true });

package/lib/register.js

@@ -42,38 +42,68 @@ class Registers {
 						role: 'value.power',
 					},
 					{ id: 'collected.usableSurplusPower', name: 'usable surplus power', type: 'number', unit: 'kW', role: 'value.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' },
 				],
 				fn: inverters => {
 					let actPower = 0;
 					let inPower = 0;
 					let inPowerEff = 0;
 					let chargeDischarge = 0;
+					let ratedPower = 0;
 
 					function calcUsableSurplus() {
 						let surplusPower = 0;
 						if (this.adapter.control) {
 							surplusPower += meterPower;
-							const minSoc = this.adapter.control.get('usableSurplus.minSoc')?.value ?? 0;
+
+							let minSoc = this.adapter.control.get('usableSurplus.minSoc')?.value ?? 0;
 							const 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;
+							const hysterese = this.adapter.control.get('usableSurplus.bufferHysteresis')?.value ?? 0;
+							// chargeDischarge
+							if (chargeDischarge < 0) {
+								surplusPower += chargeDischarge;
+							}
+
+							if (bufferSoc > 0) {
+								let threshold = hysterese / 2;
+								if (minSoc > bufferSoc - threshold) {
+									minSoc = bufferSoc - threshold;
+								}
+								if (this.bufferOn) {
+									threshold = -threshold;
+								}
+								if (soc >= bufferSoc + threshold) {
+									this.bufferOn = true;
+									const bufferPower = this.adapter.control.get('usableSurplus.bufferPower')?.value ?? 0;
+									surplusPower += bufferPower / 1000;
+								} else {
+									this.bufferOn = false;
+								}
+							} else {
+								this.bufferOn = false;
+							}
 
 							if (soc >= minSoc) {
-								surplusPower += chargeDischarge;
-								if (soc < bufferSoc || bufferSoc === 0) {
+								if (chargeDischarge > 0) surplusPower += chargeDischarge;
+								if (!this.bufferOn) {
 									surplusPower -= residualPower / 1000;
 								}
 							}
-							if (soc >= bufferSoc && bufferSoc > 0) {
-								const bufferPower = this.adapter.control.get('usableSurplus.bufferPower')?.value ?? 0;
-								surplusPower += bufferPower / 1000;
-							}
 
-							//this.adapter.log.info(`### TEST usableSurplus.minSoc ${minSoc}`);
+							if (surplusPower > ratedPower) {
+								surplusPower = ratedPower;
+							}
 							if (!allowNegativeValue) {
 								if (surplusPower < 0.1) surplusPower = 0;
 							}
+
+							this.adapter.log.debug(
+								`### Caculate usableSurplus power ${surplusPower} bufferOn ${this.bufferOn} soc ${soc} minSoc ${minSoc} bufferSoc ${bufferSoc} threshold ${hysterese / 2}`,
+							);
 						}
 						return surplusPower;
 					}
@@ -86,12 +116,16 @@ class Registers {
 						inPower += this.stateCache.get(`${inverter.path}.inputPower`)?.value ?? 0;
 						inPowerEff += this.stateCache.get(`${inverter.path}.derived.inputPowerWithEfficiencyLoss`)?.value ?? 0;
 						chargeDischarge += this.stateCache.get(`${inverter.path}.battery.chargeDischargePower`)?.value ?? 0;
+						ratedPower += this.stateCache.get(`${inverter.path}.info.ratedPower`)?.value ?? 0;
+						//maxChargePower = this.stateCache.get(`${inverter.path}.battery.maximumChargingPower`)?.value ?? 0;
 					}
 
 					const meterPower = this.stateCache.get('meter.activePower')?.value ?? 0;
+					const extPower = this.adapter.control.get('externalPower')?.value ?? 0;
+					//extPower = extPower / 1000;
 
 					//Zu geringe Erzeugerenegie
-					let houseConsum = actPower - meterPower;
+					let houseConsum = actPower - meterPower + extPower;
 					if (houseConsum < 0) {
 						houseConsum = 0;
 					}
@@ -106,6 +140,8 @@ class Registers {
 					this.stateCache.set('collected.usableSurplusPower', surplusPower, {
 						type: 'number',
 					});
+					this.stateCache.set('collected.externalPower', extPower, { type: 'number' });
+					//this.stateCache.set('collected.ratedPower', ratedPower, { type: 'number' });
 				},
 			},
 			{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "1.3.0",
+  "version": "1.4.1-alpha.2",
   "description": "sun2000",
   "author": {
     "name": "bolliy",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
-    "modbus-serial": "^8.0.20",
+    "modbus-serial": "^8.0.21",
     "suncalc2": "^1.8.1",
     "tcp-port-used": "^1.0.2"
   },
@@ -38,26 +38,26 @@
     "@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.20.0",
+    "@eslint/js": "^9.25.0",
     "@iobroker/adapter-dev": "^1.4.0",
-    "@iobroker/eslint-config": "^1.0.1",
+    "@iobroker/eslint-config": "^2.0.2",
     "@iobroker/testing": "^5.0.4",
     "@tsconfig/node20": "^20.1.5",
     "@types/chai": "^4.3.20",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.13.16",
+    "@types/node": "^22.15.24",
     "@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": "^15.15.0",
-    "mocha": "^11.1.0",
+    "globals": "^16.2.0",
+    "mocha": "^11.5.0",
     "proxyquire": "^2.1.3",
     "sinon": "^19.0.5",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.7.3"
+    "typescript": "~5.8.3"
   },
   "main": "main.js",
   "files": [