iobroker.amtronwallbox 0.1.0 → 0.2.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 rg-engineering <info@rg-engineering.eu>
+Copyright (c) 2022-2023 rg-engineering info@rg-engineering.eu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -26,7 +26,13 @@ For more details and for information how to disable the error reporting see [Sen
    
 ## Changelog
 
-### 0.1.0 (in progress)
+### 0.2.2 (2023-04-07)
+* (René) dependencies updated
+
+### 0.2.0 (2023-01-31)
+* (René) see issue #1: write data to XTRA wallbox (experimentel)
+
+### 0.1.0 (2022-12-18)
 * (René) see issue #1: support of XTRA
 
 ### 0.0.3 (2022-08-18)
@@ -40,7 +46,7 @@ For more details and for information how to disable the error reporting see [Sen
 ## License
 MIT License
 
-Copyright (c) 2022 rg-engineering info@rg-engineering.eu
+Copyright (c) 2022-2023 rg-engineering info@rg-engineering.eu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -61,4 +67,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-

package/io-package.json

@@ -1,22 +1,9 @@
 {
     "common": {
         "name": "amtronwallbox",
-        "version": "0.1.0",
+        "version": "0.2.2",
         "news": {
-            "0.1.0": {
-                "en": "support for XTRA added",
-                "de": "Unterstützung für XTRA hinzugefügt",
-                "ru": "добавлена ​​поддержка XTRA",
-                "pt": "suporte para XTRA adicionado",
-                "nl": "ondersteuning voor XTRA toegevoegd",
-                "fr": "prise en charge de XTRA ajoutée",
-                "it": "supporto per XTRA aggiunto",
-                "es": "soporte para XTRA añadido",
-                "pl": "dodano obsługę XTRA",
-                "uk": "додано підтримку XTRA",
-                "zh-cn": "添加了对 XTRA 的支持"
-            },
-            "0.0.3": {
+            "0.2.1": {
                 "en": "dependencies updated",
                 "de": "Abhängigkeiten aktualisiert",
                 "ru": "зависимости обновлены",
@@ -25,22 +12,22 @@
                 "fr": "dépendances mises à jour",
                 "it": "dipendenze aggiornate",
                 "es": "dependencias actualizadas",
-                "pl": "zaktualizowano zależności",
-                "zh-cn": "已更新依赖项",
-                "uk": "залежності оновлено"
+                "pl": "zaktualizowane zależności",
+                "uk": "залежності оновлено",
+                "zh-cn": "依赖更新"
             },
-            "0.0.1": {
-                "en": "initial release",
-                "de": "Erstveröffentlichung",
-                "ru": "Первый выпуск",
-                "pt": "lançamento inicial",
-                "nl": "Eerste uitgave",
-                "fr": "Première version",
-                "it": "Versione iniziale",
-                "es": "Versión inicial",
-                "pl": "Pierwsze wydanie",
-                "zh-cn": "初始发行",
-                "uk": "початковий випуск"
+            "0.2.0": {
+                "en": "write data to XTRA wallbox",
+                "de": "Daten in die XTRA Wallbox schreiben",
+                "ru": "записать данные в XTRA Wallbox",
+                "pt": "gravar dados na caixa de embutir XTRA",
+                "nl": "schrijf gegevens naar XTRA wallbox",
+                "fr": "écrire des données sur la wallbox XTRA",
+                "it": "scrivere i dati nella wallbox XTRA",
+                "es": "escribir datos en la caja de pared XTRA",
+                "pl": "zapis danych do stacji ładowania XTRA",
+                "uk": "записати дані на XTRA wallbox",
+                "zh-cn": "将数据写入 XTRA wallbox"
             }
         },
         "titleLang": {

package/main.js

@@ -1,4 +1,4 @@
-/*
+/*
  * AMTRON wallbox adapter für iobroker
  *
  * Created: 15.05.2022 18:39:28
@@ -448,22 +448,197 @@ async function HandleStateChange(id, state) {
 
     if (state.ack !== true) {
 
-        adapter.log.debug("handle state change " + id);
+        adapter.log.debug("handle state change " + id + " with " + state.val);
         const ids = id.split(".");
 
-        //just dummy
-        //if (ids[2] === "cmd") {
-        //    await do_Command();
-        //}
-        //else {
+        //unhandled state change amtronwallbox.0.Test.info.DevName
+        if (ids[3] === "info") {
+            await updateInfo(id, state);
+            adapter.setForeignState(id, { ack: true });
+        }
+        else if (ids[3] === "charge") {
+            await updateCharge(id, state);
+            adapter.setForeignState(id, { ack: true });
+        }
+        else {
             adapter.log.warn("unhandled state change " + id);
-        //}
+        }
+    }
+}
+
+async function updateInfo(id,state) {
+
+    let systemName = id.split(".")[2];
+
+    for (const system of adapter.config.WallboxSystems) {
+
+        if (system.Name == systemName && system.IsActive) {
+            if (system.Type === "ChargeControl") {
+                
+            }
+            else if (system.Type === "Compact") {
+                await write_MHCP_DevInfo(system, id,state);
+            }
+            else if (system.Type === "Xtra") {
+                await write_MHCP_DevInfo(system, id, state);
+            }
+
+            else {
+                //system type ChargeControl string not yet implemented
+                adapter.log.warn("system type " + system.Type + " " + typeof system.Type + " not yet implemented");
+            }
+        }
+    }
+}
+
+async function updateCharge(id, state) {
+
+    let systemName = id.split(".")[2];
+
+    for (const system of adapter.config.WallboxSystems) {
+
+        if (system.Name == systemName && system.IsActive) {
+            if (system.Type === "ChargeControl") {
+
+            }
+            else if (system.Type === "Compact") {
+                await write_MHCP_ChargeData(system, id, state);
+            }
+            else if (system.Type === "Xtra") {
+                await write_MHCP_ChargeData(system, id, state);
+            }
+
+            else {
+                //system type ChargeControl string not yet implemented
+                adapter.log.warn("system type " + system.Type + " " + typeof system.Type + " not yet implemented");
+            }
+        }
+    }
+}
+
+async function write_MHCP_DevInfo(system, id, state) {
+    try {
+        let sURL = "http://" + system.IPAddress + ":25000/MHCP/1.0/DevInfo?DevKey=" + system.ApiKey;
+
+        let config = {
+            headers: {
+                Accept: 'application/json '
+            },
+            timeout: 5000
+
+        }
+
+        let param = id.split(".")[4];
+
+        let data = {
+            "DevName": param == "DevName" ? state.val : null,
+            "LocTime": param == "LocTime" ? state.val : null,
+            "Summer": param == "Summer" ? state.val : null,
+            "Tz": param == "Tz" ? state.val : null,
+            "FixedVehCosts": param == "FixedVehCosts" ? state.val : null,
+            "OldVehCosts": param == "OldVehCosts" ? state.val : null,
+            "Battery": param == "Battery" ? state.val : null,
+            "DevMode": param == "DevMode" ? state.val : null,
+        }
+
+        adapter.log.debug("URL " + sURL.replace(/DevKey=.*/, 'DevKey=******') + " data " + JSON.stringify(data));
+
+
+        let buffer = await axios.post(sURL, data, config);
+
+        adapter.log.debug("got result " + typeof buffer.data + " " + JSON.stringify(buffer.data));
+
+        
     }
+    catch (e) {
+        adapter.log.error("exception in write_MHCP_DevInfo [" + e + "]");
+    }
+}
+
+async function write_MHCP_ChargeData(system, id, state) {
+    try {
+        let sURL = "http://" + system.IPAddress + ":25000/MHCP/1.0/ChargeData?DevKey=" + system.ApiKey;
+
+        let config = {
+            headers: {
+                Accept: 'application/json '
+            },
+            timeout: 5000
 
+        }
+
+        let param = id.split(".")[4];
+
+        let data = {
+            "Permanent": true,
+            "RemoteCurr": param == "RemoteCurr" ? state.val : null,
+            "AutoChg": param == "AutoChg" ? state.val : null,
+            "ChgState": param == "ChgState" ? state.val : null,
+            "Uid": param == "Uid" ? state.val : null,
+        }
+
+        adapter.log.debug("URL " + sURL.replace(/DevKey=.*/, 'DevKey=******') + " data " + JSON.stringify(data));
+
+
+        let buffer = await axios.post(sURL, data, config);
+
+        adapter.log.debug("got result " + typeof buffer.data + " " + JSON.stringify(buffer.data));
+
+
+    }
+    catch (e) {
+        adapter.log.error("exception in write_MHCP_ChargeData [" + e + "]");
+    }
 }
 
 function subscribeVars() {
-    //adapter.subscribeStates("cmd");
+    for (const system of adapter.config.WallboxSystems) {
+
+        if (system.IsActive) {
+            if (system.Type === "ChargeControl") {
+                
+            }
+            else if (system.Type === "Compact") {
+                
+            }
+            else if (system.Type === "Xtra") {
+
+                //All parameters can be set to null if no change is intended.
+                //https://github.com/lephisto/amtron/blob/master/docs/api/DevInfo/post.md
+                adapter.subscribeStates(system.Name + ".info.DevName");
+                adapter.subscribeStates(system.Name + ".info.LocTime");
+                adapter.subscribeStates(system.Name + ".info.Summer");
+                adapter.subscribeStates(system.Name + ".info.Tz");
+                adapter.subscribeStates(system.Name + ".info.FixedVehCosts");
+                adapter.subscribeStates(system.Name + ".info.OldVehCosts");
+                adapter.subscribeStates(system.Name + ".info.Battery");
+                adapter.subscribeStates(system.Name + ".info.DevMode");
+
+                //All parameters except "Permanent" can be set to null if no change is intended.
+                //https://github.com/lephisto/amtron/blob/master/docs/api/ChargeData/post.md
+                //adapter.subscribeStates(system.Name + ".charge.Permanent");
+                adapter.subscribeStates(system.Name + ".charge.RemoteCurr");
+                //adapter.subscribeStates(system.Name + ".charge.AutoChg"); //gibt es den DP?
+                adapter.subscribeStates(system.Name + ".charge.ChgState");
+                adapter.subscribeStates(system.Name + ".charge.Uid");
+
+                //Solar price can be set to null when no changes have to be made.
+                //https://github.com/lephisto/amtron/blob/master/docs/api/HomeManager/post.md
+
+
+                //https://github.com/lephisto/amtron/blob/master/docs/api/Whitelist/post.md
+
+
+            }
+
+            else {
+                //system type ChargeControl string not yet implemented
+                adapter.log.warn("system type " + system.Type + " " + typeof system.Type + " not yet implemented");
+            }
+        }
+    }
+
+
 }
 
 
@@ -1069,7 +1244,7 @@ async function checkVariables_MHCP(system) {
             type: "number",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1095,7 +1270,7 @@ async function checkVariables_MHCP(system) {
             type: "number",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1186,7 +1361,7 @@ async function checkVariables_MHCP(system) {
             type: "number",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1199,7 +1374,7 @@ async function checkVariables_MHCP(system) {
             type: "number",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1225,7 +1400,7 @@ async function checkVariables_MHCP(system) {
             type: "string",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1303,7 +1478,7 @@ async function checkVariables_MHCP(system) {
             type: "number",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1425,7 +1600,7 @@ async function checkVariables_MHCP(system) {
             type: "string",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1464,7 +1639,7 @@ async function checkVariables_MHCP(system) {
             type: "string",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1691,7 +1866,7 @@ async function checkVariables_MHCP(system) {
             unit: "A",
             role: "value",
             read: true,
-            write: false
+            write: true
         }
     }
     await CreateObject(key, obj);
@@ -1771,7 +1946,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             unit:"Wh",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1784,7 +1959,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             type: "number",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1797,7 +1972,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             type: "number",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1810,7 +1985,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             type: "number",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1823,7 +1998,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             type: "number",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1836,7 +2011,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             type: "number",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1849,7 +2024,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             type: "number",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1862,7 +2037,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
             type: "number",
             role: "value",
             read: true,
-            write: true
+            write: false
         }
     }
     await CreateObject(key, obj);
@@ -1878,7 +2053,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
                 type: "number",
                 role: "value",
                 read: true,
-                write: true
+                write: false
             }
         }
         await CreateObject(key, obj);
@@ -1891,7 +2066,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
                 type: "number",
                 role: "value",
                 read: true,
-                write: true
+                write: false
             }
         }
         await CreateObject(key, obj);
@@ -1904,7 +2079,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
                 type: "number",
                 role: "value",
                 read: true,
-                write: true
+                write: false
             }
         }
         await CreateObject(key, obj);
@@ -1917,7 +2092,7 @@ async function checkVariables_MHCP_Statistic(system, period) {
                 type: "number",
                 role: "value",
                 read: true,
-                write: true
+                write: false
             }
         }
         await CreateObject(key, obj);
@@ -2031,12 +2206,12 @@ function CronStatus() {
     let n = 0;
     let length = 0;
     try {
-        if (typeof cronJobs !== undefined && cronJobs != null) {
+        if (cronJobs !== undefined && cronJobs != null) {
 
             length = cronJobs.length;
             //adapter.log.debug("cron jobs");
             for (n = 0; n < length; n++) {
-                if (typeof cronJobs[n] !== undefined && cronJobs[n] != null) {
+                if ( cronJobs[n] !== undefined && cronJobs[n] != null) {
                     adapter.log.debug("cron status = " + cronJobs[n].running + " next event: " + timeConverter("DE", cronJobs[n].nextDates()));
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.amtronwallbox",
-  "version": "0.1.0",
+  "version": "0.2.2",
   "description": "ioBroker Adapter for AMTRON wallboxes",
   "author": {
     "name": "René G.",
@@ -21,9 +21,9 @@
     "url": "https://github.com/rg-engineering/ioBroker.amtronwallbox"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "2.6.7",
-    "axios": "1.2.0",
-    "cron": "2.1.0"
+    "@iobroker/adapter-core": "2.6.8",
+    "axios": "0.27.2",
+    "cron": "2.3.0"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "1.2.0",
@@ -31,20 +31,20 @@
     "@types/chai": "4.3.4",
     "@types/chai-as-promised": "7.1.5",
     "@types/gulp": "4.0.10",
-    "@types/mocha": "10.0.0",
-    "@types/node": "18.11.9",
+    "@types/mocha": "10.0.1",
+    "@types/node": "18.15.11",
     "@types/proxyquire": "1.3.28",
     "@types/request-promise-native": "1.0.18",
     "@types/sinon": "10.0.13",
     "@types/sinon-chai": "3.2.9",
-    "axios": "1.2.0",
+    "axios": "0.27.2",
     "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.28.0",
+    "eslint": "8.37.0",
     "gulp": "4.0.2",
-    "mocha": "10.1.0",
+    "mocha": "10.2.0",
     "proxyquire": "2.1.3",
-    "sinon": "15.0.0",
+    "sinon": "15.0.3",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",