iobroker.bydhvs 1.4.0 → 1.4.2

package/main.js

@@ -53,6 +53,7 @@ let hvsPower;
 let hvsBattType;
 let hvsBattType_fromSerial;
 let hvsInvType;
+let hvsInvType_String;
 let hvsNumCells; //number of cells in system
 let hvsNumTemps; // number of temperatures to count with
 let ConfBatDetailshowoften;
@@ -139,24 +140,26 @@ const myErrors = [
 ];
 
 const myINVs = [
-    "Fronius HV",
-    "Goodwe HV",
-    "Fronius HV",
-    "Kostal HV",
-    "Goodwe HV",
-    "SMA SBS3.7/5.0",
-    "Kostal HV",
-    "SMA SBS3.7/5.0",
-    "Sungrow HV",
-    "Sungrow HV",
-    "Kaco HV",
-    "Kaco HV",
-    "Ingeteam HV",
-    "Ingeteam HV",
-    "SMA SBS 2.5 HV",
-    "",
-    "SMA SBS 2.5 HV",
-    "Fronius HV"
+    "Fronius HV", //0
+    "Goodwe HV", //1
+    "Fronius HV", //2
+    "Kostal HV", //3
+    "Goodwe HV",  //4
+    "SMA SBS3.7/5.0", //5
+    "Kostal HV", //6
+    "SMA SBS3.7/5.0",  //7
+    "Sungrow HV", //8
+    "Sungrow HV", //9
+    "Kaco HV", //10
+    "Kaco HV", //11
+    "Ingeteam HV", //12
+    "Ingeteam HV", //13
+    "SMA SBS 2.5 HV", //14
+    "undefined", //15
+    "SMA SBS 2.5 HV", //16
+    "Fronius HV", //17
+    "undefined", //18
+    "SMA STP"  //19
 ];
 
 const myINVsLVS = [
@@ -179,7 +182,8 @@ const myINVsLVS = [
     "SMA SBS2.5 HV",
     "Solar Edge LV",
     "Solar Edge LV",
-    "Solar Edge LV"
+    "Solar Edge LV",
+    "unknown"
 ];
 
 
@@ -439,11 +443,9 @@ function decodePacket0(data) {
     }
     hvsBMS = "V" + byteArray[31].toString() + "." + byteArray[32].toString() + "-" + String.fromCharCode(byteArray[34] + 65);
     hvsModules = parseInt((byteArray[36] - 16).toString());
-    if (byteArray[38] === 1) {
-        hvsGrid = "OnGrid";
-    } else {
-        hvsGrid = "OffGrid";
-    }
+    if (byteArray[38] === 0) {hvsGrid = "OffGrid";}
+	if (byteArray[38] === 1) {hvsGrid = "OnGrid";}
+	if (byteArray[38] === 2) {hvsGrid = "Backup";}
     /*    if ((ConfBatDetails) && (hvsModules > 2)) {
             adapter.log.error("Sorry, Details at the moment only for two modules. I need a wireshark dump from bigger systems to adjust the adapter.");
             ConfBatDetails = false;
@@ -516,6 +518,16 @@ function decodePacket2(data) {
         hvsNumCells = hvsModules * 7;
         hvsNumTemps = 0;
     }
+    if (hvsBattType_fromSerial == "LVS") { //unterschiedliche WR-Tabelle je nach Batt-Typ
+        hvsInvType_String = myINVsLVS[hvsInvType];
+    }
+    else {
+        hvsInvType_String = myINVs[hvsInvType];        
+    }
+    if (hvsInvType_String == undefined) {
+        hvsInvType_String = "undefined";
+    }
+
     if (hvsNumCells > 160) { hvsNumCells = 160; }
     if (hvsNumTemps > 64) { hvsNumTemps = 64; }
     if (ConfBatDetails && FirstRun) {
@@ -657,7 +669,9 @@ function setStates() {
     adapter.log.silly("hvsError        >" + hvsError + "<");
     adapter.log.silly("hvsErrorStr     >" + hvsErrorString + "<");
     adapter.log.silly("hvsSOC (Diag)   >" + hvsSOCDiagnosis + "<");
-
+    adapter.log.silly("BattType        >" + hvsBattType_fromSerial + "<");
+    adapter.log.silly("Invert. Type    >" + hvsInvType_String + ", Nr: " + hvsInvType + "<");    
+ 
     adapter.setState("System.Serial", hvsSerial, true);
     adapter.setState("System.BMU", hvsBMU, true);
     adapter.setState("System.BMUBankA", hvsBMUA, true);
@@ -687,12 +701,10 @@ function setStates() {
         adapter.setState("State.Power_Consumption", 0, true);
         adapter.setState("State.Power_Delivery", -hvsPower, true);
     }
-    adapter.setState("System.BattType", myBattTypes[hvsBattType], true);
-    if (hvsBattType_fromSerial == "LVS") { //unterschiedliche WR-Tabelle je nach Batt-Typ
-        adapter.setState("System.InvType", myINVsLVS[hvsInvType], true);
-    } else {
-        adapter.setState("System.InvType", myINVs[hvsInvType], true);
-    }
+
+    adapter.setState("System.BattType", hvsBattType_fromSerial, true);
+    adapter.setState("System.InvType", hvsInvType_String, true);
+
     if (myNumberforDetails == 0) {
         adapter.setState("Diagnosis.mVoltMax", hvsMaxmVolt, true);
         adapter.setState("Diagnosis.mVoltMin", hvsMinmVolt, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bydhvs",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "BYD HVS Battery poll data",
   "author": {
     "name": "Christian",
@@ -17,29 +17,29 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^2.6.7",
-    "crc": "4.1.1"
+    "crc": "4.3.2"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.5.9",
-    "@iobroker/testing": "^3.0.2",
-    "@types/chai": "^4.3.3",
+    "@alcalzone/release-script": "^3.6.0",
+    "@iobroker/testing": "^4.1.0",
+    "@types/chai": "^4.3.6",
     "@types/chai-as-promised": "^7.1.5",
-    "@types/gulp": "^4.0.9",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.11.8",
+    "@types/gulp": "^4.0.10",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.14.2",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
-    "@types/sinon-chai": "^3.2.8",
-    "axios": "^0.27.2",
-    "chai": "^4.3.6",
+    "@types/sinon-chai": "^3.2.9",
+    "axios": "^1.3.4",
+    "chai": "^4.3.8",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.26.0",
+    "eslint": "^8.35.0",
     "gulp": "^4.0.2",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^14.0.0",
+    "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.5"
   },
   "main": "main.js",
   "scripts": {