homebridge-enphase-envoy 10.2.0-beta.21 → 10.2.0-beta.211

package/CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changes
 
+- fix encharge profile control UI interface
+- added to encharge profile controls option to allow charge from grid
 - fix [#206](https://github.com/grzegorz914/homebridge-enphase-envoy/issues/206)
 - fix [#205](https://github.com/grzegorz914/homebridge-enphase-envoy/issues/205)
 - refactor code of ensemble section

package/README.md

@@ -111,6 +111,7 @@ The `homebridge-enphase-envoy` plugin integrates Enphase Envoy solar energy moni
 | `envoyTokenInstaller` | | boolean | Enable if you are using the installer token |
 | `lockControl` | | boolean | Enables auto lock control accessory |
 | `lockControlPrefix` | | boolean | Use accessory name for prefix |
+| `energyMeter` | | boolean | Enables energy meter as a axtra accessory to display charts in EVE app |
 | `productionStateSensor` | | key | `Production State Sensor` for production state monitoring |
 | | `name` | string | Accessory name for Home app |
 | | `displayType` | number | Accessory type to be displayed in Home app: `0` - None/Disabled, `1` - Motion Sensor, `2` - Occupancy Sensor, `3` - Contact Sensor |
@@ -220,6 +221,8 @@ The `homebridge-enphase-envoy` plugin integrates Enphase Envoy solar energy moni
 | | `name` | string | Accessory name for Home app |
 | | `profile` | string | Profile: `Savings`, `Economy`, `Full Backup`, `Self Consumption` |
 | | `displayType` | number | Accessory type to be displayed in Home app: `0` - None/Disabled, `1` - Lightbulb |
+| | `chargeFromGrid` | boolean | Allow charge from grid  |
+| | `namePrefix` | boolean | Use accessory name for prefix |
 | `enchargeProfileSensors` | | key | `Encharge Profile Sensors` for monitoring. If the `Profile` matches, the contact was opened. |
 | | `name` | string | Accessory name for Home app |
 | | `profile` | string | Profile: `Savings`, `Economy`, `Full Backup`, `Self Consumption` |
@@ -317,7 +320,7 @@ Path `status` response all available paths.
 | POST | `http//ip:port` | `DataSampling` | `true`, `false` | boolean | Data sampling Start/Stop |
 |      | `http//ip:port` | `PowerProductionState` | `true`, `false` | boolean | Production state On/Off |
 |      | `http//ip:port` | `PlcLevel` | `true` | boolean | Check Plc Level On |
-|      | `http//ip:port` | `EnchargeProfile` | `self-consumption`, `savings`, `economy`, `fullbackup` | string | Set encharge profile |
+|      | `http//ip:port` | `EnchargeProfile` | `self-consumption`, `savings-mode`, `economy`, `backup` | string | Set encharge profile |
 |      | `http//ip:port` | `EnpowerGridState` | `true`, `false` | boolean | Grid state On/Off |
 |      | `http//ip:port` | `GeneratorMode` | `off`, `on`, `auto` | string | Generator mode Off/On/Auto |
 
@@ -334,6 +337,6 @@ Subscribe using JSON `{ "EnchargeProfile": "savings" }`
 | Subscribe | `Set` | `DataSampling` | `true`, `false` | boolean | Data sampling Start/Stop |
 |           | `Set` | `ProductionState` | `true`, `false` | boolean | Production state On/Off |
 |           | `Set` | `PlcLevel` | `true` | boolean | Check Plc Level On |
-|           | `Set` | `EnchargeProfile` | `self-consumption`, `savings`, `economy`, `fullbackup` | string | Set encharge profile |
+|           | `Set` | `EnchargeProfile` | `self-consumption`, `savings-mode`, `economy`, `backup` | string | Set encharge profile |
 |           | `Set` | `EnpowerGridState` | `true`, `false` | boolean | Grid state On/Off |
 |           | `Set` | `GeneratorMode` | `off`, `on`, `auto` | string | Generator mode Off/On/Auto |

package/config.schema.json

@@ -170,6 +170,13 @@
                 "functionBody": "return model.devices[arrayIndices].lockControl === true"
               }
             },
+            "energyMeter": {
+              "title": "Energy Meter",
+              "type": "boolean",
+              "default": false,
+              "description": "Enables energy meter as a axtra accessory to display charts in EVE app",
+              "required": false
+            },
             "productionStateSensor": {
               "title": "Production State Sensor",
               "type": "object",
@@ -2057,7 +2064,7 @@
                     "default": "backup",
                     "oneOf": [
                       {
-                        "title": "Savings",
+                        "title": "Savings Mode",
                         "enum": [
                           "savings-mode"
                         ]
@@ -2079,23 +2086,18 @@
                         "enum": [
                           "self-consumption"
                         ]
-                      },
-                      {
-                        "title": "Grid Tied",
-                        "enum": [
-                          "grid-tied"
-                        ]
-                      },
-                      {
-                        "title": "Grid Forming",
-                        "enum": [
-                          "grid-forming"
-                        ]
                       }
                     ],
                     "description": "Here select the profile.",
                     "required": true
                   },
+                  "chargeFromGrid": {
+                    "title": "Charge From Grid",
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Here allow charge from grid",
+                    "required": false
+                  },
                   "namePrefix": {
                     "title": "Prefix",
                     "type": "boolean",
@@ -2160,7 +2162,7 @@
                     "default": "backup",
                     "oneOf": [
                       {
-                        "title": "Savings",
+                        "title": "Savings Mode",
                         "enum": [
                           "savings-mode"
                         ]
@@ -2182,18 +2184,6 @@
                         "enum": [
                           "self-consumption"
                         ]
-                      },
-                      {
-                        "title": "Grid Tied",
-                        "enum": [
-                          "grid-tied"
-                        ]
-                      },
-                      {
-                        "title": "Grid Forming",
-                        "enum": [
-                          "grid-forming"
-                        ]
                       }
                     ],
                     "description": "Here select the profile.",
@@ -3383,8 +3373,7 @@
                   "key": "devices[]",
                   "title": "Envoy",
                   "items": [
-                    "devices[].lockControl",
-                    "devices[].lockControlPrefix",
+                    "devices[].energyMeter",
                     {
                       "key": "devices[]",
                       "type": "tabarray",
@@ -3465,6 +3454,15 @@
                               ]
                             }
                           ]
+                        },
+                        {
+                          "key": "devices[]",
+                          "type": "section",
+                          "title": "System Control",
+                          "items": [
+                            "devices[].lockControl",
+                            "devices[].lockControlPrefix"
+                          ]
                         }
                       ]
                     }
@@ -4025,14 +4023,15 @@
                                       "expanded": false,
                                       "items": [
                                         {
-                                          "key": "devices[].enchargeProfileControl",
+                                          "key": "devices[].enchargeProfileControls",
                                           "type": "tabarray",
                                           "title": "{{ value.name || 'control' }}",
                                           "items": [
-                                            "devices[].enchargeProfileControl[].displayType",
-                                            "devices[].enchargeProfileControl[].name",
-                                            "devices[].enchargeProfileControl[].profile",
-                                            "devices[].enchargeProfileControl[].namePrefix"
+                                            "devices[].enchargeProfileControls[].displayType",
+                                            "devices[].enchargeProfileControls[].name",
+                                            "devices[].enchargeProfileControls[].profile",
+                                            "devices[].enchargeProfileControls[].chargeFromGrid",
+                                            "devices[].enchargeProfileControls[].namePrefix"
                                           ]
                                         }
                                       ]

package/index.js

@@ -1,21 +1,23 @@
 import { join } from 'path';
 import { mkdirSync, existsSync, writeFileSync } from 'fs';
 import EnvoyDevice from './src/envoydevice.js';
+import EnergyMeter from './src/energymeter.js';
 import ImpulseGenerator from './src/impulsegenerator.js';
 import { PluginName, PlatformName } from './src/constants.js';
 import CustomCharacteristics from './src/customcharacteristics.js';
+import fakegato from 'fakegato-history';
 
 class EnvoyPlatform {
   constructor(log, config, api) {
-    // only load if configured
     if (!config || !Array.isArray(config.devices)) {
       log.warn(`No configuration found for ${PluginName}.`);
       return;
     }
-    this.accessories = [];
 
+    this.log = log;
+    this.accessories = [];
+    this.FakeGatoHistoryService = fakegato(api);
 
-    //check if prefs directory exist
     const prefDir = join(api.user.storagePath(), 'enphaseEnvoy');
     try {
       mkdirSync(prefDir, { recursive: true });
@@ -25,146 +27,170 @@ class EnvoyPlatform {
     }
 
     api.on('didFinishLaunching', async () => {
-      let i = 1;
-      for (const device of config.devices) {
-
-        //check accessory is enabled
+      for (let i = 0; i < config.devices.length; i++) {
+        const device = config.devices[i];
         const displayType = device.displayType || 0;
-        if (displayType === 0) {
-          continue;
-        }
+        if (displayType === 0) continue;
 
         const deviceName = device.name;
-        const host = device.host || (i === 1 ? 'envoy.local' : `envoy-${i}.local`);
-        const envoyFirmware7xxTokenGenerationMode = device.envoyFirmware7xxTokenGenerationMode || 0; //0 - envoy password, 1 - enlighten credentials, 2 - own token
-        const envoyPasswd = device.envoyPasswd;
-        const envoyToken = device.envoyToken;
-        const envoyTokenInstaller = device.envoyTokenInstaller || false;
-        const enlightenUser = device.enlightenUser;
-        const enlightenPasswd = device.enlightenPasswd;
-
-        //check mandatory properties
+        const host = device.host || (i === 0 ? 'envoy.local' : `envoy-${i + 1}.local`);
+        const {
+          envoyFirmware7xxTokenGenerationMode = 0,
+          envoyPasswd,
+          envoyToken,
+          envoyTokenInstaller = false,
+          enlightenUser,
+          enlightenPasswd,
+          enableDebugMode = false,
+          disableLogDeviceInfo = false,
+          disableLogInfo = false,
+          disableLogSuccess = false,
+          disableLogWarn = false,
+          disableLogError = false
+        } = device;
+
         if (!deviceName) {
-          log.warn(`Device: ${host} ${deviceName}, Name missing: ${deviceName}.`);
-          return;
+          log.warn(`Device: ${host}, Name missing.`);
+          continue;
         }
 
         if (envoyFirmware7xxTokenGenerationMode === 1 && (!enlightenUser || !enlightenPasswd)) {
-          log.warn(`Device: ${host} ${deviceName}, Envoy firmware v7.x.x enabled, enlighten user: ${enlightenUser ? 'OK' : enlightenUser}, password: ${enlightenPasswd ? 'OK' : enlightenPasswd}.`);
-          return;
+          log.warn(`Device: ${host} ${deviceName}, missing Enlighten credentials.`);
+          continue;
         }
 
         if (envoyFirmware7xxTokenGenerationMode === 2 && !envoyToken) {
-          log.warn(`Device: ${host} ${deviceName}, Envoy firmware v7.x.x enabled but envoy token: ${envoyToken ? 'OK' : envoyToken}.`);
-          return;
+          log.warn(`Device: ${host} ${deviceName}, missing Envoy token.`);
+          continue;
         }
 
-        //log config
-        const enableDebugMode = device.enableDebugMode || false;
-        const disableLogDeviceInfo = device.disableLogDeviceInfo || false;
-        const disableLogInfo = device.disableLogInfo || false;
-        const disableLogSuccess = device.disableLogSuccess || false;
-        const disableLogWarn = device.disableLogWarn || false;
-        const disableLogError = device.disableLogError || false;
-        const debug = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, did finish launching.`);
-        const config = {
-          ...device,
-          envoyPasswd: 'removed',
-          envoyToken: 'removed',
-          enlightenPasswd: 'removed',
-          mqtt: {
-            ...device.mqtt,
-            passwd: 'removed'
-          }
-        };
-        const debug1 = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, Config: ${JSON.stringify(config, null, 2)}.`);
+        if (enableDebugMode) {
+          log.info(`Device: ${host} ${deviceName}, did finish launching.`);
+          const redactedConfig = JSON.stringify({
+            ...device,
+            envoyPasswd: 'removed',
+            envoyToken: 'removed',
+            enlightenPasswd: 'removed',
+            mqtt: { ...device.mqtt, passwd: 'removed' }
+          }, null, 2);
+          log.info(`Device: ${host} ${deviceName}, Config: ${redactedConfig}`);
+        }
 
-        //check files exists, if not then create it
         const postFix = host.split('.').join('');
         const envoyIdFile = join(prefDir, `envoyId_${postFix}`);
         const envoyTokenFile = join(prefDir, `envoyToken_${postFix}`);
+        const energyMeterHistory = join(prefDir, `energyMeterHistory_${postFix}`);
 
         try {
-          const files = [
-            envoyIdFile,
-            envoyTokenFile,
-          ];
-
-          files.forEach((file) => {
-            if (!existsSync(file)) {
-              writeFileSync(file, '0');
-            }
+          [envoyIdFile, envoyTokenFile].forEach(file => {
+            if (!existsSync(file)) writeFileSync(file, '0');
           });
         } catch (error) {
-          const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, Prepare files error: ${error}.`);
-          return;
+          if (!disableLogError) log.error(`Device: ${host} ${deviceName}, File init error: ${error}`);
+          continue;
         }
 
-        //envoy device
-        try {
-          const envoyDevice = new EnvoyDevice(api, deviceName, host, displayType, envoyFirmware7xxTokenGenerationMode, envoyPasswd, envoyToken, envoyTokenInstaller, enlightenUser, enlightenPasswd, envoyIdFile, envoyTokenFile, device);
-          envoyDevice.on('publishAccessory', (accessory) => {
-            api.publishExternalAccessories(PluginName, [accessory]);
-            const emitLog = disableLogSuccess ? false : log.success(`Device: ${host} ${deviceName}, Published as external accessory.`);
-          })
-            .on('devInfo', (devInfo) => {
-              const emitLog = disableLogDeviceInfo ? false : log.info(devInfo);
-            })
-            .on('success', (success) => {
-              const emitLog = disableLogSuccess ? false : log.success(`Device: ${host} ${deviceName}, ${success}.`);
-            })
-            .on('info', (info) => {
-              const emitLog = disableLogInfo ? false : log.info(`Device: ${host} ${deviceName}, ${info}.`);
-            })
-            .on('debug', (debug, data) => {
-              const emitLog = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, debug: ${data ? `${debug} ${JSON.stringify(data, null, 2)}` : `${debug}.`}`);
-            })
-            .on('warn', (warn) => {
-              const emitLog = disableLogWarn ? false : log.warn(`Device: ${host} ${deviceName}, ${warn}.`);
-            })
-            .on('error', (error) => {
-              const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, ${error}.`);
-            })
-
-          //create impulse generator
-          let lock = false;
-          const impulseGenerator = new ImpulseGenerator();
-          impulseGenerator.on('start', async () => {
-            if (lock) return;
-
-            try {
-              lock = true;
-              const startDone = await envoyDevice.start();
-              const stopImpulseGenerator = startDone ? await impulseGenerator.stop() : false;
-
-              //start impulse generator 
-              const startImpulseGenerator = startDone ? await envoyDevice.startImpulseGenerator() : false
-              lock = false;
-            } catch (error) {
-              lock = false;
-              const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, ${error}, trying again.`);
-            }
-          }).on('state', (state) => {
-            const emitLog = !enableDebugMode ? false : state ? log.info(`Device: ${host} ${deviceName}, Start impulse generator started.`) : log.info(`Device: ${host} ${deviceName}, Start impulse generator stopped.`);
-          })
-
-          //start impulse generator
-          await impulseGenerator.start([{ name: 'start', sampling: 60000 }]);
-        } catch (error) {
-          throw new Error(`Device: ${host} ${deviceName}, Did finish launching error: ${error}.`);
+        const devicesClass = device.energyMeter ? [EnvoyDevice, EnergyMeter] : [EnvoyDevice];
+        for (const [index, DeviceClass] of devicesClass.entries()) {
+          try {
+            const accessoryName = index === 0 ? deviceName : 'Energy Meter';
+            const envoyDevice = new DeviceClass(
+              api,
+              log,
+              accessoryName,
+              host,
+              displayType,
+              envoyFirmware7xxTokenGenerationMode,
+              envoyPasswd,
+              envoyToken,
+              envoyTokenInstaller,
+              enlightenUser,
+              enlightenPasswd,
+              envoyIdFile,
+              envoyTokenFile,
+              device,
+              energyMeterHistory,
+              index === 1 ? this.FakeGatoHistoryService : undefined
+            );
+
+            this.attachEventHandlers(api, envoyDevice, log, {
+              host,
+              deviceName: accessoryName,
+              enableDebugMode,
+              disableLogDeviceInfo,
+              disableLogInfo,
+              disableLogSuccess,
+              disableLogWarn,
+              disableLogError
+            });
+
+            const impulseGenerator = new ImpulseGenerator();
+            let lock = false;
+
+            impulseGenerator
+              .on('start', async () => {
+                if (lock) return;
+                lock = true;
+                try {
+                  const started = await envoyDevice.start();
+                  if (started) {
+                    await impulseGenerator.stop();
+                    await envoyDevice.startImpulseGenerator();
+                  }
+                } catch (error) {
+                  if (!disableLogError) log.error(`Device: ${host} ${accessoryName}, ${error}, retrying.`);
+                } finally {
+                  lock = false;
+                }
+              })
+              .on('state', state => {
+                if (enableDebugMode) log.info(`Device: ${host} ${accessoryName}, Impulse generator ${state ? 'started' : 'stopped'}.`);
+              });
+
+            await impulseGenerator.start([{ name: 'start', sampling: 60000 }]);
+          } catch (error) {
+            log.error(`Device: ${host} ${deviceName}, Initialization error: ${error}`);
+          }
         }
-        i++;
       }
-    })
+    });
+  }
+
+  attachEventHandlers(api, envoyDevice, log, { host, deviceName, enableDebugMode, disableLogDeviceInfo, disableLogInfo, disableLogSuccess, disableLogWarn, disableLogError }) {
+    envoyDevice
+      .on('publishAccessory', accessory => {
+        api.publishExternalAccessories(PluginName, [accessory]);
+        if (!disableLogSuccess) log.success(`Device: ${host} ${deviceName}, Published as external accessory.`);
+      })
+      .on('devInfo', devInfo => {
+        if (!disableLogDeviceInfo) log.info(devInfo);
+      })
+      .on('success', msg => {
+        if (!disableLogSuccess) log.success(`Device: ${host} ${deviceName}, ${msg}`);
+      })
+      .on('info', msg => {
+        if (!disableLogInfo) log.info(`Device: ${host} ${deviceName}, ${msg}`);
+      })
+      .on('debug', (msg, data) => {
+        if (enableDebugMode) log.info(`Device: ${host} ${deviceName}, debug: ${data ? `${msg} ${JSON.stringify(data, null, 2)}` : msg}`);
+      })
+      .on('warn', msg => {
+        if (!disableLogWarn) log.warn(`Device: ${host} ${deviceName}, ${msg}`);
+      })
+      .on('error', error => {
+        if (!disableLogError) log.error(`Device: ${host} ${deviceName}, ${error}`);
+      });
   }
 
   configureAccessory(accessory) {
+    accessory.log = this.log;
+    this.loggingService = new fakegato('energy', accessory, 4032);
     this.accessories.push(accessory);
   }
 }
 
 export default (api) => {
-  //import and register custom characteristics
   CustomCharacteristics(api);
   api.registerPlatform(PluginName, PlatformName, EnvoyPlatform);
-}
+};
+

package/package.json

@@ -2,7 +2,7 @@
     "private": false,
     "displayName": "Enphase Envoy",
     "name": "homebridge-enphase-envoy",
-    "version": "10.2.0-beta.21",
+    "version": "10.2.0-beta.211",
     "description": "Homebridge plugin for Photovoltaic Energy System manufactured by Enphase.",
     "license": "MIT",
     "author": "grzegorz914",
@@ -38,7 +38,8 @@
         "async-mqtt": "^2.6.3",
         "axios": "^1.10.0",
         "express": "^5.1.0",
-        "fast-xml-parser": "^5.2.5"
+        "fast-xml-parser": "^5.2.5",
+        "fakegato-history": "^0.6.7"
     },
     "keywords": [
         "homebridge",

package/src/constants.js

@@ -160,6 +160,10 @@ export const PartNumbers = {
 
 export const ApiCodes = {
     "unknown": "Unknown",
+    "backup": "Full backup",
+    "economy": "Economy",
+    "savings-mode": "Savings",
+    "self-consumption": "Self consumption",
     "on": "On",
     "off": "Off",
     "auto": "Auto",
@@ -211,6 +215,7 @@ export const ApiCodes = {
     "ENCHG_STATE_IDLE": "Encharge state idle",
     "ENCHG_STATE_CHARGING": "Encharge state charging",
     "ENCHG_STATE_DISCHARGING": "Encharge state discharging",
+    "StorageTouMode_DEFAULT_TOU_MODE": "Default tou mode",
     "ready": "Ready",
     "idle": "Idle",
     "full": "Full",

package/src/customcharacteristics.js

@@ -2126,7 +2126,7 @@ export default (api) => {
     Service.LiveDataService = LiveDataService;
 
     // EVE electric meter
-    class EvePower extends Characteristic {
+    class EveCurrentConsumption extends Characteristic {
         constructor() {
             super('Power', 'E863F10D-079E-48FF-8F27-9C2605A29F52');
             this.setProps({
@@ -2140,23 +2140,23 @@ export default (api) => {
             this.value = this.getDefaultValue();
         }
     }
-    Characteristic.EvePower = EvePower;
+    Characteristic.EveCurrentConsumption = EveCurrentConsumption;
 
-    class EveEnergy extends Characteristic {
+    class EveTotalConsumption extends Characteristic {
         constructor() {
             super('Energy', 'E863F10C-079E-48FF-8F27-9C2605A29F52');
             this.setProps({
                 format: Formats.FLOAT,
                 unit: 'kWh',
-                maxValue: 100000000,
-                minValue: -100000000,
+                maxValue: 4294967295,
+                minValue: 0,
                 minStep: 0.001,
                 perms: [Perms.PAIRED_READ, Perms.NOTIFY]
             });
             this.value = this.getDefaultValue();
         }
     }
-    Characteristic.EveEnergy = EveEnergy;
+    Characteristic.EveTotalConsumption = EveTotalConsumption;
 
     class EveVoltage extends Characteristic {
         constructor() {
@@ -2174,7 +2174,7 @@ export default (api) => {
     }
     Characteristic.EveVoltage = EveVoltage;
 
-    class EveCurrent extends Characteristic {
+    class EveElectricCurrent extends Characteristic {
         constructor() {
             super('Current', 'E863F126-079E-48FF-8F27-9C2605A29F52');
             this.setProps({
@@ -2188,20 +2188,34 @@ export default (api) => {
             this.value = this.getDefaultValue();
         }
     }
-    Characteristic.EveCurrent = EveCurrent;
+    Characteristic.EveElectricCurrent = EveElectricCurrent;
+
+    class EveResetTime extends Characteristic {
+        constructor() {
+            super('Reset time', 'E863F112-079E-48FF-8F27-9C2605A29F52');
+            this.setProps({
+                format: Formats.UInt32,
+                perms: [Perms.PAIRED_READ, Perms.PAIRED_WRITE, Perms.NOTIFY]
+            });
+            this.value = this.getDefaultValue();
+        }
+    }
+    Characteristic.EveResetTime = EveResetTime;
+
 
     // Eve Power‑Meter service
-    class EveMeter extends Service {
+    class EvePowerMeter extends Service {
         constructor(displayName, subtype) {
             super(displayName, 'E863F130-079E-48FF-8F27-9C2605A29F52', subtype);
             // Mandatory Characteristics
-            this.addCharacteristic(Characteristic.EvePower);
-            this.addCharacteristic(Characteristic.EveEnergy);
+            this.addCharacteristic(Characteristic.EveCurrentConsumption);
+            this.addCharacteristic(Characteristic.EveTotalConsumption);
             // Optional Characteristics
             this.addOptionalCharacteristic(Characteristic.EveVoltage);
-            this.addOptionalCharacteristic(Characteristic.EveCurrent);
+            this.addOptionalCharacteristic(Characteristic.EveElectricCurrent);
+            this.addOptionalCharacteristic(Characteristic.EveResetTime);
             this.addOptionalCharacteristic(Characteristic.ConfiguredName);
         }
     }
-    Service.EveMeter = EveMeter;
+    Service.EvePowerMeter = EvePowerMeter;
 };