@pietrolubini/homebridge-ecoflow 1.2.1 → 1.3.0

package/.gitattributes

@@ -0,0 +1,7 @@
+*.* text eol=lf
+*.png binary -crlf
+*.ico binary -crlf
+*.jpg binary -crlf
+*.jpeg binary -crlf
+*.gif binary -crlf
+*.pdf binary -crlf

package/.prettierrc.json

@@ -2,6 +2,7 @@
   "tabWidth": 2,
   "useTabs": false,
   "singleQuote": true,
+  "quoteProps": "as-needed",
   "semi": true,
   "bracketSpacing": true,
   "arrowParens": "avoid",

package/README.md

@@ -1,13 +1,18 @@
 <span align="center">
 
-# homebridge-ecoflow
+# @pietrolubini/homebridge-ecoflow
 
-[![homebridge-ecoflow](https://img.shields.io/npm/v/@pietrolubini/homebridge-ecoflow.svg)](https://www.npmjs.com/package/@pietrolubini/homebridge-ecoflow)
-[![mit-license](https://badgen.net/npm/license/lodash)](https://github.com/pietrolubini/homebridge-ecoflow/blob/main/LICENSE)
+[![latest](https://img.shields.io/npm/v/@pietrolubini/homebridge-ecoflow.svg?label=stable)](https://www.npmjs.com/package/@pietrolubini/homebridge-ecoflow/v/latest)
+[![beta](https://img.shields.io/npm/v/@pietrolubini/homebridge-ecoflow/beta.svg?label=beta)](https://www.npmjs.com/package/@pietrolubini/homebridge-ecoflow/v/beta)
+[![downloads](https://img.shields.io/npm/dt/@pietrolubini/homebridge-ecoflow.svg)](https://www.npmjs.com/package/@pietrolubini/homebridge-ecoflow)
+[![build](https://github.com/pietrolubini/homebridge-ecoflow/actions/workflows/build.yml/badge.svg)](https://github.com/pietrolubini/homebridge-ecoflow/actions/workflows/build.yml)
+[![license](https://img.shields.io/npm/l/@pietrolubini/homebridge-ecoflow)](https://github.com/pietrolubini/homebridge-ecoflow/blob/main/LICENSE)
+[![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
+[![Donate](https://img.shields.io/badge/donate-Coinbase-blue)](https://commerce.coinbase.com/checkout/d56df2da-7609-41a3-af91-289cb6ec4d9b)
 
 </span>
 
-`homebridge-ecoflow` is a plugin for homebridge which allows you to control EcoFlow devices!
+`@pietrolubini/homebridge-ecoflow` is a plugin for homebridge which allows you to control EcoFlow devices!
 The goal is to add HomeKit support to EcoFlow devices and make them fully controllable from the native HomeKit iOS app and Siri.
 
 > Feedback and contribution is helpful and will improve the plugin!
@@ -20,10 +25,11 @@ The goal is to add HomeKit support to EcoFlow devices and make them fully contro
 - Fully customizable HomeKit accessories
 - HomeKit automations for your EcoFlow devices
 
-## Supported device types
+## Supported Device Types
 
-- Delta 2
-- Delta 2 Max
+- [Delta 2](#delta-2)
+- [Delta 2 Max](#delta-2-max)
+- [PowerStream Micro-inverter](#powerstream-micro-inverter)
 
 For a full list of devices that could be potentially added check [here](https://developer-eu.ecoflow.com/us/document/introduction)
 
@@ -39,18 +45,15 @@ sudo npm install -g @pietrolubini/homebridge-ecoflow
 
 ## Configuration
 
-Add the `EcoFlowHomebridge` platform in `config.json` in your home directory inside `.homebridge`.
+Add the `EcoFlowHomebridge` platform in `config.json` in your home directory inside `.homebridge`. Add your devices in the `devices` array. Example of configuration:
 
-Add your devices in the `devices` array.
-
-Example configuration:
-
-```js
+```json
 {
   "platforms": [
     {
       "devices": [
         {
+          "disabled": false,
           "name": "Battery",
           "model": "Delta 2 Max",
           "serialNumber": "R123ABCDEGHI321",
@@ -59,26 +62,91 @@ Example configuration:
           "secretKey": "yBwYgZWqNnAlULKmF1Qrydy2Iheexj22"
         }
       ],
-      "platform": "EcoFlowHomebridge",
+      "name": "Homebridge EcoFlow",
+      "platform": "EcoFlowHomebridge"
     }
   ]
 }
 ```
 
-### Battery-specific Configuration
+### AccessKey and SecretKey
+
+For the plugin to work EcoFlow account's `AccessKey` and `SecretKey` is required. To retrieve them
+
+- Register on [EcoFlow IoT Developer Platform](https://developer-eu.ecoflow.com/)
+- Wait until your request will be approved
+- Generate `AccessKey`/`SecretKey` pair [here](https://developer-eu.ecoflow.com/us/security)
+
+### Simulate Accessory
 
-If `devices`.`model` is one of [`Delta 2`, `Delta 2 Max`] it is possible to set turn on/off additional characteristics:
+It is possible to simulate accessory by adding `simulate` property to device's configuration (`accessKey` and `secretKey` could contain mock values).
+Quota is sent every 10 seconds with random values in this mode.
+
+> 🛈 Each simulated device should have fake unique `serialNumber`, `accessKey` and `secretKey`
+
+```json
+{
+  "platforms": [
+    {
+      "devices": [
+        {
+          "disabled": false,
+          "name": "Battery",
+          "model": "Delta 2 Max",
+          "serialNumber": "R123ABCDEGHI321",
+          "accessKey": "key1",
+          "secretKey": "key2",
+          "simulate": true
+        }
+      ],
+      "name": "Homebridge EcoFlow",
+      "platform": "EcoFlowHomebridge"
+    }
+  ]
+}
+```
+
+## Supported Devices
+
+### Delta 2
+
+#### Services
+
+| EcoFlow Parameter | Service    | Characteristic        | Standard | Permission |
+| ----------------- | ---------- | --------------------- | -------- | ---------- |
+| Battery Level     | Battery    | BatteryLevel          | ✅       | Read       |
+| Input             | Battery    | ChargingState         | ✅       | Read       |
+| Battery Level     | Battery    | StatusLowBattery      | ✅       | Read       |
+| AC                | Outlet AC  | On                    | ✅       | Read/Write |
+| AC Output         | Outlet AC  | OutletInUse           | ✅       | Read       |
+| Battery Level     | Outlet AC  | Battery Level, %      | 🔲       | Read       |
+| Input             | Outlet AC  | Input Consumption, W  | 🔲       | Read       |
+| Output            | Outlet AC  | Output Consumption, W | 🔲       | Read       |
+| 12V DC            | Outlet CAR | On                    | ✅       | Read/Write |
+| 12V DC Output     | Outlet CAR | OutletInUse           | ✅       | Read       |
+| Battery Level     | Outlet CAR | Battery Level, %      | 🔲       | Read       |
+| Input             | Outlet CAR | Input Consumption, W  | 🔲       | Read       |
+| Output            | Outlet CAR | Output Consumption, W | 🔲       | Read       |
+| USB               | Outlet USB | On                    | ✅       | Read/Write |
+| USB Output        | Outlet USB | OutletInUse           | ✅       | Read       |
+| Battery Level     | Outlet USB | Battery Level, %      | 🔲       | Read       |
+| Input             | Outlet USB | Input Consumption, W  | 🔲       | Read       |
+| Output            | Outlet USB | Output Consumption, W | 🔲       | Read       |
+
+#### Configuration
+
+The following additional characteristics is available:
 
 - Input Consumption, W
 - Output Consumption, W
 - Battery Level, %
 
-```js
+```json
 {
   ...
   "devices": [
     {
-      ...,
+      ...
       "model": "Delta 2 Max",
       "battery": {
         "additionalCharacteristics": [
@@ -96,13 +164,74 @@ The characteristics could be used as conditions in HomeKit Automation that uses
 
 <img src="docs/images/BatteryAdditionalCharacteristics.jpg" alt="Battery Additional Characteristics" width="300">
 
-### AccessKey and SecretKey
+### Delta 2 Max
+
+Supported services and configuration are the same as for [Delta 2](#delta-2)
+
+### PowerStream Micro-inverter
+
+#### Services
+
+| EcoFlow Parameter   | Service    | Characteristic        | Standard | Permission                                           |
+| ------------------- | ---------- | --------------------- | -------- | ---------------------------------------------------- |
+| Inverter            | Outlet INV | On                    | ✅       | Read (Inverter AC Output > 0: ON)                    |
+| Inverter AC Output  | Outlet INV | OutletInUse           | ✅       | Read                                                 |
+| Inverter AC Input   | Outlet INV | Input Consumption, W  | 🔲       | Read                                                 |
+| Inverter AC Output  | Outlet INV | Output Consumption, W | 🔲       | Read                                                 |
+| Solar               | Outlet PV  | On                    | ✅       | Read (Solar Generation > 0: ON)                      |
+| Solar Generation    | Outlet PV  | OutletInUse           | ✅       | Read                                                 |
+| Solar Generation    | Outlet PV  | Output Consumption, W | 🔲       | Read                                                 |
+| Battery             | Outlet BAT | On                    | ✅       | Read (Battery Discharging > 0: ON)                   |
+| Battery Discharging | Outlet BAT | OutletInUse           | ✅       | Read                                                 |
+| Battery Level       | Outlet BAT | Battery Level, %      | 🔲       | Read                                                 |
+| Battery Charging    | Outlet BAT | Input Consumption, W  | 🔲       | Read                                                 |
+| Battery Discharging | Outlet BAT | Output Consumption, W | 🔲       | Read                                                 |
+| Lighting brightness | Lightbulb  | On                    | ✅       | Read (> 0%: ON; 0%: OFF) / write (ON: 100%; OFF: 0%) |
+| Lighting brightness | Lightbulb  | Brightness            | ✅       | Read/write                                           |
+| Power demand        | Fan        | On                    | ✅       | Read (> 0%: ON; 0%: OFF) / write (ON: 100%; OFF: 0%) |
+| Power demand        | Fan        | RotationSpeed         | ✅       | Read/write                                           |
+
+#### Configuration
+
+The following additional characteristics is available:
+
+- type (600, 800)
+- battery:
+  - Input Consumption, W
+  - Output Consumption, W
+  - Battery Level, %
+- pv:
+  - Output Consumption, W
+- inverter:
+  - Input Consumption, W
+  - Output Consumption, W
 
-For the plugin to work EcoFlow account's `AccessKey` and `SecretKey` is required. To retrieve them
-
-- Register on [EcoFlow IoT Developer Platform](https://developer-eu.ecoflow.com/)
-- Wait until your request will be approved
-- Generate `AccessKey`/`SecretKey` pair [here](https://developer-eu.ecoflow.com/us/security)
+```json
+{
+  ...
+  "devices": [
+    {
+      ...
+      "model": "PowerStream",
+      "powerStream": {
+        "type": "800",
+        "batteryAdditionalCharacteristics": [
+          "Battery Level, %",
+          "Input Consumption, W",
+          "Output Consumption, W"
+        ],
+        "pvAdditionalCharacteristics": [
+          "Output Consumption, W"
+        ],
+        "inverterAdditionalCharacteristics": [
+          "Input Consumption, W",
+          "Output Consumption, W"
+        ]
+      }
+    }
+  ],
+}
+```
 
 ## Troubleshooting
 

package/config.schema.json

@@ -2,6 +2,8 @@
   "pluginAlias": "EcoFlowHomebridge",
   "pluginType": "platform",
   "singular": true,
+  "customUi": true,
+  "customUiPath": "./dist/homebridge-ui",
   "schema": {
     "type": "object",
     "properties": {
@@ -12,6 +14,7 @@
         "required": true
       },
       "devices": {
+        "title": "Devices",
         "type": "array",
         "required": true,
         "uniqueItems": true,
@@ -27,8 +30,9 @@
             "model": {
               "title": "Model",
               "type": "string",
+              "default": "Delta 2",
               "required": true,
-              "enum": ["Delta 2", "Delta 2 Max"]
+              "enum": ["Delta 2", "Delta 2 Max", "PowerStream"]
             },
             "serialNumber": {
               "title": "Serial Number",
@@ -56,12 +60,24 @@
               "required": true,
               "description": "Secret Key from \"EcoFlow IoT Developer Platform\" (https://developer-eu.ecoflow.com)"
             },
+            "disabled": {
+              "title": "Disabled",
+              "type": "boolean",
+              "required": false,
+              "description": "A value indicating whether device should be ignored"
+            },
+            "simulate": {
+              "title": "Simulate",
+              "type": "boolean",
+              "required": false,
+              "description": "A value indicating whether device should be simulated"
+            },
             "battery": {
               "title": "Battery Settings",
               "type": "object",
               "properties": {
                 "additionalCharacteristics": {
-                  "title": "Additional characteristics",
+                  "title": "Battery Additional Characteristics",
                   "description": "List of additional characteristics for battery",
                   "type": "array",
                   "uniqueItems": true,
@@ -72,6 +88,53 @@
                   }
                 }
               }
+            },
+            "powerStream": {
+              "title": "PowerStream Settings",
+              "type": "object",
+              "properties": {
+                "type": {
+                  "title": "Type",
+                  "type": "string",
+                  "required": true,
+                  "default": "600",
+                  "enum": ["600", "800"],
+                  "description": "Maximum power, W"
+                },
+                "batteryAdditionalCharacteristics": {
+                  "title": "Battery Additional Characteristics",
+                  "description": "List of additional characteristics for Battery connected to PowerStream",
+                  "type": "array",
+                  "uniqueItems": true,
+                  "items": {
+                    "title": "Characteristic",
+                    "type": "string",
+                    "enum": ["Battery Level, %", "Input Consumption, W", "Output Consumption, W"]
+                  }
+                },
+                "pvAdditionalCharacteristics": {
+                  "title": "PV Additional Characteristics",
+                  "description": "List of additional characteristics for PVs connected for PowerStream",
+                  "type": "array",
+                  "uniqueItems": true,
+                  "items": {
+                    "title": "Characteristic",
+                    "type": "string",
+                    "enum": ["Output Consumption, W"]
+                  }
+                },
+                "inverterAdditionalCharacteristics": {
+                  "title": "Inverter Additional Characteristics",
+                  "description": "List of additional characteristics for PowerStream",
+                  "type": "array",
+                  "uniqueItems": true,
+                  "items": {
+                    "title": "Characteristic",
+                    "type": "string",
+                    "enum": ["Input Consumption, W", "Output Consumption, W"]
+                  }
+                }
+              }
             }
           }
         }

package/dist/accessories/batteries/batteryAccessoryBase.d.ts

@@ -0,0 +1,26 @@
+import { BatteryAllQuotaData } from '@ecoflow/accessories/batteries/interfaces/httpApiBatteryContracts';
+import { EcoFlowAccessoryWithQuotaBase } from '@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase';
+import { EcoFlowHttpApiManager } from '@ecoflow/apis/ecoFlowHttpApiManager';
+import { EcoFlowMqttApiManager } from '@ecoflow/apis/ecoFlowMqttApiManager';
+import { MqttQuotaMessage } from '@ecoflow/apis/interfaces/mqttApiContracts';
+import { DeviceConfig } from '@ecoflow/config';
+import { EcoFlowHomebridgePlatform } from '@ecoflow/platform';
+import { ServiceBase } from '@ecoflow/services/serviceBase';
+import { Logging, PlatformAccessory } from 'homebridge';
+export declare abstract class BatteryAccessoryBase extends EcoFlowAccessoryWithQuotaBase<BatteryAllQuotaData> {
+    private readonly batteryService;
+    private readonly outletUsbService;
+    private readonly outletAcService;
+    private readonly outletCarService;
+    constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging, httpApiManager: EcoFlowHttpApiManager, mqttApiManager: EcoFlowMqttApiManager);
+    protected getServices(): ServiceBase[];
+    protected processQuotaMessage(message: MqttQuotaMessage): void;
+    protected initializeQuota(quota: BatteryAllQuotaData | null): BatteryAllQuotaData;
+    protected updateInitialValues(initialData: BatteryAllQuotaData): void;
+    private updateEmsInitialValues;
+    private updateInvInitialValues;
+    private updatePdInitialValues;
+    private updateEmsValues;
+    private updateInvValues;
+    private updatePdValues;
+}

package/dist/accessories/batteries/batteryAccessoryBase.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BatteryAccessoryBase = void 0;
+const mqttApiBatteryContracts_1 = require("@ecoflow/accessories/batteries/interfaces/mqttApiBatteryContracts");
+const outletAcService_1 = require("@ecoflow/accessories/batteries/services/outletAcService");
+const outletCarService_1 = require("@ecoflow/accessories/batteries/services/outletCarService");
+const outletUsbService_1 = require("@ecoflow/accessories/batteries/services/outletUsbService");
+const ecoFlowAccessoryWithQuotaBase_1 = require("@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase");
+const batteryStatusService_1 = require("@ecoflow/services/batteryStatusService");
+class BatteryAccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
+    batteryService;
+    outletUsbService;
+    outletAcService;
+    outletCarService;
+    constructor(platform, accessory, config, log, httpApiManager, mqttApiManager) {
+        super(platform, accessory, config, log, httpApiManager, mqttApiManager);
+        this.batteryService = new batteryStatusService_1.BatteryStatusService(this);
+        this.outletUsbService = new outletUsbService_1.OutletUsbService(this);
+        this.outletAcService = new outletAcService_1.OutletAcService(this);
+        this.outletCarService = new outletCarService_1.OutletCarService(this);
+    }
+    getServices() {
+        return [this.batteryService, this.outletUsbService, this.outletAcService, this.outletCarService];
+    }
+    processQuotaMessage(message) {
+        const batteryMessage = message;
+        if (batteryMessage.typeCode === mqttApiBatteryContracts_1.MqttBatteryMessageType.EMS) {
+            const emsStatus = message.params;
+            Object.assign(this.quota.bms_emsStatus, emsStatus);
+            this.updateEmsValues(emsStatus);
+        }
+        else if (batteryMessage.typeCode === mqttApiBatteryContracts_1.MqttBatteryMessageType.INV) {
+            const invStatus = message.params;
+            Object.assign(this.quota.inv, invStatus);
+            this.updateInvValues(invStatus);
+        }
+        else if (batteryMessage.typeCode === mqttApiBatteryContracts_1.MqttBatteryMessageType.PD) {
+            const pdStatus = message.params;
+            Object.assign(this.quota.pd, pdStatus);
+            this.updatePdValues(pdStatus);
+        }
+    }
+    initializeQuota(quota) {
+        const result = quota ?? {};
+        if (!result.bms_emsStatus) {
+            result.bms_emsStatus = {};
+        }
+        if (!result.inv) {
+            result.inv = {};
+        }
+        if (!result.pd) {
+            result.pd = {};
+        }
+        return result;
+    }
+    updateInitialValues(initialData) {
+        this.updateEmsInitialValues(initialData.bms_emsStatus);
+        this.updateInvInitialValues(initialData.inv);
+        this.updatePdInitialValues(initialData.pd);
+    }
+    updateEmsInitialValues(params) {
+        const message = {
+            typeCode: mqttApiBatteryContracts_1.MqttBatteryMessageType.EMS,
+            params,
+        };
+        this.processQuotaMessage(message);
+    }
+    updateInvInitialValues(params) {
+        const message = {
+            typeCode: mqttApiBatteryContracts_1.MqttBatteryMessageType.INV,
+            params,
+        };
+        this.processQuotaMessage(message);
+    }
+    updatePdInitialValues(params) {
+        const message = {
+            typeCode: mqttApiBatteryContracts_1.MqttBatteryMessageType.PD,
+            params,
+        };
+        this.processQuotaMessage(message);
+    }
+    updateEmsValues(params) {
+        if (params.f32LcdShowSoc !== undefined) {
+            this.batteryService.updateBatteryLevel(params.f32LcdShowSoc);
+            this.outletAcService.updateBatteryLevel(params.f32LcdShowSoc);
+            this.outletUsbService.updateBatteryLevel(params.f32LcdShowSoc);
+            this.outletCarService.updateBatteryLevel(params.f32LcdShowSoc);
+        }
+    }
+    updateInvValues(params) {
+        if (params.inputWatts !== undefined) {
+            this.batteryService.updateChargingState(params.inputWatts);
+            this.outletAcService.updateInputConsumption(params.inputWatts);
+            this.outletUsbService.updateInputConsumption(params.inputWatts);
+            this.outletCarService.updateInputConsumption(params.inputWatts);
+        }
+        if (params.cfgAcEnabled !== undefined) {
+            this.outletAcService.updateState(params.cfgAcEnabled);
+        }
+        if (params.outputWatts !== undefined) {
+            this.outletAcService.updateOutputConsumption(params.outputWatts);
+        }
+    }
+    updatePdValues(params) {
+        if (params.carState !== undefined) {
+            this.outletCarService.updateState(params.carState);
+        }
+        if (params.carWatts !== undefined) {
+            this.outletCarService.updateOutputConsumption(params.carWatts);
+        }
+        if (params.dcOutState !== undefined) {
+            this.outletUsbService.updateState(params.dcOutState);
+        }
+        if (params.usb1Watts !== undefined ||
+            params.usb2Watts !== undefined ||
+            params.qcUsb1Watts !== undefined ||
+            params.qcUsb2Watts !== undefined ||
+            params.typec1Watts !== undefined ||
+            params.typec2Watts !== undefined) {
+            const usbWatts = this.sum(params.usb1Watts, params.usb2Watts, params.qcUsb1Watts, params.qcUsb2Watts, params.typec1Watts, params.typec2Watts);
+            this.outletUsbService.updateOutputConsumption(usbWatts);
+        }
+    }
+}
+exports.BatteryAccessoryBase = BatteryAccessoryBase;
+//# sourceMappingURL=batteryAccessoryBase.js.map

package/dist/accessories/batteries/batteryAccessoryBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"batteryAccessoryBase.js","sourceRoot":"","sources":["../../../src/accessories/batteries/batteryAccessoryBase.ts"],"names":[],"mappings":"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"}

package/dist/accessories/batteries/batteryAccessoryBase.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/accessories/batteries/delta2Accessory.d.ts

@@ -1,3 +1,3 @@
-import { BatteryAccessory } from './batteryAccessory.js';
-export declare class Delta2Accessory extends BatteryAccessory {
+import { BatteryAccessoryBase } from '@ecoflow/accessories/batteries/batteryAccessoryBase';
+export declare class Delta2Accessory extends BatteryAccessoryBase {
 }

package/dist/accessories/batteries/delta2Accessory.js

@@ -1,4 +1,8 @@
-import { BatteryAccessory } from './batteryAccessory.js';
-export class Delta2Accessory extends BatteryAccessory {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Delta2Accessory = void 0;
+const batteryAccessoryBase_1 = require("@ecoflow/accessories/batteries/batteryAccessoryBase");
+class Delta2Accessory extends batteryAccessoryBase_1.BatteryAccessoryBase {
 }
+exports.Delta2Accessory = Delta2Accessory;
 //# sourceMappingURL=delta2Accessory.js.map

package/dist/accessories/batteries/delta2Accessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"delta2Accessory.js","sourceRoot":"","sources":["../../../src/accessories/batteries/delta2Accessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,OAAO,eAAgB,SAAQ,gBAAgB;CAAG"}
+{"version":3,"file":"delta2Accessory.js","sourceRoot":"","sources":["../../../src/accessories/batteries/delta2Accessory.ts"],"names":[],"mappings":";;;AAAA,8FAA2F;AAE3F,MAAa,eAAgB,SAAQ,2CAAoB;CAAG;AAA5D,0CAA4D"}

package/dist/accessories/batteries/delta2maxAccessory.d.ts

@@ -1,3 +1,3 @@
-import { BatteryAccessory } from './batteryAccessory.js';
-export declare class Delta2MaxAccessory extends BatteryAccessory {
+import { BatteryAccessoryBase } from '@ecoflow/accessories/batteries/batteryAccessoryBase';
+export declare class Delta2MaxAccessory extends BatteryAccessoryBase {
 }

package/dist/accessories/batteries/delta2maxAccessory.js

@@ -1,4 +1,8 @@
-import { BatteryAccessory } from './batteryAccessory.js';
-export class Delta2MaxAccessory extends BatteryAccessory {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Delta2MaxAccessory = void 0;
+const batteryAccessoryBase_1 = require("@ecoflow/accessories/batteries/batteryAccessoryBase");
+class Delta2MaxAccessory extends batteryAccessoryBase_1.BatteryAccessoryBase {
 }
+exports.Delta2MaxAccessory = Delta2MaxAccessory;
 //# sourceMappingURL=delta2maxAccessory.js.map

package/dist/accessories/batteries/delta2maxAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"delta2maxAccessory.js","sourceRoot":"","sources":["../../../src/accessories/batteries/delta2maxAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;CAAG"}
+{"version":3,"file":"delta2maxAccessory.js","sourceRoot":"","sources":["../../../src/accessories/batteries/delta2maxAccessory.ts"],"names":[],"mappings":";;;AAAA,8FAA2F;AAE3F,MAAa,kBAAmB,SAAQ,2CAAoB;CAAG;AAA/D,gDAA+D"}

package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.d.ts

@@ -0,0 +1,33 @@
+export interface EmsStatus {
+    f32LcdShowSoc?: number;
+}
+export interface InvStatusAc {
+    outputWatts?: number;
+    cfgAcEnabled?: boolean;
+    cfgAcXboost?: boolean;
+    cfgAcOutFreq?: number;
+    cfgAcOutVol?: number;
+}
+export interface InvStatus extends InvStatusAc {
+    inputWatts?: number;
+}
+export interface PdStatusCar {
+    carState?: boolean;
+    carWatts?: number;
+}
+export interface PdStatusUsb {
+    dcOutState?: boolean;
+    usb1Watts?: number;
+    usb2Watts?: number;
+    qcUsb1Watts?: number;
+    qcUsb2Watts?: number;
+    typec1Watts?: number;
+    typec2Watts?: number;
+}
+export interface PdStatus extends PdStatusUsb, PdStatusCar {
+}
+export interface BatteryAllQuotaData {
+    bms_emsStatus: EmsStatus;
+    inv: InvStatus;
+    pd: PdStatus;
+}

package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=httpApiBatteryContracts.js.map

package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpApiBatteryContracts.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/interfaces/httpApiBatteryContracts.ts"],"names":[],"mappings":""}

package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.d.ts

@@ -0,0 +1,36 @@
+import { MqttQuotaMessage, MqttQuotaMessageWithParams, MqttSetMessage, MqttSetMessageWithParams, MqttSetReplyMessage } from '@ecoflow/apis/interfaces/mqttApiContracts';
+export declare enum MqttBatteryMessageType {
+    PD = "pdStatus",
+    MPPT = "mpptStatus",
+    INV = "invStatus",
+    BMS = "bmsStatus",
+    EMS = "emsStatus"
+}
+export interface MqttBatteryQuotaMessage extends MqttQuotaMessage {
+    typeCode: MqttBatteryMessageType;
+}
+export interface MqttBatteryQuotaMessageWithParams<TParams> extends MqttQuotaMessageWithParams<TParams>, MqttBatteryQuotaMessage {
+}
+export declare enum MqttBatterySetOperationType {
+    MpptCar = "mpptCar",
+    DcOutCfg = "dcOutCfg",
+    AcOutCfg = "acOutCfg"
+}
+export interface MqttBatterySetMessage extends MqttSetMessage {
+    operateType: MqttBatterySetOperationType;
+    moduleType: number;
+}
+export interface MqttBatterySetMessageWithParams<TParams> extends MqttSetMessageWithParams<TParams>, MqttBatterySetMessage {
+}
+export interface MqttBatterySetOnMessageParams {
+    enabled: number;
+}
+export interface MqttBatterySetAcOnMessageParams extends MqttBatterySetOnMessageParams {
+    out_voltage: number;
+    out_freq: number;
+    xboost: number;
+}
+export interface MqttBatterySetReplyMessage extends MqttSetReplyMessage {
+    operateType: MqttBatterySetOperationType;
+    moduleType: number;
+}