@pietrolubini/homebridge-ecoflow 1.7.0-alpha.0 → 1.7.0-alpha.6
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.
- package/.prettierrc.json +1 -1
- package/README.md +60 -0
- package/config.schema.json +4 -22
- package/dist/accessories/batteries/delta2/delta2AccessoryBase.js +5 -15
- package/dist/accessories/batteries/delta2/delta2AccessoryBase.js.map +1 -1
- package/dist/accessories/batteries/delta2/services/outletAcService.js +2 -1
- package/dist/accessories/batteries/delta2/services/outletAcService.js.map +1 -1
- package/dist/accessories/batteries/delta2/services/outletCarService.js +1 -1
- package/dist/accessories/batteries/delta2/services/outletCarService.js.map +1 -1
- package/dist/accessories/batteries/delta2/services/outletUsbService.js +1 -1
- package/dist/accessories/batteries/delta2/services/outletUsbService.js.map +1 -1
- package/dist/accessories/batteries/deltapro/deltaProAccessory.js +6 -21
- package/dist/accessories/batteries/deltapro/deltaProAccessory.js.map +1 -1
- package/dist/accessories/batteries/deltapro/services/outletAcService.js +2 -1
- package/dist/accessories/batteries/deltapro/services/outletAcService.js.map +1 -1
- package/dist/accessories/batteries/deltapro/services/outletCarService.js +1 -1
- package/dist/accessories/batteries/deltapro/services/outletCarService.js.map +1 -1
- package/dist/accessories/batteries/deltapro3/deltaPro3Accessory.d.ts +1 -0
- package/dist/accessories/batteries/deltapro3/deltaPro3Accessory.js +7 -5
- package/dist/accessories/batteries/deltapro3/deltaPro3Accessory.js.map +1 -1
- package/dist/accessories/batteries/deltapro3/services/outletAcHvService.js +2 -1
- package/dist/accessories/batteries/deltapro3/services/outletAcHvService.js.map +1 -1
- package/dist/accessories/batteries/deltapro3/services/outletAcLvService.js +2 -1
- package/dist/accessories/batteries/deltapro3/services/outletAcLvService.js.map +1 -1
- package/dist/accessories/batteries/deltapro3/services/outletDc12vService.js +2 -1
- package/dist/accessories/batteries/deltapro3/services/outletDc12vService.js.map +1 -1
- package/dist/accessories/batteries/deltaproultra/deltaProUltraAccessory.js +4 -6
- package/dist/accessories/batteries/deltaproultra/deltaProUltraAccessory.js.map +1 -1
- package/dist/accessories/batteries/deltaproultra/services/outletUsbService.js +2 -1
- package/dist/accessories/batteries/deltaproultra/services/outletUsbService.js.map +1 -1
- package/dist/accessories/ecoFlowAccessoryBase.d.ts +1 -0
- package/dist/accessories/ecoFlowAccessoryBase.js +7 -3
- package/dist/accessories/ecoFlowAccessoryBase.js.map +1 -1
- package/dist/accessories/glacier/glacierAccessory.js +7 -12
- package/dist/accessories/glacier/glacierAccessory.js.map +1 -1
- package/dist/accessories/glacier/services/glacierThermostatFridgeServiceBase.d.ts +0 -1
- package/dist/accessories/glacier/services/glacierThermostatFridgeServiceBase.js +1 -4
- package/dist/accessories/glacier/services/glacierThermostatFridgeServiceBase.js.map +1 -1
- package/dist/accessories/powerocean/powerOceanAccessory.js +3 -0
- package/dist/accessories/powerocean/powerOceanAccessory.js.map +1 -1
- package/dist/accessories/powerstream/powerStreamAccessory.js +2 -4
- package/dist/accessories/powerstream/powerStreamAccessory.js.map +1 -1
- package/dist/accessories/powerstream/services/powerDemandService.js +2 -2
- package/dist/accessories/powerstream/services/powerDemandService.js.map +1 -1
- package/dist/accessories/smartplug/smartPlugAccessory.js +2 -4
- package/dist/accessories/smartplug/smartPlugAccessory.js.map +1 -1
- package/dist/accessories/wave/interfaces/waveHttpApiContracts.d.ts +73 -0
- package/dist/accessories/wave/interfaces/waveHttpApiContracts.js +51 -0
- package/dist/accessories/wave/interfaces/waveHttpApiContracts.js.map +1 -0
- package/dist/accessories/wave/interfaces/waveMqttApiContracts.d.ts +69 -0
- package/dist/accessories/wave/interfaces/waveMqttApiContracts.js +26 -0
- package/dist/accessories/wave/interfaces/waveMqttApiContracts.js.map +1 -0
- package/dist/accessories/wave/services/fanModeService.d.ts +8 -0
- package/dist/accessories/wave/services/fanModeService.js +53 -0
- package/dist/accessories/wave/services/fanModeService.js.map +1 -0
- package/dist/accessories/wave/services/thermostatAirConditionerService.d.ts +13 -0
- package/dist/accessories/wave/services/thermostatAirConditionerService.js +48 -0
- package/dist/accessories/wave/services/thermostatAirConditionerService.js.map +1 -0
- package/dist/accessories/wave/simulations/waveSimulator.d.ts +6 -0
- package/dist/accessories/wave/simulations/waveSimulator.js +72 -0
- package/dist/accessories/wave/simulations/waveSimulator.js.map +1 -0
- package/dist/accessories/wave/waveAccessory.d.ts +31 -0
- package/dist/accessories/wave/waveAccessory.js +192 -0
- package/dist/accessories/wave/waveAccessory.js.map +1 -0
- package/dist/apis/ecoFlowHttpApiManager.js +17 -7
- package/dist/apis/ecoFlowHttpApiManager.js.map +1 -1
- package/dist/apis/interfaces/generalContacts.d.ts +1 -0
- package/dist/apis/interfaces/generalContacts.js +3 -0
- package/dist/apis/interfaces/generalContacts.js.map +1 -0
- package/dist/characteristics/characteristicContracts.d.ts +4 -0
- package/dist/characteristics/characteristicContracts.js +6 -1
- package/dist/characteristics/characteristicContracts.js.map +1 -1
- package/dist/characteristics/characteristicExtensions.d.ts +8 -0
- package/dist/characteristics/characteristicExtensions.js +22 -0
- package/dist/characteristics/characteristicExtensions.js.map +1 -0
- package/dist/characteristics/characteristicExtensions.spec.d.ts +1 -0
- package/dist/characteristics/customCharacteristic.d.ts +1 -0
- package/dist/characteristics/customCharacteristic.js +8 -1
- package/dist/characteristics/customCharacteristic.js.map +1 -1
- package/dist/config.d.ts +2 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/helpers/converter.d.ts +3 -0
- package/dist/helpers/converter.js +13 -0
- package/dist/helpers/converter.js.map +1 -0
- package/dist/helpers/converter.spec.d.ts +1 -0
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/homebridge-ui/public/index.js +1 -1
- package/dist/platform.d.ts +2 -2
- package/dist/platform.js +11 -6
- package/dist/platform.js.map +1 -1
- package/dist/services/fanPositionedService.d.ts +14 -0
- package/dist/services/fanPositionedService.js +35 -0
- package/dist/services/fanPositionedService.js.map +1 -0
- package/dist/services/fanPositionedService.spec.d.ts +6 -0
- package/dist/services/fanServiceBase.d.ts +2 -2
- package/dist/services/fanServiceBase.js +27 -9
- package/dist/services/fanServiceBase.js.map +1 -1
- package/dist/services/lightBulbServiceBase.d.ts +2 -2
- package/dist/services/lightBulbServiceBase.js +27 -9
- package/dist/services/lightBulbServiceBase.js.map +1 -1
- package/dist/services/outletBatteryServiceBase.d.ts +2 -1
- package/dist/services/outletBatteryServiceBase.js +2 -2
- package/dist/services/outletBatteryServiceBase.js.map +1 -1
- package/dist/services/outletReadOnlyService.d.ts +0 -1
- package/dist/services/outletReadOnlyService.js +2 -4
- package/dist/services/outletReadOnlyService.js.map +1 -1
- package/dist/services/outletServiceBase.d.ts +4 -2
- package/dist/services/outletServiceBase.js +18 -5
- package/dist/services/outletServiceBase.js.map +1 -1
- package/dist/services/serviceBase.d.ts +2 -1
- package/dist/services/serviceBase.js +11 -4
- package/dist/services/serviceBase.js.map +1 -1
- package/dist/services/switchServiceBase.d.ts +1 -1
- package/dist/services/switchServiceBase.js +13 -4
- package/dist/services/switchServiceBase.js.map +1 -1
- package/dist/services/thermostatAirConditionerServiceBase.d.ts +29 -0
- package/dist/services/thermostatAirConditionerServiceBase.js +142 -0
- package/dist/services/thermostatAirConditionerServiceBase.js.map +1 -0
- package/dist/services/thermostatAirConditionerServiceBase.spec.d.ts +1 -0
- package/dist/services/thermostatFridgeServiceBase.d.ts +6 -5
- package/dist/services/thermostatFridgeServiceBase.js +47 -21
- package/dist/services/thermostatFridgeServiceBase.js.map +1 -1
- package/junit.xml +1105 -859
- package/package.json +4 -3
- package/dist/accessories/batteries/deltapro/services/outletUsbService.d.ts +0 -7
- package/dist/accessories/batteries/deltapro/services/outletUsbService.js +0 -14
- package/dist/accessories/batteries/deltapro/services/outletUsbService.js.map +0 -1
- package/dist/accessories/batteries/deltaproultra/services/outletAcService.d.ts +0 -8
- package/dist/accessories/batteries/deltaproultra/services/outletAcService.js +0 -14
- package/dist/accessories/batteries/deltaproultra/services/outletAcService.js.map +0 -1
- package/dist/accessories/glacier/services/outletBatteryService.d.ts +0 -8
- package/dist/accessories/glacier/services/outletBatteryService.js +0 -14
- package/dist/accessories/glacier/services/outletBatteryService.js.map +0 -1
- /package/dist/accessories/{batteries/deltapro/services/outletUsbService.spec.d.ts → wave/services/fanModeService.spec.d.ts} +0 -0
- /package/dist/accessories/{batteries/deltaproultra/services/outletAcService.spec.d.ts → wave/services/thermostatAirConditionerService.spec.d.ts} +0 -0
- /package/dist/accessories/{glacier/services/outletBatteryService.spec.d.ts → wave/waveAccessory.spec.d.ts} +0 -0
package/.prettierrc.json
CHANGED
package/README.md
CHANGED
|
@@ -39,6 +39,7 @@ The goal is to add HomeKit support to EcoFlow devices and make them fully contro
|
|
|
39
39
|
- [PowerOcean](#powerocean)
|
|
40
40
|
- [PowerStream Micro-inverter](#powerstream-micro-inverter)
|
|
41
41
|
- [Smart Plug](#smart-plug)
|
|
42
|
+
- [Wave Air Conditioner](#wave-air-conditioner)
|
|
42
43
|
|
|
43
44
|
For a full list of devices that could be potentially added check [here](https://developer-eu.ecoflow.com/us/document/introduction)
|
|
44
45
|
|
|
@@ -640,6 +641,65 @@ The following additional characteristics is available:
|
|
|
640
641
|
}
|
|
641
642
|
```
|
|
642
643
|
|
|
644
|
+
### Wave Air Conditioner
|
|
645
|
+
|
|
646
|
+
#### Services
|
|
647
|
+
|
|
648
|
+
| EcoFlow Parameter | Service | Characteristic | Standard | Permission |
|
|
649
|
+
| -------------------------- | ---------- | ------------------------- | -------- | ---------------------------------------------------------------------------------------- |
|
|
650
|
+
| Battery | Outlet BAT | On | ✅ | Read |
|
|
651
|
+
| Battery Discharging | Outlet BAT | OutletInUse | ✅ | Read |
|
|
652
|
+
| Battery Level | Outlet BAT | Battery Level, % | 🔲 | Read |
|
|
653
|
+
| Battery Charging | Outlet BAT | Input Consumption, W | 🔲 | Read |
|
|
654
|
+
| Battery Discharging | Outlet BAT | Output Consumption, W | 🔲 | Read |
|
|
655
|
+
| Battery Charging State | Outlet BAT | ChargingState, Yes/No | 🔲 | Read |
|
|
656
|
+
| Battery Level | Outlet BAT | StatusLowBattery, Yes/No | 🔲 | Read |
|
|
657
|
+
| BatteryInput | Outlet BAT | Input Consumption, W | 🔲 | Read |
|
|
658
|
+
| Battery Output | Outlet BAT | Output Consumption, W | 🔲 | Read |
|
|
659
|
+
| Battery Voltage | Outlet BAT | Output Voltage, V | 🔲 | Read |
|
|
660
|
+
| Battery Current | Outlet BAT | Output Current, V | 🔲 | Read |
|
|
661
|
+
| Current Temperature | Thermostat | CurrentTemperature | ✅ | Read |
|
|
662
|
+
| Target Temperature | Thermostat | TargetTemperature | ✅ | Read/write |
|
|
663
|
+
| Device Mode | Thermostat | TargetHeatingCoolingState | ✅ | Read |
|
|
664
|
+
| Temperature Display Units | Thermostat | TemperatureDisplayUnits | ✅ | Read/write |
|
|
665
|
+
| Device OFF/Device Mode Fan | Fan | On | ✅ | Read / write (ON: Device Mode is Fan; OFF: Device is OFF or Device Mode is Cool or Heat) |
|
|
666
|
+
| Fan Mode | Fan | RotationSpeed | ✅ | Read/write (>33% - Low; between 33% and 66% - Medium; > 66% - High) |
|
|
667
|
+
|
|
668
|
+
#### Configuration
|
|
669
|
+
|
|
670
|
+
The following additional characteristics is available:
|
|
671
|
+
|
|
672
|
+
- Battery Level, %
|
|
673
|
+
- Input Consumption, W
|
|
674
|
+
- Output Consumption, W
|
|
675
|
+
- Output Voltage, V
|
|
676
|
+
- Output Current, A
|
|
677
|
+
- Charging State
|
|
678
|
+
- Status Low Battery
|
|
679
|
+
|
|
680
|
+
```json
|
|
681
|
+
{
|
|
682
|
+
...
|
|
683
|
+
"devices": [
|
|
684
|
+
{
|
|
685
|
+
...
|
|
686
|
+
"model": "Wave",
|
|
687
|
+
"battery": {
|
|
688
|
+
"additionalCharacteristics": [
|
|
689
|
+
"Battery Level, %",
|
|
690
|
+
"Input Consumption, W",
|
|
691
|
+
"Output Consumption, W",
|
|
692
|
+
"Output Voltage, V",
|
|
693
|
+
"Output Current, A",
|
|
694
|
+
"Charging State",
|
|
695
|
+
"Status Low Battery"
|
|
696
|
+
]
|
|
697
|
+
}
|
|
698
|
+
}
|
|
699
|
+
],
|
|
700
|
+
}
|
|
701
|
+
```
|
|
702
|
+
|
|
643
703
|
## Troubleshooting
|
|
644
704
|
|
|
645
705
|
### Debug
|
package/config.schema.json
CHANGED
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"type": "string",
|
|
33
33
|
"default": "Delta 2",
|
|
34
34
|
"required": true,
|
|
35
|
-
"enum": ["Delta 2", "Delta 2 Max", "Delta Pro 3", "Discovery", "PowerStream", "Smart Plug"]
|
|
35
|
+
"enum": ["Delta 2", "Delta 2 Max", "Delta Pro 3", "Discovery", "PowerStream", "Smart Plug", "Wave"]
|
|
36
36
|
},
|
|
37
37
|
"serialNumber": {
|
|
38
38
|
"title": "Serial Number",
|
|
@@ -84,13 +84,7 @@
|
|
|
84
84
|
"items": {
|
|
85
85
|
"title": "Characteristic",
|
|
86
86
|
"type": "string",
|
|
87
|
-
"enum": [
|
|
88
|
-
"Battery Level, %",
|
|
89
|
-
"Input Consumption, W",
|
|
90
|
-
"Output Consumption, W",
|
|
91
|
-
"Charging State",
|
|
92
|
-
"Status Low Battery"
|
|
93
|
-
]
|
|
87
|
+
"enum": ["Battery Level, %", "Input Consumption, W", "Output Consumption, W", "Charging State", "Status Low Battery"]
|
|
94
88
|
}
|
|
95
89
|
}
|
|
96
90
|
}
|
|
@@ -115,13 +109,7 @@
|
|
|
115
109
|
"items": {
|
|
116
110
|
"title": "Characteristic",
|
|
117
111
|
"type": "string",
|
|
118
|
-
"enum": [
|
|
119
|
-
"Battery Level, %",
|
|
120
|
-
"Input Consumption, W",
|
|
121
|
-
"Output Consumption, W",
|
|
122
|
-
"Charging State",
|
|
123
|
-
"Status Low Battery"
|
|
124
|
-
]
|
|
112
|
+
"enum": ["Battery Level, %", "Input Consumption, W", "Output Consumption, W", "Charging State", "Status Low Battery"]
|
|
125
113
|
}
|
|
126
114
|
},
|
|
127
115
|
"pvAdditionalCharacteristics": {
|
|
@@ -160,13 +148,7 @@
|
|
|
160
148
|
"items": {
|
|
161
149
|
"title": "Characteristic",
|
|
162
150
|
"type": "string",
|
|
163
|
-
"enum": [
|
|
164
|
-
"Battery Level, %",
|
|
165
|
-
"Input Consumption, W",
|
|
166
|
-
"Output Consumption, W",
|
|
167
|
-
"Charging State",
|
|
168
|
-
"Status Low Battery"
|
|
169
|
-
]
|
|
151
|
+
"enum": ["Battery Level, %", "Input Consumption, W", "Output Consumption, W", "Charging State", "Status Low Battery"]
|
|
170
152
|
}
|
|
171
153
|
},
|
|
172
154
|
"pvAdditionalCharacteristics": {
|
|
@@ -25,35 +25,25 @@ class Delta2AccessoryBase extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccesso
|
|
|
25
25
|
this.switchXboostService = new switchXboostService_1.SwitchXboostService(this, configuration.setAcModuleType);
|
|
26
26
|
}
|
|
27
27
|
getServices() {
|
|
28
|
-
return [
|
|
29
|
-
this.batteryStatusService,
|
|
30
|
-
this.outletUsbService,
|
|
31
|
-
this.outletAcService,
|
|
32
|
-
this.outletCarService,
|
|
33
|
-
this.switchXboostService,
|
|
34
|
-
];
|
|
28
|
+
return [this.batteryStatusService, this.outletUsbService, this.outletAcService, this.outletCarService, this.switchXboostService];
|
|
35
29
|
}
|
|
36
30
|
processQuotaMessage(message) {
|
|
37
31
|
const batteryMessage = message;
|
|
38
32
|
if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.EMS) {
|
|
39
33
|
const emsStatus = message.params;
|
|
40
|
-
|
|
41
|
-
this.updateEmsValues(emsStatus);
|
|
34
|
+
this.updateParamsValues(emsStatus, this.quota.bms_emsStatus, this.updateEmsValues.bind(this));
|
|
42
35
|
}
|
|
43
36
|
else if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.INV) {
|
|
44
37
|
const invStatus = message.params;
|
|
45
|
-
|
|
46
|
-
this.updateInvValues(invStatus);
|
|
38
|
+
this.updateParamsValues(invStatus, this.quota.inv, this.updateInvValues.bind(this));
|
|
47
39
|
}
|
|
48
40
|
else if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.PD) {
|
|
49
41
|
const pdStatus = message.params;
|
|
50
|
-
|
|
51
|
-
this.updatePdValues(pdStatus);
|
|
42
|
+
this.updateParamsValues(pdStatus, this.quota.pd, this.updatePdValues.bind(this));
|
|
52
43
|
}
|
|
53
44
|
else if (batteryMessage.typeCode === delta2MqttApiContracts_1.Delta2MqttMessageType.MPPT) {
|
|
54
45
|
const mpptStatus = message.params;
|
|
55
|
-
|
|
56
|
-
this.updateMpptValues(mpptStatus);
|
|
46
|
+
this.updateParamsValues(mpptStatus, this.quota.mppt, this.updateMpptValues.bind(this));
|
|
57
47
|
}
|
|
58
48
|
}
|
|
59
49
|
initializeQuota(quota) {
|
|
@@ -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,+GAA+G;AAC/G,sGAAmG;AAInG,8FAA8E;AAI9E,iFAA8E;AAI9E,MAAsB,mBAAoB,SAAQ,6DAAiD;IAChF,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,EAC5C,aAAkC;QAElC,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,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;QACvG,IAAI,CAAC,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAC1E,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC1F,CAAC;IAEkB,WAAW;QAC5B,OAAO
|
|
1
|
+
{"version":3,"file":"delta2AccessoryBase.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/delta2/delta2AccessoryBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,11 @@ exports.OutletAcService = void 0;
|
|
|
4
4
|
const delta2MqttApiContracts_1 = require("@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts");
|
|
5
5
|
const delta2OutletServiceBase_1 = require("@ecoflow/accessories/batteries/delta2/services/delta2OutletServiceBase");
|
|
6
6
|
const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
|
|
7
|
+
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
7
8
|
class OutletAcService extends delta2OutletServiceBase_1.Delta2OutletServiceBase {
|
|
8
9
|
setModuleType;
|
|
9
10
|
constructor(ecoFlowAccessory, batteryStatusProvider, setModuleType) {
|
|
10
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'AC', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
11
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'AC', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
11
12
|
this.setModuleType = setModuleType;
|
|
12
13
|
}
|
|
13
14
|
processOnSetOn(value, revert) {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"outletAcService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletAcService.ts"],"names":[],"mappings":";;;AACA,oHAIiF;AACjF,oHAAiH;AACjH,+GAK2E;AAE3E,8FAA2F;AAG3F,MAAa,eAAgB,SAAQ,iDAAuB;IAIvC;IAHnB,YACE,gBAAmE,EACnE,qBAA4C,EAC3B,aAAsC;QAEvD,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,IAAI,EAAE,iDAAuB,CAAC,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAFjI,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"}
|
|
@@ -6,7 +6,7 @@ const delta2OutletServiceBase_1 = require("@ecoflow/accessories/batteries/delta2
|
|
|
6
6
|
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
7
7
|
class OutletCarService extends delta2OutletServiceBase_1.Delta2OutletServiceBase {
|
|
8
8
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
9
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'CAR', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
9
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'CAR', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
10
10
|
}
|
|
11
11
|
processOnSetOn(value, revert) {
|
|
12
12
|
return this.sendOn(delta2MqttApiContracts_1.Delta2MqttSetModuleType.MPPT, delta2MqttApiContracts_1.Delta2MqttSetOperationType.MpptCar, { enabled: value ? characteristicContracts_1.EnableType.On : characteristicContracts_1.EnableType.Off }, revert);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletCarService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletCarService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;AAEjH,
|
|
1
|
+
{"version":3,"file":"outletCarService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletCarService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;AAEjH,8FAAuG;AAGvG,MAAa,gBAAiB,SAAQ,iDAAuB;IAC3D,YAAY,gBAAsC,EAAE,qBAA4C;QAC9F,KAAK,CACH,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iDAAuB,CAAC,OAAO,EAC/B,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAC3D,CAAC;IACJ,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;AAnBD,4CAmBC"}
|
|
@@ -6,7 +6,7 @@ const delta2OutletServiceBase_1 = require("@ecoflow/accessories/batteries/delta2
|
|
|
6
6
|
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
7
7
|
class OutletUsbService extends delta2OutletServiceBase_1.Delta2OutletServiceBase {
|
|
8
8
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
9
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'USB', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
9
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'USB', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
10
10
|
}
|
|
11
11
|
processOnSetOn(value, revert) {
|
|
12
12
|
return this.sendOn(delta2MqttApiContracts_1.Delta2MqttSetModuleType.PD, delta2MqttApiContracts_1.Delta2MqttSetOperationType.DcOutCfg, { enabled: value ? characteristicContracts_1.EnableType.On : characteristicContracts_1.EnableType.Off }, revert);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletUsbService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletUsbService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;AAEjH,
|
|
1
|
+
{"version":3,"file":"outletUsbService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/outletUsbService.ts"],"names":[],"mappings":";;;AAAA,oHAIiF;AACjF,oHAAiH;AAEjH,8FAAuG;AAGvG,MAAa,gBAAiB,SAAQ,iDAAuB;IAC3D,YAAY,gBAAsC,EAAE,qBAA4C;QAC9F,KAAK,CACH,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iDAAuB,CAAC,OAAO,EAC/B,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAC3D,CAAC;IACJ,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;AAnBD,4CAmBC"}
|
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DeltaProAccessory = void 0;
|
|
4
4
|
const outletAcService_1 = require("@ecoflow/accessories/batteries/deltapro/services/outletAcService");
|
|
5
5
|
const outletCarService_1 = require("@ecoflow/accessories/batteries/deltapro/services/outletCarService");
|
|
6
|
-
const outletUsbService_1 = require("@ecoflow/accessories/batteries/deltapro/services/outletUsbService");
|
|
7
6
|
const switchXboostService_1 = require("@ecoflow/accessories/batteries/deltapro/services/switchXboostService");
|
|
8
7
|
const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
|
|
9
8
|
const ecoFlowAccessoryWithQuotaBase_1 = require("@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase");
|
|
10
9
|
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
11
10
|
const batteryStatusService_1 = require("@ecoflow/services/batteryStatusService");
|
|
11
|
+
const outletReadOnlyService_1 = require("@ecoflow/services/outletReadOnlyService");
|
|
12
12
|
class DeltaProAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
|
|
13
13
|
batteryStatusService;
|
|
14
14
|
outletUsbService;
|
|
@@ -18,34 +18,19 @@ class DeltaProAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessory
|
|
|
18
18
|
constructor(platform, accessory, config, log, httpApiManager, mqttApiManager, batteryStatusProvider) {
|
|
19
19
|
super(platform, accessory, config, log, httpApiManager, mqttApiManager);
|
|
20
20
|
this.batteryStatusService = new batteryStatusService_1.BatteryStatusService(this, batteryStatusProvider);
|
|
21
|
-
this.outletUsbService = new
|
|
21
|
+
this.outletUsbService = new outletReadOnlyService_1.OutletReadOnlyService(this, batteryStatusProvider, 'USB', this.config.battery?.additionalCharacteristics);
|
|
22
22
|
this.outletAcService = new outletAcService_1.OutletAcService(this, batteryStatusProvider);
|
|
23
23
|
this.outletCarService = new outletCarService_1.OutletCarService(this, batteryStatusProvider);
|
|
24
24
|
this.switchXboostService = new switchXboostService_1.SwitchXboostService(this);
|
|
25
25
|
}
|
|
26
26
|
getServices() {
|
|
27
|
-
return [
|
|
28
|
-
this.batteryStatusService,
|
|
29
|
-
this.outletUsbService,
|
|
30
|
-
this.outletAcService,
|
|
31
|
-
this.outletCarService,
|
|
32
|
-
this.switchXboostService,
|
|
33
|
-
];
|
|
27
|
+
return [this.batteryStatusService, this.outletUsbService, this.outletAcService, this.outletCarService, this.switchXboostService];
|
|
34
28
|
}
|
|
35
29
|
processQuotaMessage(message) {
|
|
36
30
|
const data = message.data;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
if (data?.inv !== undefined && Object.keys(data.inv).length > 0) {
|
|
42
|
-
Object.assign(this.quota.inv, data.inv);
|
|
43
|
-
this.updateInvValues(data.inv);
|
|
44
|
-
}
|
|
45
|
-
if (data?.pd !== undefined && Object.keys(data.pd).length > 0) {
|
|
46
|
-
Object.assign(this.quota.pd, data.pd);
|
|
47
|
-
this.updatePdValues(data.pd);
|
|
48
|
-
}
|
|
31
|
+
this.updateParamsValues(data?.ems, this.quota.ems, this.updateEmsValues.bind(this));
|
|
32
|
+
this.updateParamsValues(data?.inv, this.quota.inv, this.updateInvValues.bind(this));
|
|
33
|
+
this.updateParamsValues(data?.pd, this.quota.pd, this.updatePdValues.bind(this));
|
|
49
34
|
}
|
|
50
35
|
initializeQuota(quota) {
|
|
51
36
|
const result = quota ?? {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deltaProAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro/deltaProAccessory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"deltaProAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro/deltaProAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.OutletAcService = void 0;
|
|
4
4
|
const deltaProOutletServiceBase_1 = require("@ecoflow/accessories/batteries/deltapro/services/deltaProOutletServiceBase");
|
|
5
5
|
const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
|
|
6
|
+
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
6
7
|
class OutletAcService extends deltaProOutletServiceBase_1.DeltaProOutletServiceBase {
|
|
7
8
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
8
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'AC', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
9
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'AC', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
9
10
|
}
|
|
10
11
|
processOnSetOn(value, revert) {
|
|
11
12
|
return this.sendOn({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletAcService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro/services/outletAcService.ts"],"names":[],"mappings":";;;AAEA,0HAAuH;AACvH,+GAA+G;
|
|
1
|
+
{"version":3,"file":"outletAcService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro/services/outletAcService.ts"],"names":[],"mappings":";;;AAEA,0HAAuH;AACvH,+GAA+G;AAE/G,8FAA2F;AAG3F,MAAa,eAAgB,SAAQ,qDAAyB;IAC5D,YAAY,gBAAqE,EAAE,qBAA4C;QAC7H,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,IAAI,EAAE,iDAAuB,CAAC,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IACpJ,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB;YACE,MAAM,EAAE,EAAE;YACV,EAAE,EAAE,EAAE;YACN,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;AAhBD,0CAgBC"}
|
|
@@ -5,7 +5,7 @@ const deltaProOutletServiceBase_1 = require("@ecoflow/accessories/batteries/delt
|
|
|
5
5
|
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
6
6
|
class OutletCarService extends deltaProOutletServiceBase_1.DeltaProOutletServiceBase {
|
|
7
7
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
8
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'CAR', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
8
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'CAR', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
9
9
|
}
|
|
10
10
|
processOnSetOn(value, revert) {
|
|
11
11
|
return this.sendOn({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletCarService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro/services/outletCarService.ts"],"names":[],"mappings":";;;AACA,0HAAuH;AAEvH,
|
|
1
|
+
{"version":3,"file":"outletCarService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro/services/outletCarService.ts"],"names":[],"mappings":";;;AACA,0HAAuH;AAEvH,8FAAuG;AAGvG,MAAa,gBAAiB,SAAQ,qDAAyB;IAC7D,YAAY,gBAAsC,EAAE,qBAA4C;QAC9F,KAAK,CACH,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iDAAuB,CAAC,OAAO,EAC/B,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAC3D,CAAC;IACJ,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB;YACE,MAAM,EAAE,EAAE;YACV,EAAE,EAAE,EAAE;YACN,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,oCAAU,CAAC,EAAE,CAAC,CAAC,CAAC,oCAAU,CAAC,GAAG;SAChD,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AArBD,4CAqBC"}
|
|
@@ -18,6 +18,7 @@ export declare class DeltaPro3Accessory extends EcoFlowAccessoryWithQuotaBase<De
|
|
|
18
18
|
protected processQuotaMessage(message: MqttQuotaMessage): void;
|
|
19
19
|
protected initializeQuota(quota: DeltaPro3AllQuotaData | null): DeltaPro3AllQuotaData;
|
|
20
20
|
protected updateInitialValues(data: DeltaPro3AllQuotaData): void;
|
|
21
|
+
private updateQuotaValues;
|
|
21
22
|
private updateSocValues;
|
|
22
23
|
private updateInputWattsValues;
|
|
23
24
|
private updateOutputWattsValues;
|
|
@@ -36,11 +36,7 @@ class DeltaPro3Accessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessor
|
|
|
36
36
|
}
|
|
37
37
|
processQuotaMessage(message) {
|
|
38
38
|
const data = message;
|
|
39
|
-
|
|
40
|
-
this.updateSocValues(data);
|
|
41
|
-
this.updateInputWattsValues(data);
|
|
42
|
-
this.updateOutputWattsValues(data);
|
|
43
|
-
this.updateSwitchStateValues(data);
|
|
39
|
+
this.updateParamsValues(data, this.quota, this.updateQuotaValues.bind(this));
|
|
44
40
|
}
|
|
45
41
|
initializeQuota(quota) {
|
|
46
42
|
const result = quota ?? {};
|
|
@@ -49,6 +45,12 @@ class DeltaPro3Accessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessor
|
|
|
49
45
|
updateInitialValues(data) {
|
|
50
46
|
this.processQuotaMessage(data);
|
|
51
47
|
}
|
|
48
|
+
updateQuotaValues(data) {
|
|
49
|
+
this.updateSocValues(data);
|
|
50
|
+
this.updateInputWattsValues(data);
|
|
51
|
+
this.updateOutputWattsValues(data);
|
|
52
|
+
this.updateSwitchStateValues(data);
|
|
53
|
+
}
|
|
52
54
|
updateSocValues(params) {
|
|
53
55
|
if (params.cmsBattSoc !== undefined && params.cmsMinDsgSoc !== undefined) {
|
|
54
56
|
this.batteryStatusService.updateBatteryLevel(params.cmsBattSoc, params.cmsMinDsgSoc);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deltaPro3Accessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro3/deltaPro3Accessory.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"deltaPro3Accessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro3/deltaPro3Accessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OutletAcHvService = void 0;
|
|
4
4
|
const deltaPro3OutletServiceBase_1 = require("@ecoflow/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase");
|
|
5
|
+
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
5
6
|
class OutletAcHvService extends deltaPro3OutletServiceBase_1.DeltaPro3OutletServiceBase {
|
|
6
7
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
7
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'AC HV', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
8
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'AC HV', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
8
9
|
}
|
|
9
10
|
processOnSetOn(value, revert) {
|
|
10
11
|
return this.sendOn({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletAcHvService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/outletAcHvService.ts"],"names":[],"mappings":";;;AAEA,6HAA0H;
|
|
1
|
+
{"version":3,"file":"outletAcHvService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/outletAcHvService.ts"],"names":[],"mappings":";;;AAEA,6HAA0H;AAE1H,8FAA2F;AAG3F,MAAa,iBAAkB,SAAQ,uDAA0B;IAC/D,YAAY,gBAAsE,EAAE,qBAA4C;QAC9H,KAAK,CACH,gBAAgB,EAChB,qBAAqB,EACrB,OAAO,EACP,iDAAuB,CAAC,OAAO,EAC/B,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAC3D,CAAC;IACJ,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB;YACE,cAAc,EAAE,KAAK;SACtB,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAnBD,8CAmBC"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OutletAcLvService = void 0;
|
|
4
4
|
const deltaPro3OutletServiceBase_1 = require("@ecoflow/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase");
|
|
5
|
+
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
5
6
|
class OutletAcLvService extends deltaPro3OutletServiceBase_1.DeltaPro3OutletServiceBase {
|
|
6
7
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
7
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'AC LV', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
8
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'AC LV', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
8
9
|
}
|
|
9
10
|
processOnSetOn(value, revert) {
|
|
10
11
|
return this.sendOn({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletAcLvService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/outletAcLvService.ts"],"names":[],"mappings":";;;AAEA,6HAA0H;
|
|
1
|
+
{"version":3,"file":"outletAcLvService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/outletAcLvService.ts"],"names":[],"mappings":";;;AAEA,6HAA0H;AAE1H,8FAA2F;AAG3F,MAAa,iBAAkB,SAAQ,uDAA0B;IAC/D,YAAY,gBAAsE,EAAE,qBAA4C;QAC9H,KAAK,CACH,gBAAgB,EAChB,qBAAqB,EACrB,OAAO,EACP,iDAAuB,CAAC,OAAO,EAC/B,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAC3D,CAAC;IACJ,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB;YACE,cAAc,EAAE,KAAK;SACtB,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAnBD,8CAmBC"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OutletDc12vService = void 0;
|
|
4
4
|
const deltaPro3OutletServiceBase_1 = require("@ecoflow/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase");
|
|
5
|
+
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
5
6
|
class OutletDc12vService extends deltaPro3OutletServiceBase_1.DeltaPro3OutletServiceBase {
|
|
6
7
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
7
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'DC 12V', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
8
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'DC 12V', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
8
9
|
}
|
|
9
10
|
processOnSetOn(value, revert) {
|
|
10
11
|
return this.sendOn({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletDc12vService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/outletDc12vService.ts"],"names":[],"mappings":";;;AAEA,6HAA0H;
|
|
1
|
+
{"version":3,"file":"outletDc12vService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/outletDc12vService.ts"],"names":[],"mappings":";;;AAEA,6HAA0H;AAE1H,8FAA2F;AAG3F,MAAa,kBAAmB,SAAQ,uDAA0B;IAChE,YAAY,gBAAsE,EAAE,qBAA4C;QAC9H,KAAK,CACH,gBAAgB,EAChB,qBAAqB,EACrB,QAAQ,EACR,iDAAuB,CAAC,OAAO,EAC/B,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAC3D,CAAC;IACJ,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB;YACE,eAAe,EAAE,KAAK;SACvB,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAnBD,gDAmBC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DeltaProUltraAccessory = void 0;
|
|
4
4
|
const deltaProUltraMqttApiContracts_1 = require("@ecoflow/accessories/batteries/deltaproultra/interfaces/deltaProUltraMqttApiContracts");
|
|
5
|
-
const outletAcService_1 = require("@ecoflow/accessories/batteries/deltaproultra/services/outletAcService");
|
|
6
5
|
const outletUsbService_1 = require("@ecoflow/accessories/batteries/deltaproultra/services/outletUsbService");
|
|
7
6
|
const switchXboostService_1 = require("@ecoflow/accessories/batteries/deltaproultra/services/switchXboostService");
|
|
8
7
|
const ecoFlowAccessoryWithQuotaBase_1 = require("@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase");
|
|
9
8
|
const batteryStatusService_1 = require("@ecoflow/services/batteryStatusService");
|
|
9
|
+
const outletReadOnlyService_1 = require("@ecoflow/services/outletReadOnlyService");
|
|
10
10
|
class DeltaProUltraAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
|
|
11
11
|
batteryStatusService;
|
|
12
12
|
outletUsbService;
|
|
@@ -16,7 +16,7 @@ class DeltaProUltraAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAcce
|
|
|
16
16
|
super(platform, accessory, config, log, httpApiManager, mqttApiManager);
|
|
17
17
|
this.batteryStatusService = new batteryStatusService_1.BatteryStatusService(this, batteryStatusProvider);
|
|
18
18
|
this.outletUsbService = new outletUsbService_1.OutletUsbService(this, batteryStatusProvider);
|
|
19
|
-
this.outletAcService = new
|
|
19
|
+
this.outletAcService = new outletReadOnlyService_1.OutletReadOnlyService(this, batteryStatusProvider, 'AC', this.config.battery?.additionalCharacteristics);
|
|
20
20
|
this.switchXboostService = new switchXboostService_1.SwitchXboostService(this);
|
|
21
21
|
}
|
|
22
22
|
getServices() {
|
|
@@ -26,13 +26,11 @@ class DeltaProUltraAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAcce
|
|
|
26
26
|
const accessoryMessage = message;
|
|
27
27
|
if (accessoryMessage.addr === deltaProUltraMqttApiContracts_1.DeltaProUltraMqttMessageAddrType.PD) {
|
|
28
28
|
const pdStatus = message.param;
|
|
29
|
-
|
|
30
|
-
this.updatePdValues(pdStatus);
|
|
29
|
+
this.updateParamsValues(pdStatus, this.quota.hs_yj751_pd_appshow_addr, this.updatePdValues.bind(this));
|
|
31
30
|
}
|
|
32
31
|
else if (accessoryMessage.addr === deltaProUltraMqttApiContracts_1.DeltaProUltraMqttMessageAddrType.PD_SET) {
|
|
33
32
|
const pdSetStatus = message.param;
|
|
34
|
-
|
|
35
|
-
// this.updatePdSetValues(pdSetStatus);
|
|
33
|
+
this.updateParamsValues(pdSetStatus, this.quota.hs_yj751_pd_app_set_info_addr, () => { }); // this.updatePdSetValues(pdSetStatus);
|
|
36
34
|
}
|
|
37
35
|
}
|
|
38
36
|
initializeQuota(quota) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deltaProUltraAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltaproultra/deltaProUltraAccessory.ts"],"names":[],"mappings":";;;AASA,yIAI+F;AAC/F,
|
|
1
|
+
{"version":3,"file":"deltaProUltraAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltaproultra/deltaProUltraAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,10 @@ exports.OutletUsbService = void 0;
|
|
|
4
4
|
const deltaProUltraMqttApiContracts_1 = require("@ecoflow/accessories/batteries/deltaproultra/interfaces/deltaProUltraMqttApiContracts");
|
|
5
5
|
const deltaProUltraOutletServiceBase_1 = require("@ecoflow/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase");
|
|
6
6
|
const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
|
|
7
|
+
const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
|
|
7
8
|
class OutletUsbService extends deltaProUltraOutletServiceBase_1.DeltaProUltraOutletServiceBase {
|
|
8
9
|
constructor(ecoFlowAccessory, batteryStatusProvider) {
|
|
9
|
-
super(ecoFlowAccessory, batteryStatusProvider, 'USB', ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
10
|
+
super(ecoFlowAccessory, batteryStatusProvider, 'USB', characteristicContracts_1.CharacteristicPermsType.DEFAULT, ecoFlowAccessory.config.battery?.additionalCharacteristics);
|
|
10
11
|
}
|
|
11
12
|
processOnSetOn(value, revert) {
|
|
12
13
|
return this.sendOn(deltaProUltraMqttApiContracts_1.DeltaProUltraMqttSetCmdCodeType.YJ751_PD_DC_SWITCH_SET, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletUsbService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltaproultra/services/outletUsbService.ts"],"names":[],"mappings":";;;AACA,yIAG+F;AAC/F,yIAAsI;AACtI,+GAAiG;
|
|
1
|
+
{"version":3,"file":"outletUsbService.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltaproultra/services/outletUsbService.ts"],"names":[],"mappings":";;;AACA,yIAG+F;AAC/F,yIAAsI;AACtI,+GAAiG;AAEjG,8FAA2F;AAG3F,MAAa,gBAAiB,SAAQ,+DAA8B;IAClE,YAAY,gBAA0E,EAAE,qBAA4C;QAClI,KAAK,CACH,gBAAgB,EAChB,qBAAqB,EACrB,KAAK,EACL,iDAAuB,CAAC,OAAO,EAC/B,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,yBAAyB,CAC3D,CAAC;IACJ,CAAC;IAEkB,cAAc,CAAC,KAAc,EAAE,MAAkB;QAClE,OAAO,IAAI,CAAC,MAAM,CAChB,+DAA+B,CAAC,sBAAsB,EACtD;YACE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,sCAAY,CAAC,EAAE,CAAC,CAAC,CAAC,sCAAY,CAAC,GAAG;SACpD,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AApBD,4CAoBC"}
|