iobroker.sun2000 0.14.0 → 0.15.0

package/README.md

@@ -44,6 +44,7 @@ browse in the [wiki](https://github.com/bolliy/ioBroker.sun2000/wiki)
 * HUAWEI Luna2000 Battery
 * HUAWEI Smart Power Sensor DTSU666-H or DDSU666-H
 * HUAWEI Smart Logger / min. Softwareversion: V300R023C10SPC311
+* HUAWEI EMMA / min. Softwareversion: V100R024C00SPC101
 
 ## Feature list
 
@@ -64,6 +65,11 @@ 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**
 -->
+### 0.15.0 (2024-10-24)
+* dependency and configuration updates
+* display a clearly legible table bar #121
+* modbus-proxy write data also to the read cache #119
+
 ### 0.14.0 (2024-10-20)
 * adjust for Responsive Design #121
 * lock on asynchronous modbus code

package/admin/{jsonConfig.json → jsonConfig.json5}

@@ -1,6 +1,9 @@
 {
     "i18n": true,
     "type": "tabs",
+    "tabsStyle": {
+        "width": "calc(100% - 100px)"
+    },
     "items": {
         "mainTab": {
             "type": "panel",
@@ -89,7 +92,7 @@
                     "max" : 120,
                     "default": 20,
                     "newLine": true,
-                    "tooltip": "Update interval to update the values from the inverters",
+                    "tooltip": "Update interval to update the values from the devices",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -183,7 +186,7 @@
                     "type": "checkbox",
                     "label": "ms.aktive",
                     "newLine": true,
-                    "tooltip": "Modbus-proxy via TCP for read-only is active",
+                    "tooltip": "Modbus-proxy via TCP is active",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -237,14 +240,14 @@
                 },
                 "chipsTxt1": {
                     "type": "staticText",
-                    "text": "This control is set in the opject path “sun2000.0.inverter.x.control.battery”",
+                    "text": "This control is set in the opject path `sun2000.0.inverter.x.control.battery`",
                     "newLine": true
                 },
                 "cb_tou": {
                     "type": "checkbox",
                     "label": "Create default TOU setting",
                     "newLine": true,
-                    "help": "The “default TOU settings” is interesting for the “force battery charging from the grid” function, which is required for variable energy prices.",
+                    "help": "The `default TOU settings` is interesting for the `force battery charging from the grid` function, which is required for variable energy prices.",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -272,7 +275,7 @@
                 },
                 "chipsTxt2": {
                     "type": "staticText",
-                    "text": "This control is set in the opject path “sun2000.0.inverter.x.control.battery”",
+                    "text": "This control is set in the opject path `sun2000.0.inverter.x.control.battery`",
                     "newLine": true
                 },
                 "staticLink2": {
@@ -296,7 +299,7 @@
                 },
                 "chipsTxt3": {
                     "type": "staticText",
-                    "text": "This control is set in the opject path “sun2000.0.inverter.0.control.grid”",
+                    "text": "This control is set in the opject path `sun2000.0.inverter.0.control.grid`",
                     "newLine": true
                 },
                 "staticLink3": {
@@ -328,7 +331,7 @@
                     "type": "checkbox",
                     "label": "battery units",
                     "newLine": true,
-                    "help": "This register data is stored in the opject path “sun2000.x.inverter.x.battery.unit”",
+                    "help": "This register data is stored in the opject path `sun2000.x.inverter.x.battery.unit`",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -339,7 +342,7 @@
                     "type": "checkbox",
                     "label": "battery packs",
                     "newLine": true,
-                    "help": "This register data is stored in the opject path “sun2000.x.inverter.x.battery.unit.x.pack”",
+                    "help": "This register data is stored in the opject path `sun2000.x.inverter.x.battery.unit.x.pack`",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -364,7 +367,7 @@
                     "min" : 5000,
                     "max" : 30000,
                     "newLine": true,
-                    "tooltip": "modbus connection timeout",
+                    "tooltip": "Modbus connection timeout",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -377,7 +380,7 @@
                     "min" : 0,
                     "max" : 6000,
                     "newLine": true,
-                    "tooltip": "delay between modbus requests",
+                    "tooltip": "Delay between modbus requests",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -390,7 +393,7 @@
                     "min" : 2000,
                     "max" : 10000,
                     "newLine": true,
-                    "tooltip": "delay after modbus connected",
+                    "tooltip": "Delay after modbus connected",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,
@@ -401,7 +404,7 @@
                     "type": "checkbox",
                     "label": "auto-adjust",
                     "newLine": true,
-                    "tooltip": "automatic adjustment of the modbus settings",
+                    "tooltip": "Automatic adjustment of the modbus settings",
                     "xs": 12,
                     "sm": 12,
                     "md": 6,

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "0.14.0",
+    "version": "0.15.0",
     "news": {
+      "0.15.0": {
+        "en": "dependency and configuration updates\ndisplay a clearly legible table bar #121\nmodbus-proxy write data also to the read cache #119",
+        "de": "abhängigkeits- und konfigurationsupdates\neine deutlich lesbare tischleiste #121 anzeigen\nmodbus-proxy schreibdaten auch zum lesespeicher #119",
+        "ru": "обновления зависимости и конфигурации\n#121\nmodbus-proxy пишут данные также кэшу #119",
+        "pt": "atualizações de dependência e configuração\nexibir uma barra de mesa claramente legível #121\nmodbus-proxy escrever dados também para o cache de leitura #119",
+        "nl": "afhankelijkheid en configuratie-updates\neen duidelijk leesbare tafelbalk #121 tonen\nmodbus-proxy schrijf gegevens ook naar de leescache #119",
+        "fr": "mises à jour de la dépendance et de la configuration\nafficher une barre de table clairement lisible #121\nmodbus-proxy écrire les données aussi au cache lecture #119",
+        "it": "aggiornamenti di dipendenza e configurazione\nvisualizza una barra da tavolo chiaramente leggibile #121\nmodbus-proxy scrivere i dati anche alla cache di lettura #119",
+        "es": "actualizaciones de dependencia y configuración\nmostrar una barra de mesa claramente legible #121\nmodbus-proxy escribe datos también al caché de lectura #119",
+        "pl": "aktualizacje zależności i konfiguracji\nwyświetla czytelny pasek tabeli # 121\nmodbus- proxy write data also to the read cache # 119",
+        "uk": "оновлення залежності та конфігурації\nдисплей чітко нижня білизна #121\nmodbus-proxy пише дані також для читання кеш #119",
+        "zh-cn": "依赖和配置更新\n显示清晰可见的表栏 # 121\nmodbus- 代理写入数据到读缓存 # 119"
+      },
       "0.14.0": {
         "en": "adjust for Responsive Design #121\nlock on asynchronous modbus code\nwriting data ​​via the modbus-proxy #119\nread additional register data of Huawei Emma",
         "de": "anpassung für Responsive Design #121\nasynchrone modbus-code blockieren\nschreiben von daten über die modbus-proxy #119\nweitere Registrierungsdaten von Huawei Emma lesen",
@@ -80,19 +93,6 @@
         "pl": "aktualizacje zależności i konfiguracji\ndostosować role w ścieżce sterowania\nKontrola baterii: dodać zasilanie awaryjne SOC # 84\nfix: błędna nazwa stanu 'control.battery.ActivitSOC' z przepustnicą",
         "uk": "оновлення залежності та конфігурації\nрегулювання ролі в шляху управління\nКонтроль акумулятора: додаємо резервну потужність SOC #84\nвиправити: неправильне ім'я держави `control.battery.targetSOC` з причепом",
         "zh-cn": "依赖和配置更新\n调整控制路径中的角色\n电池控制: 添加备份功率 SOC #84\n修补:错误的州名`control.battery.targetSOC ' ,带有后端空间"
-      },
-      "0.9.0": {
-        "en": "dependency and configuration updates\nmodbus device remains active in standby on the inverter M2,M3",
-        "de": "abhängigkeits- und konfigurationsupdates\nmodbus-Gerät bleibt im Standby am Wechselrichter M2,M3 aktiv",
-        "ru": "обновления зависимости и конфигурации\nmodbus device остается активным в режиме ожидания на инверторе M2,M3",
-        "pt": "atualizações de dependência e configuração\ndispositivo modbus permanece ativo em espera no inversor M2, M3",
-        "nl": "afhankelijkheid en configuratie-updates\nmodbus apparaat blijft actief in stand-by op de omvormer M2,M3",
-        "fr": "mises à jour de la dépendance et de la configuration\nmodbus reste actif en veille sur l'onduleur M2,M3",
-        "it": "aggiornamenti di dipendenza e configurazione\ndispositivo modbus rimane attivo in standby sull'inverter M2,M3",
-        "es": "actualizaciones de dependencia y configuración\ndispositivo modbus permanece activo en espera en el inversor M2,M3",
-        "pl": "aktualizacje zależności i konfiguracji\nurządzenie modbus pozostaje aktywne w gotowości na falowniku M2, M3",
-        "uk": "оновлення залежності та конфігурації\nмотузковий пристрій залишається активним в автономному режимі на інверторі M2,M3",
-        "zh-cn": "依赖和配置更新\nmodbus设备仍然在反转器M2,M3上处于待机状态"
       }
     },
     "titleLang": {

package/lib/modbus/modbus_server.js

@@ -44,11 +44,10 @@ class ModbusServer {
 			},
 			readDeviceIdentification: () => { //function(addr)
 				this._addInfoStat('readDeviceIdentification');
-				console.log('DeviceIntification');
 				return {
 					0x00: 'ioBroker',
 					0x01: 'adapter.sun2000',
-					0x02: '0.14.0',
+					0x02: this.adapter.version,
 					0x05: 'modbus-proxy',
 					0x97: '',
 					0xAB: ''
@@ -149,7 +148,7 @@ class ModbusServer {
 				//this.adapter.log.debug('Device Info '+JSON.stringify(device?.info));
 				const values = device.getHoldingRegisters(startAddr,length);
 				if (!this.adapter.isConnected) {
-					this._addInfoStat('#WaitForConnected',startAddr, length, unitId);
+					//this._addInfoStat('#WaitForConnected',startAddr, length, unitId);
 					await this.wait(500);
 					callback({ modbusErrorCode: 0x05, msg: 'Acknowledge (requested data will be available later)' });
 				} else {
@@ -176,29 +175,44 @@ class ModbusServer {
 
 	async _handleSetReg(address, data, unitId, callback) {
 		try {
-
 			this.log.debug('Modbus-proxy: Try to write data to id/address ' + unitId + '/' + address +'/'+ data);
-			/*
+			const device = this.getDeviceInstance(unitId);
+			if (!device) {
+				await this.wait(500);
+				callback({ modbusErrorCode: 0x01, msg: 'Device ID '+unitId+' not supported by device' });
+				return;
+			}
 			if (!this.adapter.isConnected) {
+				this.log.info('Modbus-proxy: please wait until connected.');
 				callback({ modbusErrorCode: 0x05, msg: 'Acknowledge (requested data will be available later)' });
 				return;
 			}
-			*/
 			if (!this.adapter.modbusClient) {
-				this.log.error('No modbus-client is registered!');
+				this.log.error('Modbus-proxy: no modbus-client is registered!');
 				callback({ modbusErrorCode: 0x04, msg: 'Slave device failure (device reports internal error)' });
 				return;
 			}
 			this.adapter.modbusClient.setID(unitId);
 			if (Array.isArray(data)) {
 				await this.adapter.modbusClient.writeRegisters(address,data);
+				//write also to the read cache
+				device.addHoldingRegisters(address,data);
+				this._addInfoStat('setRegisterArray',address,data.length, unitId);
 			} else {
 				await this.adapter.modbusClient.writeRegister(address,data);
+				device.addHoldingRegisters(address,[data]);
+				this._addInfoStat('setRegister',address,1, unitId);
 			}
 			callback();
 		} catch (err) {
-			this.log.warn('Modbus-proxy: '+err);
-			//callback(JSON.stringify(err));
+			this.log.warn('Modbus-proxy: can not write data to id/address ' + unitId + '/' + address +'/'+ data);
+			this.log.warn('Modbus-proxy: '+err?.message);
+			if (Array.isArray(data)) {
+				this._addInfoStat('#setRegisterArray',address,data.length, unitId);
+			} else {
+				this._addInfoStat('#setRegister',address,1, unitId);
+			}
+			await this.wait(500);
 			callback({ modbusErrorCode: err?.modbusCode, msg: err?.message });
 		}
 	}

package/main.js

@@ -61,7 +61,7 @@ class Sun2000 extends utils.Adapter {
 			},
 			ds: {
 				batteryUnits : true,
-				batterPacks : false
+				batteryPacks : false
 			}
 		};
 
@@ -379,6 +379,17 @@ class Sun2000 extends utils.Adapter {
 						meter: (i==0 && this.settings.integration === 0)
 					});
 				}
+
+				//SDongle
+				if (this.settings.integration === 0 && this.settings.sd.active) {
+					this.devices.push({
+						index: 0,
+						duration: 0,
+						modbusId: this.settings.sd.sDongleId,
+						driverClass: driverClasses.sdongle
+					});
+				}
+
 				//SmartLogger
 				if (this.settings.integration === 1) {
 					this.devices.push({
@@ -398,7 +409,7 @@ class Sun2000 extends utils.Adapter {
 					}
 				}
 
-				//Emma
+				//EMMA
 				if (this.settings.integration === 2) {
 					this.devices.push({
 						index: 0,
@@ -410,16 +421,6 @@ class Sun2000 extends utils.Adapter {
 					});
 				}
 
-				//SDongle
-				if (this.settings.sd.active) {
-					this.devices.push({
-						index: 0,
-						duration: 0,
-						modbusId: this.settings.sd.sDongleId,
-						driverClass: driverClasses.sdongle
-					});
-				}
-
 				await this.adjustInverval();
 				await this.StartProcess();
 			} else {
@@ -451,12 +452,6 @@ class Sun2000 extends utils.Adapter {
 		}
 		await this.state.runPostProcessHooks(dataRefreshRate.high);
 
-		/*
-		if (this.modbusServer) {
-			await this.modbusServer.process(this.modbusClient);
-		}
-		*/
-
 		//Low Loop
 		if (timeLeft(nextLoop) > 0) {
 			for (const [i,item] of this.devices.entries()) {

package/package.json

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