npm - @pietrolubini/homebridge-ecoflow - Versions diffs - 1.5.1 → 1.6.0 - Mend

@pietrolubini/homebridge-ecoflow 1.5.1 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (208) hide show

package/.gitattributes CHANGED Viewed

@@ -5,3 +5,4 @@
 *.jpeg binary -crlf
 *.gif binary -crlf
 *.pdf binary -crlf
+*.wasm binary -crlf

package/README.md CHANGED Viewed

@@ -4,6 +4,7 @@
 [![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)
+[![alpha](https://img.shields.io/npm/v/@pietrolubini/homebridge-ecoflow/alpha.svg?label=alpha)](https://www.npmjs.com/package/@pietrolubini/homebridge-ecoflow/v/alpha)
 [![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)
@@ -24,6 +25,7 @@ The goal is to add HomeKit support to EcoFlow devices and make them fully contro
 - Integrates EcoFlow devices into HomeKit
 - Fully customizable HomeKit accessories
 - HomeKit automations for your EcoFlow devices
+- Detection of whether EcoFlow accessory is online/offline
 ## Supported Device Types
@@ -32,6 +34,8 @@ The goal is to add HomeKit support to EcoFlow devices and make them fully contro
 - [Delta Pro](#delta-pro)
 - [Delta Pro 3](#delta-pro-3)
 - [Delta Pro Ultra](#delta-pro-ultra)
+- [Glacier](#glacier)
+- [PowerOcean](#powerocean)
 - [PowerStream Micro-inverter](#powerstream-micro-inverter)
 - [Smart Plug](#smart-plug)
@@ -128,8 +132,8 @@ Quota is sent every 10 seconds with random values in this mode.
 | Output            | Outlet AC  | Output Consumption, W    | 🔲       | Read       |
 | Charging State    | Outlet AC  | ChargingState, Yes/No    | 🔲       | Read       |
 | Battery Level     | Outlet AC  | StatusLowBattery, Yes/No | 🔲       | Read       |
-| 12V DC            | Outlet CAR | On                       | ✅       | Read/Write |
-| 12V DC Output     | Outlet CAR | OutletInUse              | ✅       | Read       |
+| DC 12V            | Outlet CAR | On                       | ✅       | Read/Write |
+| DC 12V 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       |
@@ -148,9 +152,9 @@ Quota is sent every 10 seconds with random values in this mode.
 The following additional characteristics is available:
+- Battery Level, %
 - Input Consumption, W
 - Output Consumption, W
-- Battery Level, %
 - Charging State
 - Status Low Battery
@@ -201,8 +205,8 @@ Supported services and configuration are the same as for [Delta 2](#delta-2)
 | Output            | Outlet AC  | Output Consumption, W    | 🔲       | Read       |
 | Charging State    | Outlet AC  | ChargingState, Yes/No    | 🔲       | Read       |
 | Battery Level     | Outlet AC  | StatusLowBattery, Yes/No | 🔲       | Read       |
-| 12V DC            | Outlet CAR | On                       | ✅       | Read/Write |
-| 12V DC Output     | Outlet CAR | OutletInUse              | ✅       | Read       |
+| DC 12V            | Outlet CAR | On                       | ✅       | Read/Write |
+| DC 12V 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       |
@@ -221,9 +225,9 @@ Supported services and configuration are the same as for [Delta 2](#delta-2)
 The following additional characteristics is available:
+- Battery Level, %
 - Input Consumption, W
 - Output Consumption, W
-- Battery Level, %
 ```json
 {
@@ -246,8 +250,6 @@ The following additional characteristics is available:
 ### Delta Pro 3
-> US version with Dual AC (HV and LV) is tested. Volunteers that own EU version with Single AC are wanted for testing.
 #### Services
 | EcoFlow Parameter | Service       | Characteristic           | Standard | Permission |
@@ -281,9 +283,9 @@ The following additional characteristics is available:
 The following additional characteristics is available:
+- Battery Level, %
 - Input Consumption, W
 - Output Consumption, W
-- Battery Level, %
 ```json
 {
@@ -335,9 +337,9 @@ The following additional characteristics is available:
 The following additional characteristics is available:
+- Battery Level, %
 - Input Consumption, W
 - Output Consumption, W
-- Battery Level, %
 ```json
 {
@@ -358,6 +360,131 @@ The following additional characteristics is available:
 }
 ```
+### Glacier
+> Not Activated (no testing is performed)
+#### Services
+| EcoFlow Parameter                   | Service               | Characteristic             | Standard | Permission                                                                                               |
+| ----------------------------------- | --------------------- | -------------------------- | -------- | -------------------------------------------------------------------------------------------------------- |
+| Battery                             | Outlet                | On                         | ✅       | Read (Battery Discharging > 0: ON)                                                                       |
+| Battery Discharging                 | Outlet                | OutletInUse                | ✅       | Read                                                                                                     |
+| Battery Level                       | Outlet                | Battery Level, %           | 🔲       | Read                                                                                                     |
+| Battery Charging                    | Outlet                | Input Consumption, W       | 🔲       | Read                                                                                                     |
+| Battery Discharging                 | Outlet                | Output Consumption, W      | 🔲       | Read                                                                                                     |
+| Battery Charging State              | Outlet                | ChargingState, Yes/No      | 🔲       | Read                                                                                                     |
+| Battery Level                       | Outlet                | StatusLowBattery, Yes/No   | 🔲       | Read                                                                                                     |
+| ECO mode                            | Switch                | On                         | ✅       | Read/Write                                                                                               |
+| Door Opened                         | ContactSensor         | ContactSensorState         | ✅       | Read                                                                                                     |
+| Make ice (small cubes)              | Switch                | On                         | ✅       | Read/Write (allowed when `Detach Ice` or `Make ice (large cubes)` options are not activated)             |
+| Make ice (large cubes)              | Switch                | On                         | ✅       | Read/Write (allowed when `Detach Ice` or `Make ice (small cubes)` options are not activated)             |
+| Detach ice                          | Switch                | On                         | ✅       | Read/Write (allowed when `Make ice (small cubes)` or `Make ice (large cubes)` options are not activated) |
+| Dual Left Zone Current Temperature  | Thermostat Dual Left  | CurrentTemperature         | ✅       | Read                                                                                                     |
+| Dual Left Zone Target Temperature   | Thermostat Dual Left  | TargetTemperature          | ✅       | Read/write (allowed when zone partition is installed)                                                    |
+| Device is ON/OFF                    | Thermostat Dual Left  | CurrentHeatingCoolingState | ✅       | Read                                                                                                     |
+| Device is ON/OFF                    | Thermostat Dual Left  | TargetHeatingCoolingState  | ✅       | Read                                                                                                     |
+| Dual Right Zone Current Temperature | Thermostat Dual Right | CurrentTemperature         | ✅       | Read                                                                                                     |
+| Dual Right Zone Target Temperature  | Thermostat Dual Right | TargetTemperature          | ✅       | Read/write (allowed when zone partition is installed)                                                    |
+| Device is ON/OFF                    | Thermostat Dual Right | CurrentHeatingCoolingState | ✅       | Read                                                                                                     |
+| Device is ON/OFF                    | Thermostat Dual Right | TargetHeatingCoolingState  | ✅       | Read                                                                                                     |
+| Single Zone Current Temperature     | Thermostat Single     | CurrentTemperature         | ✅       | Read                                                                                                     |
+| Single Zone Target Temperature      | Thermostat Single     | TargetTemperature          | ✅       | Read/write (allowed when zone partition is removed)                                                      |
+| Device is ON/OFF                    | Thermostat Single     | CurrentHeatingCoolingState | ✅       | Read                                                                                                     |
+| Device is ON/OFF                    | Thermostat Single     | TargetHeatingCoolingState  | ✅       | Read                                                                                                     |
+#### Configuration
+The following additional characteristics is available:
+- Battery Level, %
+- Input Consumption, W
+- Output Consumption, W
+```json
+{
+  ...
+  "devices": [
+    {
+      ...
+      "model": "Glacier",
+      "battery": {
+        "additionalCharacteristics": [
+          "Battery Level, %",
+          "Input Consumption, W",
+          "Output Consumption, W"
+        ]
+      }
+    }
+  ],
+}
+```
+### PowerOcean
+#### 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                               |
+| Battery Charging State | Outlet BAT | ChargingState, Yes/No    | 🔲       | Read                               |
+| Battery Level          | Outlet BAT | StatusLowBattery, Yes/No | 🔲       | Read                               |
+#### Configuration
+The following additional characteristics is available:
+- battery:
+  - Battery Level, %
+  - Input Consumption, W
+  - Output Consumption, W
+  - Charging State
+  - Status Low Battery
+- pv:
+  - Output Consumption, W
+- inverter:
+  - Input Consumption, W
+  - Output Consumption, W
+```json
+{
+  ...
+  "devices": [
+    {
+      ...
+      "model": "PowerOcean",
+      "powerStream": {
+        "batteryAdditionalCharacteristics": [
+          "Battery Level, %",
+          "Input Consumption, W",
+          "Output Consumption, W",
+          "Charging State",
+          "Status Low Battery"
+        ],
+        "pvAdditionalCharacteristics": [
+          "Output Consumption, W"
+        ],
+        "inverterAdditionalCharacteristics": [
+          "Input Consumption, W",
+          "Output Consumption, W"
+        ]
+      }
+    }
+  ],
+}
+```
 ### PowerStream Micro-inverter
 #### Services
@@ -389,9 +516,9 @@ The following additional characteristics is available:
 - type (600, 800)
 - battery:
+  - Battery Level, %
   - Input Consumption, W
   - Output Consumption, W
-  - Battery Level, %
   - Charging State
   - Status Low Battery
 - pv:

package/config.schema.json CHANGED Viewed

@@ -148,6 +148,51 @@
                 }
               }
             },
+            "powerOcean": {
+              "title": "PowerOcean Settings",
+              "type": "object",
+              "properties": {
+                "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",
+                      "Charging State",
+                      "Status Low Battery"
+                    ]
+                  }
+                },
+                "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"]
+                  }
+                }
+              }
+            },
             "outlet": {
               "title": "Outlet Settings",
               "type": "object",

package/dist/accessories/batteries/delta2/delta2AccessoryBase.js CHANGED Viewed

@@ -8,6 +8,7 @@ const outletUsbService_1 = require("@ecoflow/accessories/batteries/delta2/servic
 const switchXboostService_1 = require("@ecoflow/accessories/batteries/delta2/services/switchXboostService");
 const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
 const ecoFlowAccessoryWithQuotaBase_1 = require("@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase");
+const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
 const batteryStatusService_1 = require("@ecoflow/services/batteryStatusService");
 class Delta2AccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
     batteryStatusService;
@@ -131,13 +132,13 @@ class Delta2AccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccesso
     }
     updatePdValues(params) {
         if (params.carState !== undefined) {
-            this.outletCarService.updateState(params.carState === batteryHttpApiContracts_1.EnableType.On);
+            this.outletCarService.updateState(params.carState === characteristicContracts_1.EnableType.On);
         }
         if (params.carWatts !== undefined) {
             this.outletCarService.updateOutputConsumption(params.carWatts);
         }
         if (params.dcOutState !== undefined) {
-            this.outletUsbService.updateState(params.dcOutState === batteryHttpApiContracts_1.EnableType.On);
+            this.outletUsbService.updateState(params.dcOutState === characteristicContracts_1.EnableType.On);
         }
         if (params.usb1Watts !== undefined ||
             params.usb2Watts !== undefined ||

package/dist/accessories/batteries/delta2/delta2AccessoryBase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"delta2AccessoryBase.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/delta2/delta2AccessoryBase.ts"],"names":[],"mappings":";;;AASA,oHAIiF;AACjF,oGAAiG;AACjG,sGAAmG;AACnG,sGAAmG;AACnG,4GAAyG;AACzG,+~~GAI2E~~;~~AAC3E~~,sGAAmG;~~AAOnG~~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"}
1	+ {"version":3,"file":"delta2AccessoryBase.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/delta2/delta2AccessoryBase.ts"],"names":[],"mappings":"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"}

package/dist/accessories/batteries/delta2/interfaces/delta2HttpApiContracts.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { AcEnableType, AcOutFrequencyType, AcXBoostType, EnableType } from '@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts';
+import { AcEnableType, AcOutFrequencyType, AcXBoostType } from '@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts';
+import { EnableType } from '@ecoflow/characteristics/characteristicContracts';
 export interface EmsStatus {
     f32LcdShowSoc?: number;
     minDsgSoc?: number;

package/dist/accessories/batteries/delta2/services/delta2OutletServiceBase.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Delta2MqttSetMessageParams, Delta2MqttSetModuleType, Delta2MqttSetOperationType } from '@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts';
-import { BatteryOutletServiceBase } from '@ecoflow/services/batteryOutletServiceBase';
-export declare abstract class Delta2OutletServiceBase extends BatteryOutletServiceBase {
+import { OutletBatteryServiceBase } from '@ecoflow/services/outletBatteryServiceBase';
+export declare abstract class Delta2OutletServiceBase extends OutletBatteryServiceBase {
     protected sendOn<TParams extends Delta2MqttSetMessageParams>(moduleType: Delta2MqttSetModuleType, operateType: Delta2MqttSetOperationType, params: TParams, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/delta2/services/delta2OutletServiceBase.js CHANGED Viewed

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Delta2OutletServiceBase = void 0;
-const batteryOutletServiceBase_1 = require("@ecoflow/services/batteryOutletServiceBase");
-class Delta2OutletServiceBase extends batteryOutletServiceBase_1.BatteryOutletServiceBase {
+const outletBatteryServiceBase_1 = require("@ecoflow/services/outletBatteryServiceBase");
+class Delta2OutletServiceBase extends outletBatteryServiceBase_1.OutletBatteryServiceBase {
     sendOn(moduleType, operateType, params, revert) {
         const message = {
             id: 0,

package/dist/accessories/batteries/delta2/services/outletAcService.d.ts CHANGED Viewed

@@ -6,5 +6,5 @@ import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 export declare class OutletAcService extends Delta2OutletServiceBase {
     private readonly setModuleType;
     constructor(ecoFlowAccessory: EcoFlowAccessoryWithQuotaBase<Delta2AllQuotaData>, batteryStatusProvider: BatteryStatusProvider, setModuleType: Delta2MqttSetModuleType);
-    protected setOn(value: boolean, revert: () => void): Promise<void>;
+    protected processOnSetOn(value: boolean, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/delta2/services/outletAcService.js CHANGED Viewed

@@ -10,7 +10,7 @@ class OutletAcService extends delta2OutletServiceBase_1.Delta2OutletServiceBase
         super(ecoFlowAccessory, batteryStatusProvider, 'AC', ecoFlowAccessory.config.battery?.additionalCharacteristics);
         this.setModuleType = setModuleType;
     }
-    setOn(value, revert) {
+    processOnSetOn(value, revert) {
         return this.sendOn(this.setModuleType, delta2MqttApiContracts_1.Delta2MqttSetOperationType.AcOutCfg, {
             out_voltage: batteryHttpApiContracts_1.AcOutVoltageIgnore,
             out_freq: batteryHttpApiContracts_1.AcOutFrequencyType.Ignore,

package/dist/accessories/batteries/delta2/services/outletAcService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"outletAcService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletAcService.ts"],"names":[],"mappings":";;;AACA,oHAIiF;AACjF,oHAAiH;AACjH,+GAK2E;AAI3E,MAAa,eAAgB,SAAQ,iDAAuB;IAIvC;IAHnB,YACE,gBAAmE,EACnE,qBAA4C,EAC3B,aAAsC;QAEvD,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAFhG,kBAAa,GAAb,aAAa,CAAyB;IAGzD,CAAC;IAEkB,~~KAAK~~,CAAC,KAAc,EAAE,MAAkB;~~QACzD~~,OAAO,IAAI,CAAC,MAAM,CAChB,IAAI,CAAC,aAAa,EAClB,mDAA0B,CAAC,QAAQ,EACnC;YACE,WAAW,EAAE,4CAAkB;YAC/B,QAAQ,EAAE,4CAAkB,CAAC,MAAM;YACnC,MAAM,EAAE,sCAAY,CAAC,MAAM;YAC3B,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,sCAAY,CAAC,EAAE,CAAC,CAAC,CAAC,sCAAY,CAAC,GAAG;SACpD,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAtBD,0CAsBC"}
1	+ {"version":3,"file":"outletAcService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletAcService.ts"],"names":[],"mappings":";;;AACA,oHAIiF;AACjF,oHAAiH;AACjH,+GAK2E;AAI3E,MAAa,eAAgB,SAAQ,iDAAuB;IAIvC;IAHnB,YACE,gBAAmE,EACnE,qBAA4C,EAC3B,aAAsC;QAEvD,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAFhG,kBAAa,GAAb,aAAa,CAAyB;IAGzD,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB,IAAI,CAAC,aAAa,EAClB,mDAA0B,CAAC,QAAQ,EACnC;YACE,WAAW,EAAE,4CAAkB;YAC/B,QAAQ,EAAE,4CAAkB,CAAC,MAAM;YACnC,MAAM,EAAE,sCAAY,CAAC,MAAM;YAC3B,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,sCAAY,CAAC,EAAE,CAAC,CAAC,CAAC,sCAAY,CAAC,GAAG;SACpD,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAtBD,0CAsBC"}

package/dist/accessories/batteries/delta2/services/outletCarService.d.ts CHANGED Viewed

@@ -3,5 +3,5 @@ import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase'
 import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 export declare class OutletCarService extends Delta2OutletServiceBase {
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider);
-    protected setOn(value: boolean, revert: () => void): Promise<void>;
+    protected processOnSetOn(value: boolean, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/delta2/services/outletCarService.js CHANGED Viewed

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutletCarService = void 0;
 const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
 const delta2OutletServiceBase_1 = require("@ecoflow/accessories/batteries/delta2/services/delta2OutletServiceBase");
-const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
+const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
 class OutletCarService extends delta2OutletServiceBase_1.Delta2OutletServiceBase {
     constructor(ecoFlowAccessory, batteryStatusProvider) {
         super(ecoFlowAccessory, batteryStatusProvider, 'CAR', ecoFlowAccessory.config.battery?.additionalCharacteristics);
     }
-    setOn(value, revert) {
-        return this.sendOn(delta2MqttApiContracts_1.Delta2MqttSetModuleType.MPPT, delta2MqttApiContracts_1.Delta2MqttSetOperationType.MpptCar, { enabled: value ? batteryHttpApiContracts_1.EnableType.On : batteryHttpApiContracts_1.EnableType.Off }, revert);
+    processOnSetOn(value, revert) {
+        return this.sendOn(delta2MqttApiContracts_1.Delta2MqttSetModuleType.MPPT, delta2MqttApiContracts_1.Delta2MqttSetOperationType.MpptCar, { enabled: value ? characteristicContracts_1.EnableType.On : characteristicContracts_1.EnableType.Off }, revert);
     }
 }
 exports.OutletCarService = OutletCarService;

package/dist/accessories/batteries/delta2/services/outletCarService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"outletCarService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletCarService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;~~AACjH,+GAA+F~~;~~AAI/F~~,MAAa,gBAAiB,SAAQ,iDAAuB;IAC3D,YAAY,gBAAsC,EAAE,qBAA4C;QAC9F,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IACpH,CAAC;IAEkB,~~KAAK~~,CAAC,KAAc,EAAE,MAAkB;~~QACzD~~,OAAO,IAAI,CAAC,MAAM,CAChB,gDAAuB,CAAC,IAAI,EAC5B,mDAA0B,CAAC,OAAO,EAClC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,oCAAU,CAAC,EAAE,CAAC,CAAC,CAAC,oCAAU,CAAC,GAAG,EAAE,EACnD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAbD,4CAaC"}
1	+ {"version":3,"file":"outletCarService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletCarService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;AAEjH,8FAA8E;AAG9E,MAAa,gBAAiB,SAAQ,iDAAuB;IAC3D,YAAY,gBAAsC,EAAE,qBAA4C;QAC9F,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IACpH,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB,gDAAuB,CAAC,IAAI,EAC5B,mDAA0B,CAAC,OAAO,EAClC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,oCAAU,CAAC,EAAE,CAAC,CAAC,CAAC,oCAAU,CAAC,GAAG,EAAE,EACnD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAbD,4CAaC"}

package/dist/accessories/batteries/delta2/services/outletUsbService.d.ts CHANGED Viewed

@@ -3,5 +3,5 @@ import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase'
 import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 export declare class OutletUsbService extends Delta2OutletServiceBase {
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider);
-    protected setOn(value: boolean, revert: () => void): Promise<void>;
+    protected processOnSetOn(value: boolean, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/delta2/services/outletUsbService.js CHANGED Viewed

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutletUsbService = void 0;
 const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
 const delta2OutletServiceBase_1 = require("@ecoflow/accessories/batteries/delta2/services/delta2OutletServiceBase");
-const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
+const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
 class OutletUsbService extends delta2OutletServiceBase_1.Delta2OutletServiceBase {
     constructor(ecoFlowAccessory, batteryStatusProvider) {
         super(ecoFlowAccessory, batteryStatusProvider, 'USB', ecoFlowAccessory.config.battery?.additionalCharacteristics);
     }
-    setOn(value, revert) {
-        return this.sendOn(delta2MqttApiContracts_1.Delta2MqttSetModuleType.PD, delta2MqttApiContracts_1.Delta2MqttSetOperationType.DcOutCfg, { enabled: value ? batteryHttpApiContracts_1.EnableType.On : batteryHttpApiContracts_1.EnableType.Off }, revert);
+    processOnSetOn(value, revert) {
+        return this.sendOn(delta2MqttApiContracts_1.Delta2MqttSetModuleType.PD, delta2MqttApiContracts_1.Delta2MqttSetOperationType.DcOutCfg, { enabled: value ? characteristicContracts_1.EnableType.On : characteristicContracts_1.EnableType.Off }, revert);
     }
 }
 exports.OutletUsbService = OutletUsbService;

package/dist/accessories/batteries/delta2/services/outletUsbService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"outletUsbService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletUsbService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;~~AACjH,+GAA+F~~;~~AAI/F~~,MAAa,gBAAiB,SAAQ,iDAAuB;IAC3D,YAAY,gBAAsC,EAAE,qBAA4C;QAC9F,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IACpH,CAAC;IAEkB,~~KAAK~~,CAAC,KAAc,EAAE,MAAkB;~~QACzD~~,OAAO,IAAI,CAAC,MAAM,CAChB,gDAAuB,CAAC,EAAE,EAC1B,mDAA0B,CAAC,QAAQ,EACnC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,oCAAU,CAAC,EAAE,CAAC,CAAC,CAAC,oCAAU,CAAC,GAAG,EAAE,EACnD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAbD,4CAaC"}
1	+ {"version":3,"file":"outletUsbService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletUsbService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;AAEjH,8FAA8E;AAG9E,MAAa,gBAAiB,SAAQ,iDAAuB;IAC3D,YAAY,gBAAsC,EAAE,qBAA4C;QAC9F,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IACpH,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB,gDAAuB,CAAC,EAAE,EAC1B,mDAA0B,CAAC,QAAQ,EACnC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,oCAAU,CAAC,EAAE,CAAC,CAAC,CAAC,oCAAU,CAAC,GAAG,EAAE,EACnD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAbD,4CAaC"}

package/dist/accessories/batteries/delta2/services/switchXboostService.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import { Delta2AllQuotaData } from '@ecoflow/accessories/batteries/delta2/interfaces/delta2HttpApiContracts';
 import { Delta2MqttSetModuleType } from '@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts';
 import { EcoFlowAccessoryWithQuotaBase } from '@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase';
-import { SwitchXboostServiceBase } from '@ecoflow/services/switchXboostServiceBase';
-export declare class SwitchXboostService extends SwitchXboostServiceBase {
+import { SwitchServiceBase } from '@ecoflow/services/switchServiceBase';
+export declare class SwitchXboostService extends SwitchServiceBase {
     private readonly setAcModuleType;
     constructor(ecoFlowAccessory: EcoFlowAccessoryWithQuotaBase<Delta2AllQuotaData>, setAcModuleType: Delta2MqttSetModuleType);
-    protected setOn(value: boolean, revert: () => void): Promise<void>;
+    protected processOnSetOn(value: boolean, revert: () => void): Promise<void>;
     private sendOn;
 }

package/dist/accessories/batteries/delta2/services/switchXboostService.js CHANGED Viewed

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwitchXboostService = void 0;
 const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
 const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
-const switchXboostServiceBase_1 = require("@ecoflow/services/switchXboostServiceBase");
-class SwitchXboostService extends switchXboostServiceBase_1.SwitchXboostServiceBase {
+const switchServiceBase_1 = require("@ecoflow/services/switchServiceBase");
+class SwitchXboostService extends switchServiceBase_1.SwitchServiceBase {
     setAcModuleType;
     constructor(ecoFlowAccessory, setAcModuleType) {
-        super(ecoFlowAccessory);
+        super(ecoFlowAccessory, 'X-Boost');
         this.setAcModuleType = setAcModuleType;
     }
-    setOn(value, revert) {
+    processOnSetOn(value, revert) {
         return this.sendOn(this.setAcModuleType, delta2MqttApiContracts_1.Delta2MqttSetOperationType.AcOutCfg, {
             out_voltage: batteryHttpApiContracts_1.AcOutVoltageIgnore,
             out_freq: batteryHttpApiContracts_1.AcOutFrequencyType.Ignore,

package/dist/accessories/batteries/delta2/services/switchXboostService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"switchXboostService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/switchXboostService.ts"],"names":[],"mappings":";;;AACA,oHAMiF;AACjF,+GAK2E;AAE3E,~~uFAAoF~~;~~AAEpF~~,MAAa,mBAAoB,SAAQ,~~iDAAuB~~;~~IAG3C~~;IAFnB,YACE,gBAAmE,EAClD,eAAwC;QAEzD,KAAK,CAAC,gBAAgB,CAAC,CAAC;~~QAFP~~,oBAAe,GAAf,eAAe,CAAyB;IAG3D,CAAC;IAES,~~KAAK~~,CAAC,KAAc,EAAE,MAAkB;~~QAChD~~,OAAO,IAAI,CAAC,MAAM,CAChB,IAAI,CAAC,eAAe,EACpB,mDAA0B,CAAC,QAAQ,EACnC;YACE,WAAW,EAAE,4CAAkB;YAC/B,QAAQ,EAAE,4CAAkB,CAAC,MAAM;YACnC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,sCAAY,CAAC,EAAE,CAAC,CAAC,CAAC,sCAAY,CAAC,GAAG;YAClD,OAAO,EAAE,sCAAY,CAAC,MAAM;SAC7B,EACD,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,MAAM,CACZ,UAAmC,EACnC,WAAuC,EACvC,MAAe,EACf,MAAkB;QAElB,MAAM,OAAO,GAA4C;YACvD,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,UAAU;YACV,WAAW;YACX,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAtCD,kDAsCC"}
1	+ {"version":3,"file":"switchXboostService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/switchXboostService.ts"],"names":[],"mappings":";;;AACA,oHAMiF;AACjF,+GAK2E;AAE3E,2EAAwE;AAExE,MAAa,mBAAoB,SAAQ,qCAAiB;IAGrC;IAFnB,YACE,gBAAmE,EAClD,eAAwC;QAEzD,KAAK,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAFlB,oBAAe,GAAf,eAAe,CAAyB;IAG3D,CAAC;IAES,cAAc,CAAC,KAAc,EAAE,MAAkB;QACzD,OAAO,IAAI,CAAC,MAAM,CAChB,IAAI,CAAC,eAAe,EACpB,mDAA0B,CAAC,QAAQ,EACnC;YACE,WAAW,EAAE,4CAAkB;YAC/B,QAAQ,EAAE,4CAAkB,CAAC,MAAM;YACnC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,sCAAY,CAAC,EAAE,CAAC,CAAC,CAAC,sCAAY,CAAC,GAAG;YAClD,OAAO,EAAE,sCAAY,CAAC,MAAM;SAC7B,EACD,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,MAAM,CACZ,UAAmC,EACnC,WAAuC,EACvC,MAAe,EACf,MAAkB;QAElB,MAAM,OAAO,GAA4C;YACvD,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,UAAU;YACV,WAAW;YACX,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAtCD,kDAsCC"}

package/dist/accessories/batteries/delta2/simulations/delta2Simulator.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.Delta2Simulator = void 0;
 const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
 const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
 const simulator_1 = require("@ecoflow/apis/simulations/simulator");
+const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
 class Delta2Simulator extends simulator_1.SimulatorTyped {
     generateQuota() {
         const quotaType = this.getRandomNumber(0, 100);
@@ -35,9 +36,9 @@ class Delta2Simulator extends simulator_1.SimulatorTyped {
             const quotaPdStatus = {
                 typeCode: delta2MqttApiContracts_1.Delta2MqttMessageType.PD,
                 params: {
-                    carState: this.getRandomBoolean() ? batteryHttpApiContracts_1.EnableType.On : batteryHttpApiContracts_1.EnableType.Off,
+                    carState: this.getRandomBoolean() ? characteristicContracts_1.EnableType.On : characteristicContracts_1.EnableType.Off,
                     carWatts: this.getRandomNumber(0, 1000),
-                    dcOutState: this.getRandomBoolean() ? batteryHttpApiContracts_1.EnableType.On : batteryHttpApiContracts_1.EnableType.Off,
+                    dcOutState: this.getRandomBoolean() ? characteristicContracts_1.EnableType.On : characteristicContracts_1.EnableType.Off,
                     typec1Watts: this.getRandomNumber(0, 100),
                     typec2Watts: this.getRandomNumber(0, 100),
                 },

package/dist/accessories/batteries/delta2/simulations/delta2Simulator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"delta2Simulator.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/simulations/delta2Simulator.ts"],"names":[],"mappings":";;;AAMA,oHAKiF;AACjF,+~~GAK2E~~;AAC3E,mEAAqE;~~AAErE~~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"}
1	+ {"version":3,"file":"delta2Simulator.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/simulations/delta2Simulator.ts"],"names":[],"mappings":"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"}

package/dist/accessories/batteries/deltapro/deltaProAccessory.js CHANGED Viewed

@@ -7,6 +7,7 @@ const outletUsbService_1 = require("@ecoflow/accessories/batteries/deltapro/serv
 const switchXboostService_1 = require("@ecoflow/accessories/batteries/deltapro/services/switchXboostService");
 const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
 const ecoFlowAccessoryWithQuotaBase_1 = require("@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase");
+const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
 const batteryStatusService_1 = require("@ecoflow/services/batteryStatusService");
 class DeltaProAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
     batteryStatusService;
@@ -96,13 +97,13 @@ class DeltaProAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessory
     }
     updatePdValues(params) {
         if (params.carState !== undefined) {
-            this.outletCarService.updateState(params.carState === batteryHttpApiContracts_1.EnableType.On);
+            this.outletCarService.updateState(params.carState === characteristicContracts_1.EnableType.On);
         }
         if (params.carWatts !== undefined) {
             this.outletCarService.updateOutputConsumption(params.carWatts);
         }
         if (params.dcOutState !== undefined) {
-            this.outletUsbService.updateState(params.dcOutState === batteryHttpApiContracts_1.EnableType.On);
+            this.outletUsbService.updateState(params.dcOutState === characteristicContracts_1.EnableType.On);
         }
         if (params.usb1Watts !== undefined ||
             params.usb2Watts !== undefined ||

package/dist/accessories/batteries/deltapro/deltaProAccessory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deltaProAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro/deltaProAccessory.ts"],"names":[],"mappings":";;;AAOA,sGAAmG;AACnG,wGAAqG;AACrG,wGAAqG;AACrG,8GAA2G;AAC3G,+~~GAI2E~~;~~AAC3E~~,sGAAmG;~~AAOnG~~,iFAA8E;AAI9E,MAAa,iBAAkB,SAAQ,6DAAmD;IACvE,oBAAoB,CAAuB;IAC3C,gBAAgB,CAAmB;IACnC,eAAe,CAAkB;IACjC,gBAAgB,CAAmB;IACnC,mBAAmB,CAAsB;IAE1D,YACE,QAAmC,EACnC,SAA4B,EAC5B,MAAoB,EACpB,GAAY,EACZ,cAAqC,EACrC,cAAqC,EACrC,qBAA4C;QAE5C,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,oBAAoB,GAAG,IAAI,2CAAoB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAClF,IAAI,CAAC,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAC1E,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QACxE,IAAI,CAAC,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAC1E,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAEkB,WAAW;QAC5B,OAAO;YACL,IAAI,CAAC,oBAAoB;YACzB,IAAI,CAAC,gBAAgB;YACrB,IAAI,CAAC,eAAe;YACpB,IAAI,CAAC,gBAAgB;YACrB,IAAI,CAAC,mBAAmB;SACzB,CAAC;IACJ,CAAC;IAEkB,mBAAmB,CAAC,OAAyB;QAC9D,MAAM,IAAI,GAAI,OAAoE,CAAC,IAAI,CAAC;QACxF,IAAI,IAAI,EAAE,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,IAAI,EAAE,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,IAAI,EAAE,EAAE,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAEkB,eAAe,CAAC,KAAkC;QACnE,MAAM,MAAM,GAAG,KAAK,IAAK,EAA2B,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAChB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAChB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEkB,mBAAmB,CAAC,IAA0B;QAC/D,MAAM,OAAO,GAA6D;YACxE,IAAI;SACL,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAEO,eAAe,CAAC,MAAiB;QACvC,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACzE,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACrF,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YAChF,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACjF,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,MAAiB;QACvC,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,UAAU,GACd,MAAM,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,WAAW,CAAC,CAAC;YAC1G,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YACrD,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YACtD,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YACtD,IAAI,CAAC,eAAe,CAAC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC/D,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACrC,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,IAAI,MAAM,CAAC,YAAY,KAAK,sCAAY,CAAC,MAAM,EAAE,CAAC;YACrF,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,KAAK,sCAAY,CAAC,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,sCAAY,CAAC,MAAM,EAAE,CAAC;YACnF,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,KAAK,sCAAY,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,MAAgB;QACrC,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,KAAK,oCAAU,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,KAAK,oCAAU,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,IACE,MAAM,CAAC,SAAS,KAAK,SAAS;YAC9B,MAAM,CAAC,SAAS,KAAK,SAAS;YAC9B,MAAM,CAAC,WAAW,KAAK,SAAS;YAChC,MAAM,CAAC,WAAW,KAAK,SAAS;YAChC,MAAM,CAAC,WAAW,KAAK,SAAS;YAChC,MAAM,CAAC,WAAW,KAAK,SAAS,EAChC,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CACvB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,WAAW,CACnB,CAAC;YACF,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CACF;AApID,8CAoIC"}
1	+ {"version":3,"file":"deltaProAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro/deltaProAccessory.ts"],"names":[],"mappings":"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"}

package/dist/accessories/batteries/deltapro/interfaces/deltaProHttpApiContracts.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { AcEnableType, AcOutFrequencyType, AcXBoostType, EnableType } from '@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts';
+import { AcEnableType, AcOutFrequencyType, AcXBoostType } from '@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts';
+import { EnableType } from '@ecoflow/characteristics/characteristicContracts';
 export interface EmsStatus {
     f32LcdShowSoc?: number;
     minDsgSoc?: number;