iobroker.sun2000 2.3.6 → 2.3.7

package/README.md

@@ -65,6 +65,9 @@ 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.3.7 (2026-02-01)
+* deleted deprecated state `collected.usableSurplusPower`
+
 ### 2.3.6 (2026-01-29)
 * dependency and configuration updates
 * new state `inverter.x.derived.alarmsJSON` : json array with intverter alarms (id, name, level) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "2.3.6",
+    "version": "2.3.7",
     "news": {
+      "2.3.7": {
+        "en": "deleted deprecated state `collected.usableSurplusPower`",
+        "de": "gelöschter deprecated state `collect.usableSurplusPower `",
+        "ru": "удаленное устаревшее состояние 'collected.usableSurplusPower пункт",
+        "pt": "estado desactualizado excluído `colected.usableSurplusPower `",
+        "nl": "verwijderde verouderde staat  Wat",
+        "fr": "état obsolète supprimé `collected.usableSurplusPower \"",
+        "it": "cancellato stato deprecato `colletto.usableSurplusPower #",
+        "es": "borrado estado deprecatado `collected.usableSurplusPower `",
+        "pl": "usunięty stan zdepregatowany \"collected.usableSurplusPower '",
+        "uk": "вилучена депресована держава `collected.usableSurplusPower й",
+        "zh-cn": "删除已贬值状态“ 已收集。 可使用 SurplusPower `"
+      },
       "2.3.6": {
         "en": "dependency and configuration updates\nnew state `inverter.x.derived.alarmsJSON` : json array with intverter alarms (id, name, level) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\nadd ChargeDischargePower for Battery units [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\nadd minimum and maximum temperature for battery packs [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
         "de": "abhängigkeits- und konfigurationsupdates\nneuer Zustand `inverter.x.derived.alarmsJSON`: json array with intverter alarms (id, name, level) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\nadd ChargeDischargePower for Battery Units [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\nmindest- und Höchsttemperatur für Akkupacks [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
@@ -80,19 +93,6 @@
         "pl": "fix: obsługi potencjalnych wartości null w ustawieniu metody rejestru Mapa",
         "uk": "виправити: обробляти потенціал null значення в встановленому методі Реєстру Мапа",
         "zh-cn": "固定值:在设定的登记方法中处理潜在的无效值 地图"
-      },
-      "2.3.0": {
-        "en": "new release for npm migrates to Trusted Publishing",
-        "de": "neue Veröffentlichung für npm migriert Trusted Publishing",
-        "ru": "новый релиз для npm перенесен в Trusted Publishing",
-        "pt": "nova versão para npm migra para a publicação confiável",
-        "nl": "nieuwe release voor npm-migraties naar Trusted Publishing",
-        "fr": "nouvelle version pour npm migre vers Trusted Publishing",
-        "it": "nuovo rilascio per npm migra a Trusted Publishing",
-        "es": "nueva versión para npm migrates a Trusted Publishing",
-        "pl": "nowa wersja dla migratów npm do zaufanej publikacji",
-        "uk": "новий реліз для npm migrats для Trusted Publishing",
-        "zh-cn": "npm 的新版本迁移到信任出版"
       }
     },
     "titleLang": {

package/lib/alarms.js

@@ -58,11 +58,11 @@ const inverterAlarms3 = new Map()
 	.set('14', { id: 2093, name: 'DC Switch Abnormal', level: alarmLevel.Minor })
 	.set('15', { id: 2094, name: 'Allowable discharge capacity of the battery is low', level: alarmLevel.Warning });
 
-function textsFromBitfield(alarmString, lot) {
+function fromBitfield(alarmString, lot) {
 	const result = [];
-	for (const [i, char] of Object.entries(alarmString)) {
-		if (char === '1') {
-			const alarmText = lot.get(i);
+	for (let i = 0; i < alarmString.length; i++) {
+		if (alarmString[alarmString.length - 1 - i] === '1') {
+			const alarmText = lot.get(String(i));
 			if (alarmText) {
 				result.push(alarmText);
 			}
@@ -76,11 +76,11 @@ function getAlarmInfo(alarmCode, alarmNo) {
 		const alarmString = (alarmCode >>> 0).toString(2).padStart(16, '0');
 		switch (alarmNo) {
 			case 1:
-				return textsFromBitfield(alarmString, inverterAlarms1);
+				return fromBitfield(alarmString, inverterAlarms1);
 			case 2:
-				return textsFromBitfield(alarmString, inverterAlarms2);
+				return fromBitfield(alarmString, inverterAlarms2);
 			case 3:
-				return textsFromBitfield(alarmString, inverterAlarms3);
+				return fromBitfield(alarmString, inverterAlarms3);
 		}
 	}
 	return [];

package/lib/drivers/driver_inverter.js

@@ -1056,9 +1056,10 @@ class InverterSun2000 extends DriverBase {
 					},
 				],
 				postHook: path => {
-					//const alarm1Info = getAlarmInfo(128, 1);
 					const alarm1Info = getAlarmInfo(this.stateCache.get(`${path}alarm1`)?.value, 1);
+					//const alarm1Info = getAlarmInfo(128, 1);
 					const alarm2Info = getAlarmInfo(this.stateCache.get(`${path}alarm2`)?.value, 2);
+					//const alarm3Info = getAlarmInfo(32, 3);
 					const alarm3Info = getAlarmInfo(this.stateCache.get(`${path}alarm3`)?.value, 3);
 					const alarmInfos = alarm1Info.concat(alarm2Info, alarm3Info);
 

package/lib/register.js

@@ -3,6 +3,7 @@
 const { deviceType, driverClasses, dataRefreshRate } = require(`${__dirname}/types.js`);
 const { RiemannSum, StateMap } = require(`${__dirname}/tools.js`);
 const getDriverHandler = require(`${__dirname}/drivers/index.js`);
+const tools = require(`${__dirname}/tools.js`);
 
 class Registers {
 	constructor(adapterInstance) {
@@ -18,6 +19,18 @@ class Registers {
 				device.instance = new handler(this, device);
 			}
 		}
+		//deleted deprecated states
+		if (
+			tools.existsState(this.adapter, `collected.usableSurplusPower`, (err, exists) => {
+				if (!err && exists) {
+					tools.deleteState(this.adapter, `collected.usableSurplusPower`, (err, deleted) => {
+						if (!err && deleted) {
+							this.adapter.logger.debug('Deleted deprecated state collected.usableSurplusPower');
+						}
+					});
+				}
+			})
+		);
 
 		this.postProcessHooks = [];
 		this.inverterPostProcessHooks = [
@@ -43,6 +56,7 @@ class Registers {
 						unit: 'kW',
 						role: 'value.power',
 					},
+					/*
 					{
 						id: 'collected.usableSurplusPower',
 						name: 'usable surplus power',
@@ -51,6 +65,7 @@ class Registers {
 						role: 'value.power',
 						desc: 'depreciated: Please use collected.surplus.usablePower instead',
 					},
+					*/
 					{
 						id: 'collected.surplus.power',
 						name: 'surplus power',
@@ -138,7 +153,7 @@ class Registers {
 								if (usableSurplusPower < 0.01) usableSurplusPower = 0;
 							}
 
-							this.adapter.log.debug(
+							this.adapter.logger.debug(
 								`### Caculate usableSurplus power ${surplusPower} bufferOn ${this.bufferOn} soc ${soc} minSoc ${minSoc} bufferSoc ${bufferSoc} threshold ${hysterese / 2}`,
 							);
 						}
@@ -175,9 +190,11 @@ class Registers {
 					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', surplusArray[1], {
 						type: 'number',
 					});
+					*/
 					this.stateCache.set('collected.surplus.power', surplusArray[0], {
 						type: 'number',
 					});
@@ -322,14 +339,7 @@ class Registers {
 					this.stateCache.set('collected.gridImportToday', supplyFromGrid - this.stateCache.get('collected.gridImportStart')?.value, {
 						type: 'number',
 					});
-					/* old computation of consumption today
-					this.stateCache.set(
-						'collected.consumptionToday',
-						this.stateCache.get('collected.consumptionSum')?.value - this.stateCache.get('collected.consumptionStart')?.value,
-						{ type: 'number' },
-					);
-					*/
-					//new computation of consumption today
+					//consumption today
 					this.stateCache.set(
 						'collected.consumptionToday',
 						activeEnergy +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "sun2000",
   "author": {
     "name": "bolliy",