iobroker.easee 1.0.4 → 1.0.7

package/README.md

@@ -30,6 +30,15 @@ chargerOpMode =
 dynamicCircuitCurrentPX -> All phases must be set within 500ms (script) otherwise the phase will be set to 0.    
 
 ## Changelog
+### 1.0.7
+* (Newan) Changed login URL
+
+### 1.0.6
+* (Newan) Changed that smart charging is editable
+
+### 1.0.5
+* (marwin79) More Features supported and convert values to expected datatypes
+
 ### 1.0.4
 * (Newan) dynamicCircuitCurrentPX writeable (set all Phases in 500ms) to limit ampere 
 

package/io-package.json

@@ -1,8 +1,44 @@
 {
     "common": {
         "name": "easee",
-        "version": "1.0.4",
+        "version": "1.0.7",
         "news": {
+            "1.0.7": {
+                "en": "Changed login URL",
+                "de": "Änderung der Login-URL",
+                "ru": "Изменить URL входа",
+                "pt": "URL de login alterado",
+                "nl": "Veranderde login URL",
+                "fr": "Changement d'URL de connexion",
+                "it": "URL di login modificato",
+                "es": "URL de inicio de sesión cambiado",
+                "pl": "Zmienił login URL",
+                "zh-cn": "变化的伐木"
+            },            
+            "1.0.6": {
+                "en": "Changed that smart charging is editable",
+                "de": "Geändert, dass Smart Charging bearbeitet werden kann",
+                "ru": "Изменено, что умная зарядка доступна для редактирования",
+                "pt": "Alterado que o carregamento inteligente é editável",
+                "nl": "Gewijzigd dat slim opladen bewerkbaar is",
+                "fr": "Changé que la charge intelligente est modifiable",
+                "it": "Modificato che la ricarica intelligente è modificabile",
+                "es": "Se modificó que la carga inteligente es editable",
+                "pl": "Zmieniono, że inteligentne ładowanie można edytować",
+                "zh-cn": "更改智能充电可编辑"
+            },
+            "1.0.5": {
+                "en": "marwin79 - More Features supported and convert values to expected datatypes",
+                "de": "marwin79 - Weitere unterstützte Funktionen und Konvertieren von Werten in erwartete Datentypen",
+                "ru": "marwin79 - Поддерживаются дополнительные функции и преобразование значений в ожидаемые типы данных",
+                "pt": "marwin79 - Mais recursos suportados e convertem valores em tipos de dados esperados",
+                "nl": "marwin79 - Meer ondersteunde functies en converteer waarden naar verwachte datatypes",
+                "fr": "marwin79 - Plus de fonctionnalités prises en charge et convertir les valeurs en types de données attendus",
+                "it": "marwin79 - Altre funzionalità supportate e converte i valori nei tipi di dati previsti",
+                "es": "marwin79: se admiten más funciones y se convierten los valores en los tipos de datos esperados",
+                "pl": "marwin79 - Więcej funkcji obsługiwanych i konwertowanie wartości na oczekiwane typy danych",
+                "zh-cn": "marwin79 - 支持更多功能并将值转换为预期的数据类型"
+            },
             "1.0.4": {
                 "en": "dynamicCircuitCurrentPX writeable (set all phases in 500ms) to limit ampere ",
                 "de": "dynamicCircuitCurrentPX beschreibbar (alle Phasen in 500ms einstellen) um Ampere zu begrenzen",

package/lib/enum.js

@@ -331,16 +331,21 @@ const easeeIds = {
     36: '.config.wiFiSSID',
     38: '.config.phaseMode',
     40: '.config.ledStripBrightness',
+    44: '.config.smartButtonEnabled',
+
     48: '.config.dynamicChargerCurrent',
+    111: '.config.dynamicCircuitCurrentP1',
+    112: '.config.dynamicCircuitCurrentP2',
+    113: '.config.dynamicCircuitCurrentP3',
 
     //Status
+    46: '.status.ledMode',
     68: '.status.wiFiAPEnabled',
     82: '.status.chargerFirmware',
+    96: '.status.reasonForNoCurrent',
+    102: '.status.smartCharging',
     103: '.status.cableLocked',
     109: '.status.chargerOpMode',
-    111: '.status.dynamicCircuitCurrentP1',
-    112: '.status.dynamicCircuitCurrentP2',
-    113: '.status.dynamicCircuitCurrentP3',
     110: '.status.outputCurrent',
     120: '.status.totalPower',
     122: '.status.energyPerHour',
@@ -353,8 +358,17 @@ const easeeIds = {
     182: '.status.inCurrentT2',
     183: '.status.inCurrentT3',
     184: '.status.inCurrentT4',
-    186: '.status.inCurrentT5',
-
+    185: '.status.inCurrentT5',
+    190: '.status.inVoltageT1T2',
+    191: '.status.inVoltageT1T3',
+    192: '.status.inVoltageT1T4',
+    193: '.status.inVoltageT1T5',
+    194: '.status.inVoltageT2T3',
+    195: '.status.inVoltageT2T4',
+    196: '.status.inVoltageT2T5',
+    197: '.status.inVoltageT3T4',
+    198: '.status.inVoltageT3T5',
+    199: '.status.inVoltageT4T5',
 };
 Object.freeze(easeeIds);
 

package/main.js

@@ -18,7 +18,6 @@ let roundCounter = 0;
 const arrCharger = [];
 
 //Variable für dynamicCircuitCurrentPX
-let timerDynamicCircuitCurrent;
 let dynamicCircuitCurrentP1 = 0;
 let dynamicCircuitCurrentP2 = 0;
 let dynamicCircuitCurrentP3 = 0;
@@ -49,23 +48,36 @@ class Easee extends utils.Adapter {
             .build();
 
         connection.on('ProductUpdate', data => {
-            //haben einen neuen Wert über SIgnalR erhalten
-            if(objEnum.getNameByEnum(data.id) == undefined) {
+            //haben einen neuen Wert über SignalR erhalten
+            const data_name = objEnum.getNameByEnum(data.id);
+            if (data_name == undefined) {
                 this.log.debug('New SignalR-ID, possible new Value: ' + data.id);
                 this.log.debug(JSON.stringify(data));
             } else {
                 //Value is in ioBroker, update it
-                const tmpValueId = data.mid + objEnum.getNameByEnum(data.id);
-                this.log.info('New value over SignalR for: ' + tmpValueId + 'value: ' + data.value);
+                const tmpValueId = data.mid + data_name;
+                this.log.debug('New value over SignalR for: ' + tmpValueId + ', value: ' + data.value);
+                switch (data.dataType) {
+                    case 2:
+                        data.value = data.value == '1';
+                        break;
+                    case 3:
+                        data.value = parseFloat(data.value);
+                        break;
+                    case 4:
+                        data.value = parseInt(data.value);
+                        break;
+                    //case 6: JSON
+                }
                 this.setStateAsync(tmpValueId, { val: data.value, ack: true });
             }
         });
 
         connection.start().then(() => {
             //for each charger subscribe SignalR
-            arrCharger.forEach(charger => {
-                connection.send('SubscribeWithCurrentState', 'EH530097', true).then(() => {
-                    this.log.info('Charger registrate in SignalR: ' + charger.id);
+            arrCharger.forEach(charger_id => {
+                connection.send('SubscribeWithCurrentState', charger_id, true).then(() => {
+                    this.log.info('Charger registrate in SignalR: ' + charger_id);
                 });
             });
         });
@@ -97,7 +109,6 @@ class Easee extends utils.Adapter {
             this.log.error('No password set');
         } else {
             this.log.debug('Api login started');
-            this.log.debug('Password is:' + this.config.client_secret);
             const login = await this.login(this.config.username, this.config.client_secret);
             if (login) {
                 //Erstes Objekt erstellen
@@ -147,7 +158,7 @@ class Easee extends utils.Adapter {
     async readAllStates() {
         if(expireTime <= Date.now()) {
             //Token ist expired!
-            this.log.info('Token is Expired - refresh');
+            this.log.info('Token has expired - refresh');
             await this.refreshToken();
         }
 
@@ -167,7 +178,7 @@ class Easee extends utils.Adapter {
                     arrCharger.push(charger.id);
                 }
 
-                this.log.debug('Charger gefunden');
+                this.log.debug('Charger found');
                 this.log.debug(JSON.stringify(charger));
                 try {
 
@@ -189,9 +200,12 @@ class Easee extends utils.Adapter {
                         //etzen die Objekte
                         this.setNewSessionToCharger(charger, tmpChargerSession);
                     }
-                } catch (err) {
-                    //geben die Fehlermeldng der API-funktion aus
-                    this.log.error(err);
+                } catch (error) {
+                    if (typeof error === 'string') {
+                        this.log.error(error);
+                    } else if (error instanceof Error) {
+                        this.log.error(error.message);
+                    }
                 }
 
             });
@@ -232,11 +246,9 @@ class Easee extends utils.Adapter {
                             this.log.debug('Update circuitMaxCurrent to: ' + state.val);
                             this.log.debug('Get infos from site:');
                             this.log.debug(JSON.stringify(site));
-                            this.log.debug('Get infos from site:');
-                            this.log.debug(JSON.stringify(site));
 
                             this.changeMaxCircuitConfig(site.id, site.circuits[0].id, state.val);
-                            this.log.debug('Changes send to API');
+                            this.log.debug('Changes sent to API');
                         });
                     } else if (tmpControl[4] == 'dynamicCircuitCurrentP1' || tmpControl[4] == 'dynamicCircuitCurrentP2' || tmpControl[4] == 'dynamicCircuitCurrentP3') {
 
@@ -248,13 +260,13 @@ class Easee extends utils.Adapter {
                             //setze die WErte für das Update
                             switch(tmpControl[4]) {
                                 case 'dynamicCircuitCurrentP1':
-                                    dynamicCircuitCurrentP1 = state.val;
+                                    dynamicCircuitCurrentP1 = Number(state.val);
                                     break;
                                 case 'dynamicCircuitCurrentP2':
-                                    dynamicCircuitCurrentP2 = state.val;
+                                    dynamicCircuitCurrentP2 = Number(state.val);
                                     break;
                                 case 'dynamicCircuitCurrentP3':
-                                    dynamicCircuitCurrentP3 = state.val;
+                                    dynamicCircuitCurrentP3 = Number(state.val);
                                     break;
                             }
 
@@ -273,7 +285,7 @@ class Easee extends utils.Adapter {
                     } else {
                         this.log.debug('update config to API: ' + id);
                         this.changeConfig(tmpControl[2], tmpControl[4], state.val);
-                        this.log.debug('Changes send to API');
+                        this.log.debug('Changes sent to API');
                     }
                 }
             } else {
@@ -327,31 +339,43 @@ class Easee extends utils.Adapter {
         await this.setStateAsync(charger.id + '.status.wiFiRSSI', charger_states.wiFiRSSI, true);
         await this.setStateAsync(charger.id + '.status.chargerFirmware', charger_states.chargerFirmware, true);
         await this.setStateAsync(charger.id + '.status.latestFirmware', charger_states.latestFirmware, true);
+        await this.setStateAsync(charger.id + '.status.reasonForNoCurrent', charger_states.reasonForNoCurrent, true);
         await this.setStateAsync(charger.id + '.status.voltage', charger_states.voltage, true);
         await this.setStateAsync(charger.id + '.status.outputCurrent', charger_states.outputCurrent, true);
         await this.setStateAsync(charger.id + '.status.isOnline', charger_states.isOnline, true);
         await this.setStateAsync(charger.id + '.status.wiFiAPEnabled', charger_states.wiFiAPEnabled, true);
+        await this.setStateAsync(charger.id + '.status.ledMode', charger_states.ledMode, true);
         await this.setStateAsync(charger.id + '.status.lifetimeEnergy', charger_states.lifetimeEnergy, true);
         await this.setStateAsync(charger.id + '.status.energyPerHour', charger_states.energyPerHour, true);
         await this.setStateAsync(charger.id + '.status.inCurrentT2', charger_states.inCurrentT2, true);
         await this.setStateAsync(charger.id + '.status.inCurrentT3', charger_states.inCurrentT3, true);
         await this.setStateAsync(charger.id + '.status.inCurrentT4', charger_states.inCurrentT4, true);
         await this.setStateAsync(charger.id + '.status.inCurrentT5', charger_states.inCurrentT5, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT1T2', charger_states.inVoltageT1T2, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT1T3', charger_states.inVoltageT1T3, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT1T4', charger_states.inVoltageT1T4, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT1T5', charger_states.inVoltageT1T5, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT2T3', charger_states.inVoltageT2T3, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT2T4', charger_states.inVoltageT2T4, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT2T5', charger_states.inVoltageT2T5, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT3T4', charger_states.inVoltageT3T4, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT3T5', charger_states.inVoltageT3T5, true);
+        await this.setStateAsync(charger.id + '.status.inVoltageT4T5', charger_states.inVoltageT4T5, true);
 
         //wert der config wird nur hier gesendet
         await this.setStateAsync(charger.id + '.config.dynamicChargerCurrent', { val: charger_states.dynamicChargerCurrent, ack: true });
         await this.setStateAsync(charger.id + '.config.dynamicCircuitCurrentP1', { val: charger_states.dynamicCircuitCurrentP1, ack: true });
         await this.setStateAsync(charger.id + '.config.dynamicCircuitCurrentP2', { val: charger_states.dynamicCircuitCurrentP2, ack: true });
         await this.setStateAsync(charger.id + '.config.dynamicCircuitCurrentP3', { val: charger_states.dynamicCircuitCurrentP3, ack: true });
-
+        await this.setStateAsync(charger.id + '.config.smartCharging', charger_states.smartCharging, true);
     }
 
-
     //Setzen alle Status für Config
     async setConfigStatus(charger, charger_config) {
         await this.setStateAsync(charger.id + '.config.isEnabled',{ val: charger_config.isEnabled, ack: true } );
         await this.setStateAsync(charger.id + '.config.phaseMode', { val: charger_config.phaseMode, ack: true });
         await this.setStateAsync(charger.id + '.config.ledStripBrightness', { val: charger_config.ledStripBrightness, ack: true });
+        await this.setStateAsync(charger.id + '.config.smartButtonEnabled', { val: charger_config.smartButtonEnabled, ack: true });
         await this.setStateAsync(charger.id + '.config.wiFiSSID', { val: charger_config.wiFiSSID, ack: true });
         await this.setStateAsync(charger.id + '.config.maxChargerCurrent', { val: charger_config.maxChargerCurrent, ack: true });
 
@@ -359,8 +383,6 @@ class Easee extends utils.Adapter {
         await this.setStateAsync(charger.id + '.config.circuitMaxCurrentP1', { val: charger_config.circuitMaxCurrentP1, ack: true });
         await this.setStateAsync(charger.id + '.config.circuitMaxCurrentP2', { val: charger_config.circuitMaxCurrentP3, ack: true });
         await this.setStateAsync(charger.id + '.config.circuitMaxCurrentP3', { val: charger_config.circuitMaxCurrentP3, ack: true });
-
-
     }
 
     /*************************************************************************
@@ -372,7 +394,7 @@ class Easee extends utils.Adapter {
     async login(username, password) {
 
         try {
-            const response = await axios.post(apiUrl + '/api/accounts/token', {
+            const response = await axios.post(apiUrl + '/api/accounts/login', {
                 userName: username,
                 password: password
             });
@@ -387,7 +409,11 @@ class Easee extends utils.Adapter {
             return true;
         } catch (error) {
             this.log.error('Api login error - check Username and password');
-            this.log.debug(error.message);
+            if (typeof error === 'string') {
+                this.log.error(error);
+            } else if (error instanceof Error) {
+                this.log.error(error.message);
+            }
             await this.setStateAsync('info.connection', false, true);
             return false;
         }
@@ -775,6 +801,19 @@ class Easee extends utils.Adapter {
             native: {},
         });
 
+        //"reasonForNoCurrent": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.reasonForNoCurrent', {
+            type: 'state',
+            common: {
+                name: 'Reason for not offering current to the car',
+                type: 'number',
+                role: 'value',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+
         //"voltage": 0,
         await this.setObjectNotExistsAsync(charger.id + '.status.voltage', {
             type: 'state',
@@ -853,6 +892,127 @@ class Easee extends utils.Adapter {
             native: {},
         });
 
+        //"inVoltageT1T2": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT1T2', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T1 and T2 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT1T3": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT1T3', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T1 and T3 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT1T4": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT1T4', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T1 and T4 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT1T5": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT1T5', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T1 and T5 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT2T3": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT2T3', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T2 and T3 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT2T4": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT2T4', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T2 and T4 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT2T5": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT2T5', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T2 and T5 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT3T4": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT3T4', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T3 and T4 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT3T5": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT3T5', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T3 and T5 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+        //"inVoltageT4T5": 0,
+        await this.setObjectNotExistsAsync(charger.id + '.status.inVoltageT4T5', {
+            type: 'state',
+            common: {
+                name: 'Current Voltage for between inputs T4 and T5 [Volts]',
+                type: 'number',
+                role: 'value.voltage',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+
         //"isOnline": true,
         await this.setObjectNotExistsAsync(charger.id + '.status.isOnline', {
             type: 'state',
@@ -879,6 +1039,19 @@ class Easee extends utils.Adapter {
             native: {},
         });
 
+        //"ledMode": true,
+        await this.setObjectNotExistsAsync(charger.id + '.status.ledMode', {
+            type: 'state',
+            common: {
+                name: 'Charger LED mode',
+                type: 'number',
+                role: 'value',
+                read: true,
+                write: false,
+            },
+            native: {},
+        });
+
         //"lifetimeEnergy": 0,
         await this.setObjectNotExistsAsync(charger.id + '.status.lifetimeEnergy', {
             type: 'state',
@@ -1165,6 +1338,34 @@ class Easee extends utils.Adapter {
         });
         this.subscribeStates(charger.id + '.config.ledStripBrightness');
 
+        //"smartCharging": true,
+        await this.setObjectNotExistsAsync(charger.id + '.config.smartCharging', {
+            type: 'state',
+            common: {
+                name: 'Smart charging state enabled by capacitive touch button',
+                type: 'boolean',
+                role: 'value',
+                read: true,
+                write: true,
+            },
+            native: {},
+        });
+        this.subscribeStates(charger.id + '.config.smartCharging');
+
+        //smartButtonEnabled
+        await this.setObjectNotExistsAsync(charger.id + '.config.smartButtonEnabled', {
+            type: 'state',
+            common: {
+                name: 'Smart Button Enabled/Disabled',
+                type: 'boolean',
+                role: 'indicator.state',
+                read: true,
+                write: true,
+            },
+            native: {},
+        });
+        this.subscribeStates(charger.id + '.config.smartButtonEnabled');
+
         //wiFiSSID
         await this.setObjectNotExistsAsync(charger.id + '.config.wiFiSSID', {
             type: 'state',
@@ -1179,6 +1380,7 @@ class Easee extends utils.Adapter {
         });
         this.subscribeStates(charger.id + '.config.wiFiSSID');
 
+
     }
 }
 
@@ -1194,6 +1396,3 @@ if (module.parent) {
     new Easee();
 }
 
-
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.easee",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Adapter to connect Easee Wallbox",
   "author": {
     "name": "Jens Nachtigal",
@@ -21,7 +21,7 @@
     "axios": "^0.21.1"
   },
   "devDependencies": {
-    "@iobroker/testing": "^2.5.2",
+    "@iobroker/testing": "^2.5.4",
     "@types/chai": "^4.2.14",
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.8",